X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=4c4c41c3f0fa3c3115ba34c69f3f97cdc997fea1;hb=0b6aacc9568e7aa0ca41aebad02e572f48a0c346;hp=d87f7497578a56f692767eb5ad06945260c71dc1;hpb=8672576304f4da444b9b1e0e4ca81505af0267ec;p=squirrelmail.git diff --git a/src/login.php b/src/login.php index d87f7497..4c4c41c3 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 @@ -23,6 +23,7 @@ require_once(SM_PATH . 'functions/plugin.php'); require_once(SM_PATH . 'functions/constants.php'); require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/html.php'); +require_once(SM_PATH . 'functions/global.php'); /* * $squirrelmail_language is set by a cookie when the user selects @@ -37,62 +38,80 @@ if (!function_exists('sqm_baseuri')){ require_once(SM_PATH . 'functions/display_messages.php'); } $base_uri = sqm_baseuri(); -@session_destroy(); /* * In case the last session was not terminated properly, make sure * we get a new one. */ -$cookie_params = session_get_cookie_params(); -setcookie(session_name(), '', 0, $cookie_params['path'], - $cookie_params['domain']); -setcookie('username', '', 0, $base_uri); -setcookie('key', '', 0, $base_uri); + +sqsession_destroy(); + header('Pragma: no-cache'); 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', +if(sqgetGlobalVar('mailto', $mailto)) { + $rcptaddress = '' . "\n"; +} else { + $rcptaddress = ''; +} +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', @@ -107,7 +126,7 @@ html_tag( 'table', _("Name:") , 'right', '', 'width="30%"' ) . html_tag( 'td', - '' , + '' , 'left', '', 'width="*"' ) ) . "\n" . html_tag( 'tr', @@ -115,26 +134,26 @@ html_tag( 'table', _("Password:") , 'right', '', 'width="30%"' ) . html_tag( 'td', - '' . "\n" . - '' . "\n" . - '' . "\n", + '' . "\n" . + '' . "\n" . + $rcptaddress . + '' . "\n", 'left', '', 'width="*"' ) ) , - 'center', '#ffffff', 'border="0" cols="2" width="100%"' ) , + 'center', '#ffffff', 'border="0" width="100%"' ) , 'left', '#FFFFFF' ) ) . html_tag( 'tr', html_tag( 'td', - '', + '', 'left' ) ), - '', '#ffffff', 'border="0" cols="1" width="350"' ), + '', '#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".