X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Flogin.php;h=10566952ec68ca0fa542c11dc7c67f133cc74ccd;hp=044286881778ca30ca795a3a22db50b91232544d;hb=8949acd68dc6459372ef79823c88c0fbf2ae4e23;hpb=4b4abf93a9624311afef0c385023724ee46a2b60

diff --git a/src/login.php b/src/login.php
index 04428688..10566952 100644
--- a/src/login.php
+++ b/src/login.php
@@ -6,27 +6,21 @@
  * This a simple login screen. Some housekeeping is done to clean
  * cookies and find language.
  *
- * @copyright © 1999-2005 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');
+
 /**
- * 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,23 +30,6 @@ 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();
-
-header('Pragma: no-cache');
-
 /**
  * This detects if the IMAP server has logins disabled, and if so,
  * squelches the display of the login form and puts up a message
@@ -74,27 +51,33 @@ 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;
         }
     }
 }
 
-do_hook('login_cookie');
+$username_form_name = 'login_username';
+$password_form_name = 'secretkey';
+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 language=\"JavaScript\" type=\"text/javascript\">\n" .
+$header = "<script type=\"text/javascript\">\n" .
           "<!--\n".
+          "  var alreadyFocused = false;\n".
           "  function squirrelmail_loginpage_onload() {\n".
-          "    var textElements = 0;\n".
-          "    for (i = 0; i < document.forms[0].elements.length; i++) {\n".
-          "      if (document.forms[0].elements[i].type == \"text\" || document.forms[0].elements[i].type == \"password\") {\n".
+          "    if (alreadyFocused) return;\n".
+          "    var textElements = 0; var i = 0;\n".
+          "    for (i = 0; i < document.login_form.elements.length; i++) {\n".
+          "      if (document.login_form.elements[i].type == \"text\" || document.login_form.elements[i].type == \"password\") {\n".
           "        textElements++;\n".
           "        if (textElements == " . (isset($loginname) ? 2 : 1) . ") {\n".
-          "          document.forms[0].elements[i].focus();\n".
+          "          document.login_form.elements[i].focus();\n".
           "          break;\n".
           "        }\n".
           "      }\n".
@@ -119,88 +102,64 @@ if (! isset($color) || ! is_array($color)) {
 
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
-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";
 
-$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 = $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 = create_image($org_logo, sprintf(_("%s Logo"), $org_name),
+                             $width, $height, '', 'sqm_loginImage');
+
 }
 
-if(sqgetGlobalVar('mailto', $mailto)) {
-    $rcptaddress = addHidden('mailto', $mailto);
+$sm_attribute_str = '';
+if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
+    $sm_attribute_str = _("SquirrelMail Webmail")."\n" .
+                        _("By the SquirrelMail Project Team");
+}
+
+if(sqgetGlobalVar('mailtodata', $mailtodata)) {
+    $mailtofield = addHidden('mailtodata', $mailtodata);
 } else {
-    $rcptaddress = '';
+    $mailtofield = '';
 }
-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="*"' )
-                                ) .
-                                concat_hook_function('login_form') ,
-                            '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%"' );
-echo '</form>' . "\n";
-
-do_hook('login_bottom');
-
-?>
-</body></html>
\ No newline at end of file
+
+$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, FALSE);
+$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));
+// 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, FALSE);
+
+$oTemplate->display('login.tpl');
+
+do_hook('login_bottom', $null);
+
+// Turn off delayed error handling to make sure all errors are dumped.
+$oErrorHandler->setDelayedErrors(false);
+
+$oTemplate->display('footer.tpl');