X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=9b0dced9e2f36efd3ffa93a6c6059a4365721015;hb=8a97a0700890e64b82493817bbae050898b876a2;hp=9fd1c6ab5180c5ded562ce0c59edfddd18c7b2f8;hpb=cbaf4cf1a2c0ac6142fb48a22371d4b5963bd48b;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index 9fd1c6ab..9b0dced9 100644 --- a/src/login.php +++ b/src/login.php @@ -43,7 +43,7 @@ $base_uri = sqm_baseuri(); * In case the last session was not terminated properly, make sure * we get a new one. */ - + sqsession_destroy(); header('Pragma: no-cache'); @@ -56,20 +56,30 @@ $header = "\n"; $custom_css = 'none'; displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE ); -echo ''; +echo '' . + "\n" . '

' . "\n"; $username_form_name = 'login_username'; $password_form_name = 'secretkey'; do_hook('login_top'); -$loginname_value = (isset($loginname) ? htmlspecialchars($loginname) : ''); +$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : ''); /* If they don't have a logo, don't bother.. */ if (isset($org_logo) && $org_logo) { @@ -85,8 +95,7 @@ if (isset($org_logo) && $org_logo) { } } -echo "\n" . '' . "\n" . -html_tag( 'table', +echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', ''. @@ -95,7 +104,7 @@ html_tag( 'table', sprintf(_("%s Logo"), $org_name) .'"' . $width_and_height . ' />
' . "\n" : '' ). - ( $hide_sm_attributions ? '' : + ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' : '' . sprintf (_("SquirrelMail version %s"), $version) . '
' ."\n". ' ' . _("By the SquirrelMail Development Team") . '
' . "\n" ) . html_tag( 'table',