X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=5122421ab912ddc9b252b028ca2974c539f54f4b;hb=b953f34f3599975505663213e14e7868ac8c5816;hp=0ae20dd679eec094c69f79a97960ac3e8469ca9b;hpb=0173ad2929d8a3539abbbf1a6bc61ce8be5381ab;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index 0ae20dd6..5122421a 100644
--- a/src/login.php
+++ b/src/login.php
@@ -6,21 +6,20 @@
* This a simple login screen. Some housekeeping is done to clean
* cookies and find language.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
-// reduces the files included in init.php
-$sInitLocation = 'login';
+/** This is the login page */
+define('PAGE_NAME', 'login');
/**
* Include the SquirrelMail initialization file.
*/
require('../include/init.php');
-
/* SquirrelMail required files. */
require_once(SM_PATH . 'functions/imap_general.php');
require_once(SM_PATH . 'functions/forms.php');
@@ -115,10 +114,6 @@ if (! isset($color) || ! is_array($color)) {
$color[7] = '#0000cc'; /* blue Links */
$color[8] = '#000000'; /* black Normal text */
}
-/**
- * send out all the cookies
- */
-sqsetcookieflush();
displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
@@ -127,7 +122,7 @@ displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
/* If they don't have a logo, don't bother.. */
$logo_str = '';
if (isset($org_logo) && $org_logo) {
-
+
if (isset($org_logo_width) && is_numeric($org_logo_width) &&
$org_logo_width>0) {
$width = $org_logo_width;
@@ -141,16 +136,15 @@ if (isset($org_logo) && $org_logo) {
$height = '';
}
- $logo_str = create_image($org_logo, sprintf(_("%s Logo"), $org_name),
+ $logo_str = create_image($org_logo, sprintf(_("%s Logo"), $org_name),
$width, $height, '', 'sqm_loginImage');
}
$sm_attribute_str = '';
if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
-//FIXME: need to remove *ALL* HTML from this file!
- $sm_attribute_str = _("SquirrelMail Webmail Application")."
\n" .
- _("By the SquirrelMail Project Team")."
\n";
+ $sm_attribute_str = _("SquirrelMail Webmail")."\n" .
+ _("By the SquirrelMail Project Team");
}
if(sqgetGlobalVar('mailtodata', $mailtodata)) {
@@ -169,13 +163,16 @@ session_write_close();
$oTemplate->assign('logo_str', $logo_str);
$oTemplate->assign('logo_path', $org_logo);
$oTemplate->assign('sm_attribute_str', $sm_attribute_str);
+// i18n: The %s represents the service provider's name
$oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
+// i18n: The %s represents the service provider's name
+$oTemplate->assign('org_logo_str', sprintf (_("The %s logo"), $org_name));
$oTemplate->assign('login_field_value', $loginname_value);
$oTemplate->assign('login_extra', $login_extra);
//FIXME: need to remove *ALL* HTML from this file!
-echo ''."\n";
-echo '