From: Philippe M. <phi...@us...> - 2001-11-27 19:10:33
|
Update of /cvsroot/squirrelmail/squirrelmail/functions In directory usw-pr-cvs1:/tmp/cvs-serv588/functions Modified Files: imap_general.php Log Message: Fixed login crash Index: imap_general.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_general.php,v retrieving revision 1.75 retrieving revision 1.76 diff -u -w -r1.75 -r1.76 --- imap_general.php 2001/11/26 19:33:28 1.75 +++ imap_general.php 2001/11/27 19:10:28 1.76 @@ -20,15 +20,12 @@ */ function sqimap_session_id() { - if (session_id() == '') - global $RememberedSessionID; - - if (! isset($RememberedSessionID)) - $RememberedSessionID = GenerateRandomString(4, '', 7); - else - $RememberedSessionID = substr(session_id(), -4); + $IMAPSessionID = substr(session_id(), -4); + if( $IMAPSessionID == '' ) { + $IMAPSessionID = GenerateRandomString(4, '', 7); + } - return( $RememberedSessionID ); + return( $IMAPSessionID ); } @@ -142,6 +139,7 @@ ** will be displayed. This function returns the imap connection handle. ******************************************************************************/ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) { + global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad; $imap_stream = fsockopen ($imap_server_address, $imap_port, |