X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=65e0499916b11ab9bdb303a75e96737fa298b52f;hb=2051195302f0efd409060f57944177fa26b93b8a;hp=dd73704f69a6504119d72a40de2ce88dfad0987a;hpb=02b0b1d503e51f2cccc2849493974ded635d3271;p=squirrelmail.git

diff --git a/src/login.php b/src/login.php
index dd73704f..65e04999 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');
@@ -116,7 +118,7 @@ html_tag( 'table',
                                     '<input type=hidden name="just_logged_in" value=1>' . "\n",
                                 'left', '', 'width="*"' )
                             ) ,
-                        'center', '#ffffff', 'border="0" cols="2" width="100%"' ) ,
+                        'center', '#ffffff', 'border="0" width="100%"' ) ,
                     'left', '#FFFFFF' )
                 ) . 
                 html_tag( 'tr',
@@ -124,7 +126,7 @@ html_tag( 'table',
                         '<center><input type="submit" value="' . _("Login") . '"></center>',
                     'left' )
                 ),
-            '', '#ffffff', 'border="0" cols="1" width="350"' ),
+            '', '#ffffff', 'border="0" width="350"' ) . '</center>',
         'center' )
     ) ,
 '', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) .