X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=36eb29a957d7803ec6ee4d24d50b15f911b9f30a;hb=a42c236f3aecff1b7513cae605de2ecd2f2455dc;hp=ebb9de228cb01d74a7e5da8dcb66a5205e596e18;hpb=864b1c33f86d957b310bca899e198140a0a3ed9b;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index ebb9de22..36eb29a9 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,57 +1,118 @@ \n". + "\n" . + "\n" . + "$org_title\n". + ""; + +// Japanese translation used without mbstring support +if ($err==2) { + echo $output. + "\n". + "

You need to have PHP installed with the multibyte string function \n". + "enabled (using configure option --enable-mbstring).

\n". + "

System assumed that you accidently switched to Japanese translation \n". + "and reverted your language preference to English.

\n". + "

Please refresh this page in order to use webmail.

\n". + ""; + return; +} + +$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'; +} -echo "\n"; -echo ''; -echo $org_title; -echo ''; - -$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'; + $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,13 +120,13 @@ if ($left_size == "") { else { $left_size = 200; } -} - +} + if ($location_of_bar == 'right') { - echo ""; + $output .= "\n"; } else { - echo ""; + $output .= "\n"; } /* @@ -79,38 +140,49 @@ else { * * 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. + * + * The test for // should catch any attempt to include off-site webpages into + * our frameset. */ -if (!isset($right_frame)) { - $right_frame = ""; + +if (empty($right_frame) || (strpos(urldecode($right_frame), '//') !== false)) { + $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_frame_url = "right_main.php?mailbox=$urlMailbox" + . (!empty($sort)?"&sort=$sort":'') + . (!empty($startMessage)?"&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 { - $right_frame_url = "right_main.php"; +} 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 = htmlspecialchars($right_frame); } +$left_frame = '\n"; +$right_frame = '\n"; + if ($location_of_bar == 'right') { - echo ""; - echo ''; + $output .= $right_frame . $left_frame; } else { - echo ''; - echo ""; + $output .= $left_frame . $right_frame; +} +$ret = concat_hook_function('webmail_bottom', $output); +if($ret != '') { + $output = $ret; } +echo $output; ?> - - + +