X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=0220d843a86f9004a4679dec33b5606c128aa62f;hb=0b331da50922bb1b212c8b978b461be463cddaee;hp=3f9c11199a59b2ae9166f5b170ebfecfa8f2a146;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 3f9c1119..0220d843 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -21,8 +21,10 @@ require_once('../functions/plugin.php'); require_once('../functions/i18n.php'); require_once('../functions/auth.php'); -ereg( '(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs); -$base_uri = $regs[1]; +if (!function_exists('sqm_baseuri')){ + require_once('../functions/display_messages.php'); +} +$base_uri = sqm_baseuri(); session_start(); is_logged_in(); @@ -41,11 +43,9 @@ if ($my_language != $squirrelmail_language) { set_up_language(getPref($data_dir, $username, 'language')); -echo "\n"; -echo ''; -echo $org_title; -echo ''; - +echo "\n" . + "$org_title"; + $left_size = getPref($data_dir, $username, 'left_size'); $location_of_bar = getPref($data_dir, $username, 'location_of_bar'); if ($location_of_bar == '') { @@ -58,13 +58,13 @@ if ($left_size == "") { else { $left_size = 200; } -} - +} + if ($location_of_bar == 'right') { - echo ""; + echo ""; } else { - echo ""; + echo ""; } /* @@ -80,36 +80,32 @@ else { * we would like to use as little Javascript as possible. */ if (!isset($right_frame)) { - $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"; -} -elseif ($right_frame == 'options.php') { + "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; +} elseif ($right_frame == 'options.php') { $right_frame_url = 'options.php'; -} -elseif ($right_frame == 'folders.php') { +} elseif ($right_frame == 'folders.php') { $right_frame_url = 'folders.php'; -} -elseif ($right_frame == 'compose.php') { +} elseif ($right_frame == 'compose.php') { $right_frame_url = "compose.php?send_to=$rcptaddress"; -} -else { +} else { $right_frame_url = 'right_main.php'; } if ($location_of_bar == 'right') { - echo ""; - echo ''; + echo "" . + ''; } else { - echo ''; - echo ""; + echo ''. + ""; } - +do_hook('webmail_bottom'); ?>