$org_title

X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=2a4e0cdc373ca2ded174f66a7c704a386a9e4bcf;hb=8e2ed8074e44d18b334e13bfa80c2a4a78d37d13;hp=89fa16a362c8d7bb5e1afd42dd979167ac68af86;hpb=ee1070a5761ee6ae4c9ab2f36c858679bf9a02a2;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 89fa16a3..2a4e0cdc 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,22 @@ 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 (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 +70,10 @@ if ($left_size == "") { } if ($location_of_bar == 'right') { - echo ""; + echo ""; } else { - echo ""; + echo ""; } /* @@ -79,8 +90,7 @@ else { */ if (!isset($right_frame)) { $right_frame = ''; -} - +} if ($right_frame == 'right_main.php') { $urlMailbox = urlencode($mailbox); $right_frame_url = @@ -91,8 +101,10 @@ if ($right_frame == 'right_main.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') { @@ -103,7 +115,7 @@ else { echo ''. ""; } - +do_hook('webmail_bottom'); ?>