X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=4c4c41c3f0fa3c3115ba34c69f3f97cdc997fea1;hb=c3ccfa1912b4ca47279d259bb587ceb293ce5d83;hp=df1a1b9a54103b67a6d15f5d110f9836f406f79f;hpb=3fde693bb3935007ca630a23f72e352dd3889549;p=squirrelmail.git

diff --git a/src/login.php b/src/login.php
index df1a1b9a..4c4c41c3 100644
--- a/src/login.php
+++ b/src/login.php
@@ -3,7 +3,7 @@
 /**
  * login.php -- simple login screen
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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
@@ -12,54 +12,18 @@
  * $Id$
  */
 
-$rcptaddress = '';
-if (isset($emailaddress)) {
-    if (stristr($emailaddress, 'mailto:')) {
-        $rcptaddress = substr($emailaddress, 7);
-    } else {
-        $rcptaddress = $emailaddress;
-    }
-    
-    if (($pos = strpos($rcptaddress, '?')) !== false) {
-        $a = substr($rcptaddress, $pos + 1);
-        $rcptaddress = substr($rcptaddress, 0, $pos);
-        $a = explode('=', $a, 2);
-        if (isset($a[1])) {
-            $name = urldecode($a[0]);
-            $val = urldecode($a[1]);
-            global $$name;
-            $$name = $val;
-        }
-    }
-    
-    /* At this point, we have parsed a lot of the mailto stuff. */
-    /*   Let's do the rest -- CC, BCC, Subject, Body            */
-    /*   Note:  They can all be case insensitive                */
-    foreach ($GLOBALS as $k => $v) {
-        $key = strtolower($k);
-        $value = urlencode($v);
-        if ($key == 'cc') {
-            $rcptaddress .= '&send_to_cc=' . $value;
-        } else if ($key == 'bcc') {
-            $rcptaddress .= '&send_to_bcc=' . $value;
-        } else if ($key == 'subject') {
-            $rcptaddress .= '&subject=' . $value;
-        } else if ($key == 'body') {
-            $rcptaddress .= '&body=' . $value;
-        }
-    }
-    
-    /* Double-encode in this fashion to get past redirect.php properly. */
-    $rcptaddress = urlencode($rcptaddress);
-}
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-require_once('../functions/strings.php');
-require_once('../config/config.php');
-require_once('../functions/i18n.php');
-require_once('../functions/plugin.php');
-require_once('../functions/constants.php');
-require_once('../functions/page_header.php');
-require_once('../functions/html.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');
 
 /*
  * $squirrelmail_language is set by a cookie when the user selects
@@ -71,79 +35,89 @@ set_up_language($squirrelmail_language, TRUE);
  * Find out the base URI to set cookies.
  */
 if (!function_exists('sqm_baseuri')){
-    require_once('../functions/display_messages.php');
+    require_once(SM_PATH . 'functions/display_messages.php');
 }
 $base_uri = sqm_baseuri();
-@session_destroy();
 
 /*
  * In case the last session was not terminated properly, make sure
  * we get a new one.
  */
-$cookie_params = session_get_cookie_params();
-setcookie(session_name(), '', 0, $cookie_params['path'], 
-          $cookie_params['domain']);
-setcookie('username', '', 0, $base_uri);
-setcookie('key', '', 0, $base_uri);
+
+sqsession_destroy();
+ 
 header('Pragma: no-cache');
 
 do_hook('login_cookie');
 
 /* Output the javascript onload function. */
 
-$header = "<SCRIPT LANGUAGE=\"JavaScript\" type=\"text/javascript\">\n" .
+$header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
           "<!--\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
-          '    document.forms[0].elements[' . (isset($loginname) ? 1 : 0) . "].focus();\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".
+          "        textElements++;\n".
+          "        if (textElements == " . (isset($loginname) ? 2 : 1) . ") {\n".
+          "          document.forms[0].elements[i].focus();\n".
+          "          break;\n".
+          "        }\n".
+          "      }\n".
+          "    }\n".
           "  }\n".
           "// -->\n".
           "</script>\n";
 $custom_css = 'none';          
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
-/* Set the title of this page. */
-echo '<body text="#000000" bgcolor="#FFFFFF" link="#0000CC" vlink="#0000CC" alink="#0000CC" onLoad="squirrelmail_loginpage_onload();">';
+echo '<body text="#000000" bgcolor="#FFFFFF" link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="squirrelmail_loginpage_onload();">' .
+     "\n" . '<form action="redirect.php" method="post">' . "\n";
 
 $username_form_name = 'login_username';
 $password_form_name = 'secretkey';
 do_hook('login_top');
 
-$loginname_value = (isset($loginname) ? htmlspecialchars($loginname) : '');
+$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
 
-/* Display width and height like good little people */
-$width_and_height = '';
-if (isset($org_logo_width) && is_int($org_logo_width) && $org_logo_width>0) {
-    $width_and_height = " width=\"$org_logo_width\"";
-}
-if (isset($org_logo_height) && is_int($org_logo_height) && $org_logo_height>0) {
-    $width_and_height .= " height=\"$org_logo_height\"";
+/* If they don't have a logo, don't bother.. */
+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\"";
+    }
+    if (isset($org_logo_height) && is_numeric($org_logo_height) &&
+     $org_logo_height>0) {
+        $width_and_height .= " height=\"$org_logo_height\"";
+    }
 }
 
-$rcptaddress_input = '';
-if ($rcptaddress != '') {
-    $rcptaddress_input = '<input type="hidden" name="rcptemail" value="htmlspecialchars(' . $rcptaddress . ')">';
+if(sqgetGlobalVar('mailto', $mailto)) {
+    $rcptaddress = '<input type="hidden" name="mailto" value="' . urlencode($mailto) . '" />' . "\n";
+} else {
+    $rcptaddress = '';
 }
-
-echo
-html_tag( 'table',
+echo html_tag( 'table',
     html_tag( 'tr',
         html_tag( 'td',
-            "\n" . '<form action="redirect.php" method="post">' . "\n" .
             '<center>'.
-            '<img src="' . $org_logo . '" alt="' . sprintf(_("%s Logo"), $org_name) .'"' .
-            $width_and_height .'><br>' . "\n".
-            ( $hide_sm_attributions ? '' :
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br>' ."\n".
-            '  ' . _("By the SquirrelMail Development Team") . '<br></small>' . "\n" ) .
-            "<br>\n" .
-
+            ( 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>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
+            '  ' . _("By the SquirrelMail Development Team") . '<br /></small>' . "\n" ) .
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
                         '<b>' . sprintf (_("%s Login"), $org_name) . "</b>\n",
-                            'left', '#DCDCDC' )
-                    ) . "\n" .
+                    'center', '#DCDCDC' )
+                ) .
                 html_tag( 'tr',
                     html_tag( 'td',  "\n" .
                         html_tag( 'table',
@@ -152,7 +126,7 @@ html_tag( 'table',
                                     _("Name:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-                                    '<input type="text" name="' . $username_form_name .'" value="' . $loginname_value .'">' ,
+                                    '<input type="text" name="' . $username_form_name .'" value="' . $loginname_value .'" />' ,
                                 'left', '', 'width="*"' )
                                 ) . "\n" .
                             html_tag( 'tr',
@@ -160,29 +134,28 @@ html_tag( 'table',
                                     _("Password:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-                                    '<input type="password" name="' . $password_form_name . '">' . "\n" .
-                                    '<input type=hidden name="js_autodetect_results" value="SMPREF_JS_OFF">' . "\n" .
-                                    '<input type=hidden name="just_logged_in" value=1>' . "\n" .
-                                    $rcptaddress_input . "\n" ,
+                                    '<input type="password" name="' . $password_form_name . '" />' . "\n" .
+                                    '<input type="hidden" name="js_autodetect_results" value="SMPREF_JS_OFF" />' . "\n" .
+                                    $rcptaddress .
+                                    '<input type="hidden" name="just_logged_in" value="1" />' . "\n",
                                 'left', '', 'width="*"' )
                             ) ,
-                        '', '', '', 'border="0" cols="2" width="100%"' ) ,
+                        'center', '#ffffff', 'border="0" width="100%"' ) ,
                     'left', '#FFFFFF' )
-                ) . "\n" .
+                ) . 
                 html_tag( 'tr',
                     html_tag( 'td',
-                        '<center><input type="submit" value="' . _("Login") . '"></center>',
+                        '<center><input type="submit" value="' . _("Login") . '" /></center>',
                     'left' )
-                ) . "\n" ,
-            '', '', 'border="0" cols="1" width="350"' ) .
-            '</form>' . "\n",
-        'left' )
+                ),
+            '', '#ffffff', 'border="0" width="350"' ) . '</center>',
+        'center' )
     ) ,
-'', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
-
+'', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
 do_hook('login_form');
+echo '</form>' . "\n";
 
 do_hook('login_bottom');
 echo "</body>\n".
      "</html>\n";
-?>
\ No newline at end of file
+?>