require instead of include_once

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index a1228d4b6c22d64941ce9175c86cf81669a9a145..50efeb3f795f0b104e3b693c78002a38269b453e 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -35,19 +35,12 @@ set_up_language($squirrelmail_language, TRUE, TRUE);
  * In case the last session was not terminated properly, make sure
  * we get a new one, but make sure we preserve session_expired_*
  */
-/**
- * PHP bug. http://bugs.php.net/11643 (warning, spammed bug tracker) and
- * http://bugs.php.net/13834
- * SID constant is not destroyed in PHP 4.1.2, 4.2.3 and maybe other
- * versions. Produces warning on login page. Bug should be fixed only in 4.3.0
- */
 if ( !empty($_SESSION['session_expired_post']) && !empty($_SESSION['session_expired_location']) ) {
     $sep = $_SESSION['session_expired_post'];
     $sel = $_SESSION['session_expired_location'];
 
     sqsession_destroy();
-  
-    sqsession_is_active();
+    @sqsession_is_active();
     $_SESSION=array();
     sqsession_register($sep, 'session_expired_post');
     sqsession_register($sel, 'session_expired_location');
@@ -164,8 +157,7 @@ if(sqgetGlobalVar('mailto', $mailto)) {
 $password_field = addPwField('secretkey');
 $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
                $rcptaddress .
-               addHidden('just_logged_in', '1') .
-               concat_hook_function('login_form');
+               addHidden('just_logged_in', '1');
 
 session_write_close();