Closes bug #479899

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index dfca03d829cbc48c602f1633cc02eb5948423409..3544d162c557b6e22ee820fceb836527988adc89 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -13,13 +13,16 @@
     **  $Id$
     **/
 
-   include ('../functions/strings.php');
-   include ('../config/config.php');
-   include ('../functions/prefs.php');
-   include ('../functions/imap.php');
-   include ('../functions/plugin.php');
-   include ('../functions/i18n.php');
-   include ('../functions/auth.php');
+   require_once('../functions/strings.php');
+   require_once('../config/config.php');
+   require_once('../functions/prefs.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/plugin.php');
+   require_once('../functions/i18n.php');
+   require_once('../functions/auth.php');
+
+   ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
+   $base_uri = $regs[1];
 
    session_start();
    is_logged_in();
@@ -32,7 +35,7 @@
    // such discrepancy.
    $my_language=getPref($data_dir, $username, "language");
    if ($my_language != $squirrelmail_language)
-     setcookie('squirrelmail_language', $my_language, time()+2592000);
+     setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
 
    set_up_language(getPref($data_dir, $username, 'language'));
 
@@ -99,4 +102,4 @@
 
 ?>
 </FRAMESET>
-</HEAD></HTML>
+</HEAD></HTML>
\ No newline at end of file