X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=9b0dced9e2f36efd3ffa93a6c6059a4365721015;hb=8a97a0700890e64b82493817bbae050898b876a2;hp=a554a8bfc1d294bb05f6f875d4638bf00991cebc;hpb=d68323ff96429e9d788a5144aaf8aa1afffc494c;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index a554a8bf..9b0dced9 100644 --- a/src/login.php +++ b/src/login.php @@ -3,7 +3,7 @@ /** * login.php -- simple login screen * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This a simple login screen. Some housekeeping is done to clean @@ -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,38 +56,55 @@ $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) : ''); - -/* Display width and height like good little people */ -$width_and_height = ''; -if (isset($org_logo_width) && is_numeric($org_logo_width) && $org_logo_width>0) { - $width_and_height = " width=\"$org_logo_width\""; -} -if (isset($org_logo_height) && is_numeric($org_logo_height) && $org_logo_height>0) { - $width_and_height .= " height=\"$org_logo_height\""; +$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : ''); + +/* If they don't have a logo, don't bother.. */ +if (isset($org_logo) && $org_logo) { + /* Display width and height like good little people */ + $width_and_height = ''; + if (isset($org_logo_width) && is_numeric($org_logo_width) && + $org_logo_width>0) { + $width_and_height = " width=\"$org_logo_width\""; + } + if (isset($org_logo_height) && is_numeric($org_logo_height) && + $org_logo_height>0) { + $width_and_height .= " height=\"$org_logo_height\""; + } } -echo "\n" . '' . "\n" . -html_tag( 'table', +echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', '
'. - '' . sprintf(_(
' . "\n". - ( $hide_sm_attributions ? '' : + ( isset($org_logo) && $org_logo + ? '' . + sprintf(_(
' . "\n" + : '' ). + ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' : '' . sprintf (_("SquirrelMail version %s"), $version) . '
' ."\n". ' ' . _("By the SquirrelMail Development Team") . '
' . "\n" ) . html_tag( 'table', @@ -128,10 +145,9 @@ html_tag( 'table', '', '#ffffff', 'border="0" width="350"' ) . '
', 'center' ) ) , -'', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) . -'
' . "\n"; - +'', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ); do_hook('login_form'); +echo '' . "\n"; do_hook('login_bottom'); echo "\n".