String fixes. "Mails" are what the user sends, "messages" are system information...

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index 0ae20dd679eec094c69f79a97960ac3e8469ca9b..21fe8fa19aec2e4817a34569a53c907a32c4c640 100644 (file)
--- 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,10 +115,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 +123,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 +137,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")."<br />\n" .
-                        _("By the SquirrelMail Project Team")."<br />\n";
+    $sm_attribute_str = _("SquirrelMail Webmail Application")."\n" .
+                        _("By the SquirrelMail Project Team");
 }
 
 if(sqgetGlobalVar('mailtodata', $mailtodata)) {