X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=3544d162c557b6e22ee820fceb836527988adc89;hb=d2c47f00c6069f0e42dc1d99f2f23b53a0a7a118;hp=ae497bad6a0fb1c47936ffee559b987dbe1e6c2e;hpb=cf47d3639c3b0845b5643bed6b85e4525c32cb13;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index ae497bad..3544d162 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -13,35 +13,20 @@
** $Id$
**/
- session_start();
-
- if (!isset($i18n_php))
- include ('../functions/i18n.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');
- if(!isset($username)) {
- set_up_language($squirrelmail_language);
- include ('../themes/default_theme.php');
- include ('../functions/display_messages.php');
- printf('',
- $color[8], $color[4], $color[7], $color[7], $color[7]);
- plain_error_message(_("You need a valid user and password to access this page!")
- . "
"
- . _("Click here to log back in.") . ".", $color);
- echo '';
- exit;
- }
+ ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
+ $base_uri = $regs[1];
- if (!isset($strings_php))
- include ('../functions/strings.php');
- include ('../config/config.php');
- include ('../functions/prefs.php');
- include ('../functions/imap.php');
- if (!isset($plugin_php))
- include ('../functions/plugin.php');
- if (!isset($auth_php))
- include ('../functions/auth.php');
-
- include ('../src/load_prefs.php');
+ session_start();
+ is_logged_in();
+ checkForPrefs($data_dir, $username);
// We'll need this to later have a noframes version
//
@@ -50,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'));
@@ -59,13 +44,22 @@
echo $org_title;
echo '';
- $bar_size = $left_size;
+ $left_size = getPref($data_dir, $username, "left_size");
+ $location_of_bar = getPref($data_dir, $username, "location_of_bar");
+ if ($location_of_bar == '')
+ $location_of_bar = 'left';
+ if ($left_size == "") {
+ if (isset($default_left_size))
+ $left_size = $default_left_size;
+ else
+ $left_size = 200;
+ }
if ($location_of_bar == 'right')
{
- echo "