X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Flogin.php;h=850f13d1e07621ddadb441b386c1a91d16c35cdc;hp=79aaaa824e5b52c9a2684c90ef50479d1fd28717;hb=b86f98e4d616f433403a56bfee1baab637c977bc;hpb=c53301969d687c30665ced0ea738d3205ac7bbdd

diff --git a/src/login.php b/src/login.php
index 79aaaa82..850f13d1 100644
--- a/src/login.php
+++ b/src/login.php
@@ -12,21 +12,16 @@
  * @package squirrelmail
  */
 
+// reduces the files included in init.php
+$sInitLocation = 'login';
+
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../');
+require('../include/init.php');
+
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'config/config.php');
-require_once(SM_PATH . 'functions/i18n.php');
-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');
 require_once(SM_PATH . 'functions/imap_general.php');
 require_once(SM_PATH . 'functions/forms.php');
 
@@ -37,27 +32,23 @@ require_once(SM_PATH . 'functions/forms.php');
 set_up_language($squirrelmail_language, TRUE, TRUE);
 
 /**
- * Find out the base URI to set cookies.
- */
-if (!function_exists('sqm_baseuri')){
-    require_once(SM_PATH . 'functions/display_messages.php');
-}
-$base_uri = sqm_baseuri();
-
-/*
  * In case the last session was not terminated properly, make sure
- * we get a new one.
+ * we get a new one, but make sure we preserve session_expired_*
  */
-
-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
- */
-@sqsession_start();
-header('Pragma: no-cache');
+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,
@@ -80,36 +71,19 @@ if($imap_auth_mech == 'login') {
                 $string .= _("Also, the use of TLS may allow SquirrelMail to login.").'<br />';
             }
             $string .= _("Please contact your system administrator and report this error.");
-            error_box($string,$color);
+            error_box($string);
+            // display footer (closes html tags) and stop script execution
+            $oTemplate->display('footer.tpl');
             exit;
         }
     }
 }
 
-/*
- * Initialize the template object and custom error handler object
- */
-include_once(SM_PATH . 'class/template/template.class.php');
-include_once(SM_PATH . 'class/error.class.php');
-
-/*
- * $sTplDir is not initialized when a user is not logged in, so we will use
- * the config file defaults here.  If the neccesary variables are net set,
- * force a default value.
- */
-$aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
-$templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
-$sTplDir = ( !isset($aTemplateSet[$templateset_default]['PATH']) ? 
-             SM_PATH . 'templates/default/' : 
-             $aTemplateSet[$templateset_default]['PATH'] );
-
-$oTemplate = new Template($sTplDir);
-$oErrorHandler = new ErrorHandler($oTemplate,'error_message.tpl');
-
-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".
@@ -145,55 +119,69 @@ if (! isset($color) || ! is_array($color)) {
 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 = '';
-$hide_sm_attributes = false;
-if (isset($hide_sm_attributes) && !$hide_sm_attributes) {
+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";
 }
 
-$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('color', $color);
 $oTemplate->assign('logo_str', $logo_str);
+$oTemplate->assign('logo_path', $org_logo);
 $oTemplate->assign('sm_attribute_str', $sm_attribute_str);
 $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")));
+$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');
-?>
\ No newline at end of file
+
+//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->setDelayedErrors(false);
+
+$oTemplate->display('footer.tpl');
+?>