$org_title

X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=1f1362da1bed1515a528215e0b4083d3bfb3034b;hb=c8d6aef3297916d765b00c96a6c31e5a359dbce4;hp=596a4ccc1f2211483bbe7737013d6d1201ff1e9d;hpb=65c3ec94c897fb098598f3843e371020deb2226b;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 596a4ccc..1f1362da 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(); @@ -42,13 +44,23 @@ if ($my_language != $squirrelmail_language) { set_up_language(getPref($data_dir, $username, 'language')); echo "\n" . - "$org_title"; + "$org_title"; $left_size = getPref($data_dir, $username, 'left_size'); $location_of_bar = getPref($data_dir, $username, 'location_of_bar'); + +if (isset($languages[$squirrelmail_language]['DIR']) && + strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') { + $temp_location_of_bar = 'right'; +} else { + $temp_location_of_bar = 'left'; +} + if ($location_of_bar == '') { - $location_of_bar = 'left'; + $location_of_bar = $temp_location_of_bar; } +$temp_location_of_bar = ''; + if ($left_size == "") { if (isset($default_left_size)) { $left_size = $default_left_size; @@ -59,10 +71,10 @@ if ($left_size == "") { } if ($location_of_bar == 'right') { - echo ""; + echo ""; } else { - echo ""; + echo ""; } /* @@ -78,32 +90,31 @@ 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"; + "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; } elseif ($right_frame == 'options.php') { $right_frame_url = 'options.php'; } elseif ($right_frame == 'folders.php') { $right_frame_url = 'folders.php'; -} elseif ($right_frame == 'compose.php') { - $right_frame_url = "compose.php?send_to=$rcptaddress"; -} else { +} else if ($right_frame == '') { $right_frame_url = 'right_main.php'; +} else { + $right_frame_url = urldecode($right_frame); } if ($location_of_bar == 'right') { - echo ""; - echo ''; + echo "" . + ''; } else { - echo ''; - echo ""; + echo ''. + ""; } - +do_hook('webmail_bottom'); ?>