------------------------------------------------------------
revno: 1009
committer: bassel <[email protected]>
branch nick: aikiframework
timestamp: Sat 2012-01-07 23:30:05 +0200
message:
yet more clean up and the login issue is not fixed
modified:
bootstrap.php
libs/membership.php
libs/widgets.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'bootstrap.php'
--- bootstrap.php 2012-01-06 11:46:59 +0000
+++ bootstrap.php 2012-01-07 21:30:05 +0000
@@ -148,6 +148,8 @@
* Load some auxiliary classes
*/
+$membership = $aiki->load("membership");
+
$aiki->load("message");
$aiki->load("dictionary");
@@ -163,8 +165,6 @@
$aiki->load("languages");
-$membership = $aiki->load("membership");
-
// this class will be loaded by demand
/*
=== modified file 'libs/membership.php'
--- libs/membership.php 2012-01-07 20:46:13 +0000
+++ libs/membership.php 2012-01-07 21:30:05 +0000
@@ -76,7 +76,7 @@
*/
public function membership() {
global $db, $config, $log;
-
+
try {
/* Has user defined session handler as alternative
* to the default php file based session handler */
@@ -86,14 +86,13 @@
$log->exception($e);
}
-
$allowGuestSessions = isset($config["allow_guest_sessions"]) &&
$config["allow_guest_sessions"] ;
if ( $allowGuestSessions || @$_COOKIE["PHPSESSID"] ) {
session_start();
}
-
+
if (isset($_SESSION['aikiuser'])) {
$username = $db->get_var("SELECT user_name FROM aiki_users_sessions where user_session='".$_SESSION['aikiuser']."'");
}
@@ -260,7 +259,6 @@
$this->group_level = $user->group_level;
$this->permissions = $user->group_permissions;
} else {
-
$this->permissions = "";
//unset the browser session if the session
=== modified file 'libs/widgets.php'
--- libs/widgets.php 2012-01-07 20:46:13 +0000
+++ libs/widgets.php 2012-01-07 21:30:05 +0000
@@ -339,7 +339,6 @@
}
// Security check to determine which widget content to display.
- //echo $widget->is_admin."-".$membership->permissions."-".$widget->if_authorized."<br>";
if ( $widget->is_admin
&& $membership->permissions
&& $widget->if_authorized
@@ -347,7 +346,6 @@
$widget->widget = $widget->if_authorized;
$widget->normal_select = $widget->authorized_select;
$stopcaching = true;
-
}
if ( !$stopcaching and
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
