Index: branches/unlabeled/unlabeled-1.55.2/core/kernel/session/session.php =================================================================== diff -u -r7837 -r7874 --- branches/unlabeled/unlabeled-1.55.2/core/kernel/session/session.php (.../session.php) (revision 7837) +++ branches/unlabeled/unlabeled-1.55.2/core/kernel/session/session.php (.../session.php) (revision 7874) @@ -93,10 +93,6 @@ function StoreSession(&$session, $additional_fields = Array()) { - if (defined('IS_INSTALL') && IS_INSTALL && !$this->Application->TableFound($this->TableName)) { - return false; - } - $fields_hash = Array ( $this->IDField => $session->SID, $this->TimestampField => $session->Expiration @@ -370,9 +366,9 @@ $this->CookieName = $cookie_name; } - function InitStorage($special) + function InitStorage() { - $this->Storage =& $this->Application->recallObject('SessionStorage.'.$special); + $this->Storage =& $this->Application->recallObject('SessionStorage'); $this->Storage->setSessionTimeout($this->SessionTimeout); } @@ -384,7 +380,7 @@ if ($this->CookiesEnabled) $_COOKIE['cookies_on'] = 1; $this->Checkers = Array(); - $this->InitStorage($special); + $this->InitStorage(); $this->Data =& new Params(); $tmp_sid = $this->GetPassedSIDValue(); @@ -393,10 +389,10 @@ if( !(defined('IS_INSTALL') && IS_INSTALL) ) { $expired_sids = $this->DeleteExpired(); - if ( ( $expired_sids && in_array($tmp_sid,$expired_sids) ) || ( $tmp_sid && !$check ) ) { + if( ( $expired_sids && in_array($tmp_sid,$expired_sids) ) || ( $tmp_sid && !$check ) ) + { $this->SetSession(); $this->Application->HandleEvent($event, 'u:OnSessionExpire'); - return ; } } @@ -654,15 +650,6 @@ break; } $this->Storage->StoreSession($this); - - if ($this->Application->IsAdmin() || $this->Special == 'admin') { - $this->StoreVar('admin', 1); - } - - if ($this->Special != '') { - // front-session called from admin or otherwise, then save it's data - $this->SaveData(); - } } /** @@ -872,23 +859,7 @@ { return $this->Storage->DeleteExpired(); } - - /** - * Allows to check if user in this session is logged in or not - * - * @return bool - */ - function LoggedIn() - { - $user_id = $this->RecallVar('user_id'); - $ret = $user_id > 0; - if ($this->RecallVar('admin') == 1 && ($user_id == -1)) { - $ret = true; - } - return $ret; - } - } ?> \ No newline at end of file