X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=3544d162c557b6e22ee820fceb836527988adc89;hb=d2c47f00c6069f0e42dc1d99f2f23b53a0a7a118;hp=8ca5aa8e787608eb9c9ad0ca330dbc0cb729b7ea;hpb=c9e9b23cbdad092a5d0dc36ed6f5d6db72e1f037;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 8ca5aa8e..3544d162 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -13,37 +13,30 @@ ** $Id$ **/ - session_start(); - - if (!isset($i18n_php)) - include ('../functions/i18n.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; - } + 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($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'); + ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs); + $base_uri = $regs[1]; - include ('../src/load_prefs.php'); + session_start(); + is_logged_in(); + checkForPrefs($data_dir, $username); // We'll need this to later have a noframes version + // + // Check if the user has a language preference, but no cookie. + // Send him a cookie with his language preference, if there is + // such discrepancy. + $my_language=getPref($data_dir, $username, "language"); + if ($my_language != $squirrelmail_language) + setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri); + set_up_language(getPref($data_dir, $username, 'language')); echo "\n"; @@ -51,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 ""; + echo ""; } else { - echo ""; + echo ""; } /** @@ -72,6 +74,8 @@ This was done to create a pure HTML way of refreshing the folder list since we would like to use as little Javascript as possible. **/ + if (!isset($right_frame)) $right_frame = ""; + if ($right_frame == 'right_main.php') { $urlMailbox = urlencode($mailbox); $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; @@ -79,22 +83,23 @@ $right_frame_url = 'options.php'; } else if ($right_frame == 'folders.php') { $right_frame_url = 'folders.php'; + } else if ($right_frame == 'compose.php') { + $right_frame_url = "compose.php?send_to=$rcptaddress"; } else { - if (!isset($just_logged_in)) $just_logged_in = 0; - $right_frame_url = "right_main.php?just_logged_in=$just_logged_in"; + $right_frame_url = "right_main.php"; } if ($location_of_bar == 'right') { - echo ""; - echo ''; + echo ""; + echo ''; } else { - echo ''; - echo ""; + echo ''; + echo ""; } ?> - + \ No newline at end of file