[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc functions.inc.php |
Date: |
Sat, 17 Jun 2006 07:14:33 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Sigurd Nes <sigurdne> 06/06/17 07:14:33
Modified files:
inc : functions.inc.php
Log message:
Enables links to survive the login form - useful when distributing
links by email.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.188&r2=1.189
Patches:
Index: functions.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- functions.inc.php 28 May 2006 07:39:04 -0000 1.188
+++ functions.inc.php 17 Jun 2006 07:14:33 -0000 1.189
@@ -7,7 +7,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.188 2006/05/28 07:39:04 sigurdne
Exp $
+ * @version $Id: functions.inc.php,v 1.189 2006/06/17 07:14:33 sigurdne
Exp $
*/
@@ -321,9 +321,23 @@
{
if (! $GLOBALS['phpgw']->session->verify())
{
+ if($_GET['menuaction'])
+ {
+
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',serialize($_GET),$cookietime=0);
+ }
+
$GLOBALS['phpgw']->redirect_link('/login.php','cd=10');
}
+ $redirect_data =
unserialize(get_var('redirect',array('GET','COOKIE')));
+
+ if($redirect_data)
+ {
+ $redirect_data['sessionid'] = $_GET['sessionid'];
+
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',false,$cookietime=0);
+
$GLOBALS['phpgw']->redirect_link('/index.php',$redirect_data);
+ }
+
$GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
/* A few hacker resistant constants that will be used throught
the program */
- [Phpgroupware-cvs] phpgwapi/inc functions.inc.php,
Sigurd Nes <=