X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=a1228d4b6c22d64941ce9175c86cf81669a9a145;hb=84d108855167644226a82106c1d956db12f17e62;hp=a7c22d1f3b53c2679edbbc1aab1ea283d2452f25;hpb=bca2d025d9cd5d79463bc3621fe107d5b9f2518b;p=squirrelmail.git

diff --git a/src/login.php b/src/login.php
index a7c22d1f..a1228d4b 100644
--- a/src/login.php
+++ b/src/login.php
@@ -3,31 +3,25 @@
 /**
  * login.php -- simple login screen
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This a simple login screen. Some housekeeping is done to clean
  * cookies and find language.
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @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');
 
@@ -38,21 +32,30 @@ 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();
-
-header('Pragma: no-cache');
+/**
+ * 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
+ */
+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,7 +78,9 @@ 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;
         }
     }
@@ -86,8 +91,7 @@ do_hook('login_cookie');
 $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
 
 /* Output the javascript onload function. */
-
-$header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
+$header = "<script type=\"text/javascript\">\n" .
           "<!--\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    var textElements = 0;\n".
@@ -107,27 +111,48 @@ $header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
 if (@file_exists($theme[$theme_default]['PATH']))
    @include ($theme[$theme_default]['PATH']);
 
-displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
+if (! isset($color) || ! is_array($color)) {
+    // Add default color theme, if theme loading fails
+    $color = array();
+    $color[0]  = '#dcdcdc';  /* light gray    TitleBar               */
+    $color[1]  = '#800000';  /* red                                  */
+    $color[2]  = '#cc0000';  /* light red     Warning/Error Messages */
+    $color[4]  = '#ffffff';  /* white         Normal Background      */
+    $color[7]  = '#0000cc';  /* blue          Links                  */
+    $color[8]  = '#000000';  /* black         Normal text            */
+}
+/**
+ * send out all the cookies
+ */
+sqsetcookieflush();
 
-echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" onLoad=\"squirrelmail_loginpage_onload()\">" .
-     "\n" . '<form action="redirect.php" method="post" onSubmit="document.forms[0].js_autodetect_results.value=\'' . SMPREF_JS_ON .'\';">' . "\n";
+displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
-$username_form_name = 'login_username';
-$password_form_name = 'secretkey';
-do_hook('login_top');
 
 /* 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_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";
+}
+
+$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";
 }
 
 if(sqgetGlobalVar('mailto', $mailto)) {
@@ -135,62 +160,33 @@ if(sqgetGlobalVar('mailto', $mailto)) {
 } else {
     $rcptaddress = '';
 }
-echo html_tag( 'table',
-    html_tag( 'tr',
-        html_tag( 'td',
-            '<center>'.
-            ( isset($org_logo) && $org_logo
-              ? '<img src="' . $org_logo . '" alt="' .
-                sprintf(_("%s Logo"), $org_name) .'"' . $width_and_height .
-                ' /><br />' . "\n"
-              : '' ).
-            ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
-            '<small>' . _("SquirrelMail Webmail Application") . '<br />' ."\n".
-            '  ' . _("By the SquirrelMail Project Team") . '<br /></small>' . "\n" ) .
-            html_tag( 'table',
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        '<b>' . sprintf (_("%s Login"), $org_name) . "</b>\n",
-                    'center', $color[0] )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'td',  "\n" .
-                        html_tag( 'table',
-                            html_tag( 'tr',
-                                html_tag( 'td',
-                                    _("Name:") ,
-                                'right', '', 'width="30%"' ) .
-                                html_tag( 'td',
-                                    addInput($username_form_name, $loginname_value),
-                                'left', '', 'width="*"' )
-                                ) . "\n" .
-                            html_tag( 'tr',
-                                html_tag( 'td',
-                                    _("Password:") ,
-                                'right', '', 'width="30%"' ) .
-                                html_tag( 'td',
-                                    addPwField($password_form_name).
-                                    addHidden('js_autodetect_results', SMPREF_JS_OFF).
-                                    $rcptaddress .
-                                    addHidden('just_logged_in', '1'),
-                                    'left', '', 'width="*"' )
-                                ) ,
-                            'center', $color[4], 'border="0" width="100%"' ) ,
-                        'left', $color[4] )
-                        ) .
-                        html_tag( 'tr',
-                                html_tag( 'td',
-                                    '<center>'. addSubmit(_("Login")) .'</center>',
-                                    'left' )
-                                ),
-                        '', $color[4], 'border="0" width="350"' ) . '</center>',
-                        'center' )
-                        ) ,
-                        '', $color[4], 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
-do_hook('login_form');
-echo '</form>' . "\n";
 
+$password_field = addPwField('secretkey');
+$login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
+               $rcptaddress .
+               addHidden('just_logged_in', '1') .
+               concat_hook_function('login_form');
+
+session_write_close();
+
+$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_value', $loginname_value);
+$oTemplate->assign('login_extra', $login_extra);
+
+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');
+
+$oTemplate->display('login.tpl');
+
+echo "</form>\n";
 do_hook('login_bottom');
 
+// Turn off delayed error handling to make sure all errors are dumped.
+$oErrorHandler->setDelayedErrors(false);
+
+$oTemplate->display('footer.tpl');
 ?>
-</body></html>