Remove save extension check for images because it can cause problems when

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index 4f6242bf03caf010cef520eb14678771a46ff883..89d839305377d92854261b2b8156ded8f9e59983 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -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);
-}
-
-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');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* 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,20 +35,17 @@ 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');
@@ -113,18 +74,13 @@ $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 "\n" . '<form action="redirect.php" method="post">' . "\n" .
 html_tag( 'table',
     html_tag( 'tr',
@@ -135,7 +91,6 @@ html_tag( 'table',
             ( $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',
@@ -160,8 +115,7 @@ 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="*"' )
                             ) ,
                         'center', '#ffffff', 'border="0" cols="2" width="100%"' ) ,
@@ -183,4 +137,4 @@ do_hook('login_form');
 do_hook('login_bottom');
 echo "</body>\n".
      "</html>\n";
-?>
\ No newline at end of file
+?>