X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Flogin.php;h=d3abfc28fd1477231eadacf438b6b470efa4a8e9;hp=e21cc3e67fc7df33bd2a6d9dc8f854f00193a974;hb=ebd2391cb0c5e3049870f90fa8a8b28707e9571a;hpb=602a123e5f75c57dace7d147cbe274b4230b7178

diff --git a/src/login.php b/src/login.php
index e21cc3e6..d3abfc28 100644
--- a/src/login.php
+++ b/src/login.php
@@ -6,12 +6,15 @@
  * 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
  */
 
+/** This is the login page */
+define('PAGE_NAME', 'login');
+
 // reduces the files included in init.php
 $sInitLocation = 'login';
 
@@ -31,20 +34,24 @@ require_once(SM_PATH . 'functions/forms.php');
  */
 set_up_language($squirrelmail_language, TRUE, TRUE);
 
-/*
- * In case the last session was not terminated properly, make sure
- * we get a new one.
- */
-sqsession_destroy();
 /**
- * PHP bug. http://bugs.php.net/11643 (warning, spammed bug tracker) and
- * http://bugs.php.net/13834
- * SID constant is not destroyed in PHP 4.1.2, 4.2.3 and maybe other
- * versions. Produces warning on login page. Bug should be fixed only in 4.3.0
+ * In case the last session was not terminated properly, make sure
+ * we get a new one, but make sure we preserve session_expired_*
  */
-@sqsession_is_active();
-$_SESSION=array();
-
+if ( !empty($_SESSION['session_expired_post']) && !empty($_SESSION['session_expired_location']) ) {
+    $sep = $_SESSION['session_expired_post'];
+    $sel = $_SESSION['session_expired_location'];
+
+    sqsession_destroy();
+    @sqsession_is_active();
+    $_SESSION=array();
+    sqsession_register($sep, 'session_expired_post');
+    sqsession_register($sel, 'session_expired_location');
+} else {
+    sqsession_destroy();
+    @sqsession_is_active();
+    $_SESSION=array();
+}
 
 /**
  * This detects if the IMAP server has logins disabled, and if so,
@@ -75,10 +82,11 @@ if($imap_auth_mech == 'login') {
     }
 }
 
-do_hook('login_cookie');
+do_hook('login_cookie', $null);
 
 $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
 
+//FIXME: should be part of the template, not the core!
 /* Output the javascript onload function. */
 $header = "<script type=\"text/javascript\">\n" .
           "<!--\n".
@@ -110,68 +118,74 @@ 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 );
 
 
+
 /* 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 = '<img src="'.$org_logo.'" ' .
-                'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
-                $width_and_height .
-                'class="sqm_loginImage" /><br />'."\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")."<br />\n" .
-                        _("By the SquirrelMail Project Team")."<br />\n";
+    $sm_attribute_str = _("SquirrelMail Webmail")."\n" .
+                        _("By the SquirrelMail Project Team");
 }
 
-$username_form_name = 'login_username';
-$password_form_name = 'secretkey';
-
-if(sqgetGlobalVar('mailto', $mailto)) {
-    $rcptaddress = addHidden('mailto', $mailto);
+if(sqgetGlobalVar('mailtodata', $mailtodata)) {
+    $mailtofield = addHidden('mailtodata', $mailtodata);
 } else {
-    $rcptaddress = '';
+    $mailtofield = '';
 }
 
-$password_field = addPwField($password_form_name).
-                  addHidden('js_autodetect_results', SMPREF_JS_OFF).
-                  $rcptaddress .
-                  addHidden('just_logged_in', '1');
+$password_field = addPwField('secretkey');
+$login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
+               $mailtofield .
+               addHidden('just_logged_in', '1');
 
 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));
-$oTemplate->assign('login_field', addInput($username_form_name, $loginname_value));
-$oTemplate->assign('password_field', $password_field);
-$oTemplate->assign('submit_field', addSubmit(_("Login")));
+// 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 '<body onload="squirrelmail_loginpage_onload()">'."\n";
+echo '<form action="redirect.php" method="post" onsubmit="document.forms[0].js_autodetect_results.value='. SMPREF_JS_ON .'">'."\n";
+do_hook('login_top', $null);
 
 $oTemplate->display('login.tpl');
 
+//FIXME: need to remove *ALL* HTML from this file!
+echo "</form>\n";
+do_hook('login_bottom', $null);
+
 // Turn off delayed error handling to make sure all errors are dumped.
-#$oErrorHandler->delayedErrors(false);
+$oErrorHandler->setDelayedErrors(false);
 
-#trigger_error('login');
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file