X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=565c5c079e9db88c9f2d8f50755fcbb5ffc4a2c0;hb=4e51982134a256a0e0193d2a341b88315f28f5f3;hp=9a6fff73c720c61ca4854862e7855ce44577ffb4;hpb=165829a378d4e41c1a47b46be08fdbd20315077f;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 9a6fff73..565c5c07 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,33 +1,56 @@ \n"; -echo ''; -echo $org_title; -echo ''; - +echo "\n". + "\n" . + "$org_title\n". + ""; + $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; @@ -58,13 +91,13 @@ if ($left_size == "") { else { $left_size = 200; } -} - +} + if ($location_of_bar == 'right') { - echo ""; + echo "\n"; } else { - echo ""; + echo "\n"; } /* @@ -80,36 +113,36 @@ 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') { - $right_frame_url = "compose.php?send_to=$rcptaddress"; -} -else { +} elseif ($right_frame == 'compose.php') { + $right_frame_url = 'compose.php?' . $mailto; +} else if ($right_frame == '') { $right_frame_url = 'right_main.php'; +} else { + $right_frame_url = $right_frame; } +$left_frame = '\n"; +$right_frame = '\n"; + if ($location_of_bar == 'right') { - echo ""; - echo ''; + echo $right_frame . $left_frame; } else { - echo ''; - echo ""; + echo $left_frame . $right_frame; } - +do_hook('webmail_bottom'); ?> - - + +