[Fmsystem-commits] [11302] api : session handling

[Sigurd Nes]

Revision: 11302
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11302
Author:   sigurdne
Date:     2013-09-18 13:59:06 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
api : session handling

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.sessions.inc.php
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/setup/phpgw_no.lang

Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php   2013-09-18 11:45:08 UTC (rev 
11301)
+++ trunk/phpgwapi/inc/class.sessions.inc.php   2013-09-18 13:59:06 UTC (rev 
11302)
@@ -1131,7 +1131,11 @@
                        $this->_sessionid = $sessionid;
 
                        $session = $this->read_session($sessionid);
+                       $this->_session_flags = $session['session_flags'];
 
+                       $lid_data = explode('#', $session['session_lid']);
+                       $this->_account_lid = $lid_data[0];
+
                        if ($GLOBALS['phpgw_info']['server']['auth_type'] != 
'ntlm') //Timeout make no sense for SSO
                        {
                                $timeout = time() - 
$GLOBALS['phpgw_info']['server']['sessions_timeout'];
@@ -1140,17 +1144,31 @@
                                {
                                        if(isset($session['session_dla']))
                                        {
+                                               
if(is_object($GLOBALS['phpgw']->log))
+                                               {
+                                                       
$GLOBALS['phpgw']->log->message(array(
+                                                               'text' => 
'W-VerifySession, session for %1 is expired by %2 sec, inactive for %3 sec',
+                                                               'p1'   => 
$this->_account_lid,
+                                                               'p2'   => 
($timeout - $session['session_dla']),
+                                                               'p3'   => 
(time() - $session['session_dla']),
+                                                               'line' => 
__LINE__,
+                                                               'file' => 
__FILE__
+                                                       ));
+                                                       
$GLOBALS['phpgw']->log->commit();
+                                               }
+                                               
if(is_object($GLOBALS['phpgw']->crypto))
+                                               {
+                                                       
$GLOBALS['phpgw']->crypto->cleanup();
+                                                       
unset($GLOBALS['phpgw']->crypto);
+                                               }
+
                                                $this->cd_reason = 10;
                                        }
                                        return false;
                                }
                        }
 
-                       $this->_session_flags = $session['session_flags'];
 
-                       $lid_data = explode('#', $session['session_lid']);
-                       $this->_account_lid = $lid_data[0];
-
                        if ( isset($lid_data[1]) )
                        {
                                $this->_account_domain = $lid_data[1];

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2013-09-18 11:45:08 UTC 
(rev 11301)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2013-09-18 13:59:06 UTC 
(rev 11302)
@@ -143,14 +143,7 @@
                                case 10:
                                        
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
                                        
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
-
-                                       // fix for bug php4 expired sessions bug
-                                       
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
-                                       {
-//                                             
$GLOBALS['phpgw']->session->phpgw_setcookie('phpgwsessid');
-                                       }
-
-                                       return lang('Your session could not be 
verified.');
+                                       return lang('sorry, your session has 
expired');
                                default:
                                        return ' ';
                        }

Modified: trunk/phpgwapi/setup/phpgw_no.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_no.lang  2013-09-18 11:45:08 UTC (rev 11301)
+++ trunk/phpgwapi/setup/phpgw_no.lang  2013-09-18 13:59:06 UTC (rev 11302)
@@ -130,7 +130,8 @@
 bad login or password  common  no      Ugyldig login eller passord
 login  login   no      Login
 password       login   no      Passord
-sorry, your login has expired  login   no      Beklager, din login er utgått
+sorry, your login has expired  login   no      Beklager, din bruker er utgått
+sorry, your session has expired        login   no      Beklager, sesjonen din 
er utløpt
 todays date, eg. %1    common  no      Dagens dato, %1
 use cookies    login   no      use cookies
 username       login   no      Brukernavn