[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php sessions/class.s...
From: |
Caeies |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php sessions/class.s... |
Date: |
Sun, 24 Sep 2006 19:52:36 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Caeies <Caeies> 06/09/24 19:52:36
Modified files:
inc : functions.inc.php
inc/sessions : class.sessions.inc.php
Log message:
patch cd_reason #5409
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.204&r2=1.205
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/sessions/class.sessions.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3
Patches:
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -b -r1.204 -r1.205
--- functions.inc.php 24 Sep 2006 12:01:35 -0000 1.204
+++ functions.inc.php 24 Sep 2006 19:52:36 -0000 1.205
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: functions.inc.php,v 1.204 2006/09/24 12:01:35 skwashd
Exp $
+ * @version $Id: functions.inc.php,v 1.205 2006/09/24 19:52:36 Caeies
Exp $
*/
@@ -550,8 +550,12 @@
unset($_GET['kp3']);
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',serialize($_GET),$cookietime=0);
}
-
- $GLOBALS['phpgw']->redirect_link('/login.php',
array('cd' => 10) );
+ $cd_array = array();
+ if($GLOBALS['phpgw']->session->cd_reason)
+ {
+ $cd_array['cd'] =
$GLOBALS['phpgw']->session->cd_reason;
+ }
+ $GLOBALS['phpgw']->redirect_link('/login.php',
$cd_array );
}
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] !='en')
Index: sessions/class.sessions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/sessions/class.sessions.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- sessions/class.sessions.inc.php 19 Sep 2006 16:06:58 -0000 1.2
+++ sessions/class.sessions.inc.php 24 Sep 2006 19:52:36 -0000 1.3
@@ -10,7 +10,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.sessions.inc.php,v 1.2 2006/09/19 16:06:58
skwashd Exp $
+ * @version $Id: class.sessions.inc.php,v 1.3 2006/09/24 19:52:36 Caeies
Exp $
* @link http://www.sanisoft.com/phplib/manual/session.php
*/
@@ -112,6 +112,11 @@
var $xmlrpc_method_called;
/**
+ * @var contains the error code when checking sessions
+ */
+ var $cd_reason;
+
+ /**
* Constructor just loads up some defaults from cookies
*/
function sessions()
@@ -249,9 +254,12 @@
$session = $this->read_session($sessionid);
//echo "<pre>session::verify(id='$sessionid'): \n" .
print_r($session, true) . "</pre>\n";
- if ( !isset($session['session_dla'])
- || $session['session_dla'] <= (time() -
$GLOBALS['phpgw_info']['server']['sessions_timeout']))
+ if ( !isset($session['session_dla']) ||
$session['session_dla'] <= (time() -
$GLOBALS['phpgw_info']['server']['sessions_timeout']))
{
+ if(isset($session['session_dla']))
+ {
+ $this->cd_reason = 10;
+ }
$this->clean_sessions();
return False;
}
@@ -277,6 +285,7 @@
$this->account_id =
$GLOBALS['phpgw']->accounts->name2id($this->account_lid);
if (!$this->account_id)
{
+ $this->cd_reason = 5;
return false;
}
@@ -306,6 +315,7 @@
$GLOBALS['phpgw']->crypto->cleanup();
unset($GLOBALS['phpgw']->crypto);
}
+ $this->cd_reason = 2;
return False;
}
@@ -333,6 +343,7 @@
$GLOBALS['phpgw']->crypto->cleanup();
unset($GLOBALS['phpgw']->crypto);
}
+ $this->cd_reason = 5;
return False;
}
@@ -357,6 +368,7 @@
$GLOBALS['phpgw']->crypto->cleanup();
unset($GLOBALS['phpgw']->crypto);
}
+ $this->cd_reason = 2;
return False;
}
}
@@ -559,6 +571,7 @@
$GLOBALS['phpgw']->log->commit();
}
+ $this->cd_reason=2;
return False;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc functions.inc.php sessions/class.s...,
Caeies <=