X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=9b0dced9e2f36efd3ffa93a6c6059a4365721015;hb=8a97a0700890e64b82493817bbae050898b876a2;hp=65e0499916b11ab9bdb303a75e96737fa298b52f;hpb=12ff1cab14f01a1918c7d3d40e6358c13c3833a7;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index 65e04999..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'); @@ -52,45 +52,61 @@ do_hook('login_cookie'); /* Output the javascript onload function. */ -$header = "\n"; $custom_css = 'none'; displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE ); -/* Set the title of this page. */ -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 ? '' : - '' . sprintf (_("SquirrelMail version %s"), $version) . '
' ."\n". - ' ' . _("By the SquirrelMail Development Team") . '
' . "\n" ) . + ( 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', html_tag( 'tr', html_tag( 'td', @@ -105,7 +121,7 @@ html_tag( 'table', _("Name:") , 'right', '', 'width="30%"' ) . html_tag( 'td', - '' , + '' , 'left', '', 'width="*"' ) ) . "\n" . html_tag( 'tr', @@ -113,9 +129,9 @@ html_tag( 'table', _("Password:") , 'right', '', 'width="30%"' ) . html_tag( 'td', - '' . "\n" . - '' . "\n" . - '' . "\n", + '' . "\n" . + '' . "\n" . + '' . "\n", 'left', '', 'width="*"' ) ) , 'center', '#ffffff', 'border="0" width="100%"' ) , @@ -123,16 +139,15 @@ html_tag( 'table', ) . html_tag( 'tr', html_tag( 'td', - '', + '', 'left' ) ), '', '#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".