Whitespace in wrong place. Spotted by Robert L Mathews.

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index 79aaaa824e5b52c9a2684c90ef50479d1fd28717..e21cc3e67fc7df33bd2a6d9dc8f854f00193a974 100644 (file)
--- 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');
 
@@ -36,28 +31,20 @@ 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.
  */
-
 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 
+ * 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');
+@sqsession_is_active();
+$_SESSION=array();
+
 
 /**
  * This detects if the IMAP server has logins disabled, and if so,
@@ -80,32 +67,14 @@ 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');
 
 $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
@@ -141,6 +110,10 @@ 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 );
 
@@ -152,23 +125,21 @@ if (isset($org_logo) && $org_logo) {
     $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_and_height = "width=\"$org_logo_width\" ";
     }
     if (isset($org_logo_height) && is_numeric($org_logo_height) &&
      $org_logo_height>0) {
-        $width_and_height .= " height=\"$org_logo_height\"";
+        $width_and_height .= "height=\"$org_logo_height\" ";
     }
     
     $logo_str = '<img src="'.$org_logo.'" ' .
-                       'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
-                       $width_and_height .
-                'class="sqm_loginImage" ' .
-                       ' /><br />'."\n";
+                'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
+                $width_and_height .
+                'class="sqm_loginImage" /><br />'."\n";
 }
 
 $sm_attribute_str = '';
-$hide_sm_attributes = false;
-if (isset($hide_sm_attributes) && !$hide_sm_attributes) {
+if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
     $sm_attribute_str = _("SquirrelMail Webmail Application")."<br />\n" .
                         _("By the SquirrelMail Project Team")."<br />\n";
 }
@@ -187,7 +158,8 @@ $password_field = addPwField($password_form_name).
                   $rcptaddress .
                   addHidden('just_logged_in', '1');
 
-$oTemplate->assign('color', $color);
+session_write_close();
+
 $oTemplate->assign('logo_str', $logo_str);
 $oTemplate->assign('sm_attribute_str', $sm_attribute_str);
 $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
@@ -196,4 +168,10 @@ $oTemplate->assign('password_field', $password_field);
 $oTemplate->assign('submit_field', addSubmit(_("Login")));
 
 $oTemplate->display('login.tpl');
+
+// Turn off delayed error handling to make sure all errors are dumped.
+#$oErrorHandler->delayedErrors(false);
+
+#trigger_error('login');
+$oTemplate->display('footer.tpl');
 ?>
\ No newline at end of file