Modification suggested by jukka salmi <jukka@salmi.ch>

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2113 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/login.php b/src/login.php
index a069b52d6fc43573181bee139ed0c87acacabcb7..12efa9f266df71381296f63166aeafa24b51bb49 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -12,157 +12,140 @@
  * $Id$
  */
 
  * $Id$
  */
 

-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the first two lines below look.                      ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-

 $rcptaddress = '';
 if (isset($emailaddress)) {
 $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;
-                $$naame = $val;
-            }
+    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;
+            $$naame = $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;
-            }
+    }
+    
+    /* 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);

     }
     }

+    
+    /* Double-encode in this fashion to get past redirect.php properly. */
+    $rcptaddress = urlencode($rcptaddress);
+}
+
+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');
+
+/*
+ * $squirrelmail_language is set by a cookie when the user selects
+ * language and logs out
+ */
+set_up_language($squirrelmail_language, TRUE);

 
 

+/* Need the base URI to set the cookies. (Same code as in webmail.php). */
+ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
+$base_uri = $regs[1];
+@session_destroy();

 
 

-
-    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');
-
-    /*
-     * $squirrelmail_language is set by a cookie when the user selects
-     * language and logs out
-     */
-    set_up_language($squirrelmail_language, true);
-
-    /* Need the base URI to set the cookies. (Same code as in webmail.php). */
-    ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
-    $base_uri = $regs[1];
-    @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);
-    header ('Pragma: no-cache');
-
-    do_hook('login_cookie');
-
-    /* Output the javascript onload function. */
-    displayHtmlHeader( "$org_name - " . _("Login"),
-                 "<SCRIPT LANGUAGE=\"JavaScript\">\n" .
-                 "<!--\n".
-                 "  function squirrelmail_loginpage_onload() {\n".
-                 "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
-                 "    document.forms[0].elements[0].focus();\n".
-                 "  }\n".
-                 "// -->\n".
-                 "</script>\n", FALSE );
-
-    /* Set the title of this page. */
-    echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000CC\" VLINK=\"#0000CC\" ALINK=\"#0000CC\" onLoad='squirrelmail_loginpage_onload();'>\n".
-         "<FORM ACTION=\"redirect.php\" METHOD=\"POST\" NAME=f>\n";
-
-    $username_form_name = 'login_username';
-    $password_form_name = 'secretkey';
-    do_hook('login_top');
-
-    $loginname_value = (isset($loginname) ? htmlspecialchars($loginname) : '');
-
-    echo "<CENTER>".
-         "  <IMG SRC=\"$org_logo\"><BR>\n".
-         ( $hide_sm_attributions ? '' :
-           '<SMALL>' . sprintf (_("SquirrelMail version %s"), $version) . "<BR>\n".
-           '  ' . _("By the SquirrelMail Development Team") . "<BR></SMALL>\n" ) .
-         "</CENTER>\n".
-
-         "<CENTER>\n".
-         "<TABLE COLS=1 WIDTH=350>\n".
-         "   <TR><TD ALIGN=CENTER BGCOLOR=\"#DCDCDC\">\n".
-         '      <B>' . sprintf (_("%s Login"), $org_name) . "</B>\n".
-         "   </TD></TR>".
-         "   <TR><TD BGCOLOR=\"#FFFFFF\"><TABLE COLS=2 WIDTH=\"100%\">\n".
-         "      <TR>\n".
-         '         <TD WIDTH="30%" ALIGN=right>' . _("Name:") . "</TD>\n".
-         "         <TD WIDTH=\"*\" ALIGN=left>\n".
-         "            <INPUT TYPE=TEXT NAME=\"$username_form_name\" VALUE=\"$loginname_value\">\n".
-         "         </TD>\n".
-         "      </TR>\n".
-         "      <TR>\n".
-         '         <TD WIDTH="30%" ALIGN=right>' . _("Password:") . "</TD>\n".
-         "         <TD WIDTH=\"*\" ALIGN=left>\n".
-         "            <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";
-    if ($rcptaddress != '') {
-        echo "         <INPUT TYPE=HIDDEN NAME=\"rcptemail\" VALUE=\"".htmlspecialchars($rcptaddress)."\">\n";
-    }
-    echo "         </TD>\n".
-         "      </TR>\n".
-         "   </TABLE></TD></TR>\n".
-         "   <TR><TD>\n".
-         '      <CENTER><INPUT TYPE=SUBMIT VALUE="' . _("Login") . "\"></CENTER>\n".
-         "   </TD></TR>\n".
-         "</TABLE>\n".
-         "</CENTER>\n";
-
-    do_hook('login_form');
-    echo "</FORM>\n";
-
-    do_hook('login_bottom');
-    echo "</BODY>\n".
-         "</HTML>\n";
-?>
+/*
+ * 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);
+header('Pragma: no-cache');
+
+do_hook('login_cookie');
+
+/* Output the javascript onload function. */
+
+$header = "<SCRIPT LANGUAGE=\"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".
+          "  }\n".
+          "// -->\n".
+          "</script>\n";
+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();'>\n".
+     "<FORM ACTION=\"redirect.php\" METHOD=\"POST\" NAME=f>\n";
+
+$username_form_name = 'login_username';
+$password_form_name = 'secretkey';
+do_hook('login_top');
+
+$loginname_value = (isset($loginname) ? htmlspecialchars($loginname) : '');
+
+echo "<CENTER>".
+     "  <IMG SRC=\"$org_logo\"><BR>\n".
+     ( $hide_sm_attributions ? '' :
+       '<SMALL>' . sprintf (_("SquirrelMail version %s"), $version) . "<BR>\n".
+       '  ' . _("By the SquirrelMail Development Team") . "<BR></SMALL>\n" ) .
+     "</CENTER>\n".
+
+     "<CENTER>\n".
+     "<TABLE COLS=1 WIDTH=350>\n".
+     "   <TR><TD ALIGN=CENTER BGCOLOR=\"#DCDCDC\">\n".
+     '      <B>' . sprintf (_("%s Login"), $org_name) . "</B>\n".
+     "   </TD></TR>".
+     "   <TR><TD BGCOLOR=\"#FFFFFF\"><TABLE COLS=2 WIDTH=\"100%\">\n".
+     "      <TR>\n".
+     '         <TD WIDTH="30%" ALIGN=right>' . _("Name:") . "</TD>\n".
+     "         <TD WIDTH=\"*\" ALIGN=left>\n".
+     "            <INPUT TYPE=TEXT NAME=\"$username_form_name\" VALUE=\"$loginname_value\">\n".
+     "         </TD>\n".
+     "      </TR>\n".
+     "      <TR>\n".
+     '         <TD WIDTH="30%" ALIGN=right>' . _("Password:") . "</TD>\n".
+     "         <TD WIDTH=\"*\" ALIGN=left>\n".
+     "            <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";
+if ($rcptaddress != '') {
+    echo "         <INPUT TYPE=HIDDEN NAME=\"rcptemail\" VALUE=\"".htmlspecialchars($rcptaddress)."\">\n";
+}
+echo "         </TD>\n".
+     "      </TR>\n".
+     "   </TABLE></TD></TR>\n".
+     "   <TR><TD>\n".
+     '      <CENTER><INPUT TYPE=SUBMIT VALUE="' . _("Login") . "\"></CENTER>\n".
+     "   </TD></TR>\n".
+     "</TABLE>\n".
+     "</CENTER>\n";
+
+do_hook('login_form');
+echo "</FORM>\n";
+
+do_hook('login_bottom');
+echo "</BODY>\n".
+     "</HTML>\n";
+?>
\ No newline at end of file