X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=89d839305377d92854261b2b8156ded8f9e59983;hb=d8cffbab47c2fde196c462a2945a2c62b811372d;hp=1d3f3654fef53e9e2208571006fddf1e9a7359a2;hpb=8e2ed8074e44d18b334e13bfa80c2a4a78d37d13;p=squirrelmail.git

diff --git a/src/login.php b/src/login.php
index 1d3f3654..89d83930 100644
--- a/src/login.php
+++ b/src/login.php
@@ -12,13 +12,18 @@
  * $Id$
  */
 
-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
@@ -30,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,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%"' ) ,