X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=50efeb3f795f0b104e3b693c78002a38269b453e;hb=8e530924279d64d4fda7263d18846c678fc308f3;hp=4cb1f31e37ede846876f5e0caa9abda72a28d51f;hpb=31633bef0e1ed61b1a040443f2a2a878a7d1bc13;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index 4cb1f31e..50efeb3f 100644 --- 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'); @@ -165,7 +158,6 @@ $password_field = addPwField('secretkey'); $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF). $rcptaddress . addHidden('just_logged_in', '1'); -$plugin_extra = concat_hook_function('login_form'); session_write_close(); @@ -175,7 +167,6 @@ $oTemplate->assign('sm_attribute_str', $sm_attribute_str); $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name)); $oTemplate->assign('login_field_value', $loginname_value); $oTemplate->assign('login_extra', $login_extra); -$oTemplate->assign('plugin_extra', $plugin_extra); echo ''."\n"; echo '