forked from extern/egroupware
removed destroying of the crypto object if the session-verification fails, as it leads to problems in sitemgr creation of anonymous sessions and it get cleaned up anyway by the shutdown function
This commit is contained in:
parent
7bf13dd570
commit
a3fdeee860
@ -137,7 +137,6 @@
|
|||||||
$this->db = $GLOBALS['phpgw']->db;
|
$this->db = $GLOBALS['phpgw']->db;
|
||||||
$this->sessionid = get_var('sessionid',array('GET','COOKIE'));
|
$this->sessionid = get_var('sessionid',array('GET','COOKIE'));
|
||||||
$this->kp3 = get_var('kp3',array('GET','COOKIE'));
|
$this->kp3 = get_var('kp3',array('GET','COOKIE'));
|
||||||
|
|
||||||
/* Create the crypto object */
|
/* Create the crypto object */
|
||||||
$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
|
$GLOBALS['phpgw']->crypto = CreateObject('phpgwapi.crypto');
|
||||||
if ($GLOBALS['phpgw_info']['server']['usecookies'])
|
if ($GLOBALS['phpgw_info']['server']['usecookies'])
|
||||||
@ -316,11 +315,6 @@
|
|||||||
));
|
));
|
||||||
$GLOBALS['phpgw']->log->commit();
|
$GLOBALS['phpgw']->log->commit();
|
||||||
}
|
}
|
||||||
if(is_object($GLOBALS['phpgw']->crypto))
|
|
||||||
{
|
|
||||||
$GLOBALS['phpgw']->crypto->cleanup();
|
|
||||||
unset($GLOBALS['phpgw']->crypto);
|
|
||||||
}
|
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -343,11 +337,6 @@
|
|||||||
));
|
));
|
||||||
$GLOBALS['phpgw']->log->commit();
|
$GLOBALS['phpgw']->log->commit();
|
||||||
}
|
}
|
||||||
if(is_object($GLOBALS['phpgw']->crypto))
|
|
||||||
{
|
|
||||||
$GLOBALS['phpgw']->crypto->cleanup();
|
|
||||||
unset($GLOBALS['phpgw']->crypto);
|
|
||||||
}
|
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -369,11 +358,6 @@
|
|||||||
));
|
));
|
||||||
$GLOBALS['phpgw']->log->commit();
|
$GLOBALS['phpgw']->log->commit();
|
||||||
}
|
}
|
||||||
if(is_object($GLOBALS['phpgw']->crypto))
|
|
||||||
{
|
|
||||||
$GLOBALS['phpgw']->crypto->cleanup();
|
|
||||||
unset($GLOBALS['phpgw']->crypto);
|
|
||||||
}
|
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -395,19 +379,11 @@
|
|||||||
));
|
));
|
||||||
$GLOBALS['phpgw']->log->commit();
|
$GLOBALS['phpgw']->log->commit();
|
||||||
}
|
}
|
||||||
if(is_object($GLOBALS['phpgw']->crypto))
|
|
||||||
{
|
|
||||||
$GLOBALS['phpgw']->crypto->cleanup();
|
|
||||||
unset($GLOBALS['phpgw']->crypto);
|
|
||||||
}
|
|
||||||
//echo 'DEBUG: Sessions: account_id is empty!<br>'."\n";
|
//echo 'DEBUG: Sessions: account_id is empty!<br>'."\n";
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Functions for creating and verifying the session
|
* Functions for creating and verifying the session
|
||||||
|
Loading…
Reference in New Issue
Block a user