Only show text/plain if show_html_default=0

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index df1a1b9a54103b67a6d15f5d110f9836f406f79f..dd73704f69a6504119d72a40de2ce88dfad0987a 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -12,47 +12,6 @@
  * $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);
-}
-
 require_once('../functions/strings.php');
 require_once('../config/config.php');
 require_once('../functions/i18n.php');
@@ -113,37 +72,29 @@ $loginname_value = (isset($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) {
+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_int($org_logo_height) && $org_logo_height>0) {
+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 . ')">';
-}
-
-echo
+echo "\n" . '<form action="redirect.php" method="post">' . "\n" .
 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" .
-
             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',
@@ -162,27 +113,26 @@ html_tag( 'table',
                                 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=hidden name="just_logged_in" value=1>' . "\n",
                                 'left', '', 'width="*"' )
                             ) ,
-                        '', '', '', 'border="0" cols="2" width="100%"' ) ,
+                        'center', '#ffffff', 'border="0" cols="2" width="100%"' ) ,
                     'left', '#FFFFFF' )
-                ) . "\n" .
+                ) . 
                 html_tag( 'tr',
                     html_tag( 'td',
                         '<center><input type="submit" value="' . _("Login") . '"></center>',
                     'left' )
-                ) . "\n" ,
-            '', '', 'border="0" cols="1" width="350"' ) .
-            '</form>' . "\n",
-        'left' )
+                ),
+            '', '#ffffff', 'border="0" cols="1" width="350"' ),
+        'center' )
     ) ,
-'', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
+'', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) .
+'</form>' . "\n";
 
 do_hook('login_form');
 
 do_hook('login_bottom');
 echo "</body>\n".
      "</html>\n";
-?>
\ No newline at end of file
+?>