X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=21fe8fa19aec2e4817a34569a53c907a32c4c640;hb=d7270cc414d34775b3aec09cb2364605695fdf43;hp=25d45e20268c1a9d58884714183f0e976e6b48a4;hpb=6e515418431c0a99f10705da21366fe7093f95b6;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index 25d45e20..21fe8fa1 100644
--- a/src/login.php
+++ b/src/login.php
@@ -6,7 +6,7 @@
* 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
@@ -115,40 +115,37 @@ 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 );
-//FIXME: need to remove *ALL* HTML from this file!
/* If they don't have a logo, don't bother.. */
$logo_str = '';
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\" ";
+ $width = $org_logo_width;
+ } else {
+ $width = '';
}
if (isset($org_logo_height) && is_numeric($org_logo_height) &&
$org_logo_height>0) {
- $width_and_height .= "height=\"$org_logo_height\" ";
+ $height = $org_logo_height;
+ } else {
+ $height = '';
}
-
- $logo_str = '
'."\n";
+
+ $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) {
- $sm_attribute_str = _("SquirrelMail Webmail Application")."
\n" .
- _("By the SquirrelMail Project Team")."
\n";
+ $sm_attribute_str = _("SquirrelMail Webmail Application")."\n" .
+ _("By the SquirrelMail Project Team");
}
if(sqgetGlobalVar('mailtodata', $mailtodata)) {
@@ -171,12 +168,14 @@ $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $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 '\n";
do_hook('login_bottom', $null);