X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=15d938fd0244cb22a94b6a369d9b8f627d74525d;hb=30460a05016c7e066ad7b28df7788539e4054a99;hp=000efe974cdf5a22ce14e2bfb9f29dbdf90df857;hpb=ef8d36adf548f8e9f4f4ca3f5ee23cd77bd99347;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 000efe97..15d938fd 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,45 +1,24 @@ \n". - "\n" . - "$org_title\n". - ""; - -// Japanese translation used without mbstring support -if ($err==2) { - echo $output. - "\n". - "

You need to have php4 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; +// Determine the size of the left frame +$left_size = getPref($data_dir, $username, 'left_size'); +if ($left_size == "") { + if (isset($default_left_size)) { + $left_size = $default_left_size; + } + else { + $left_size = 200; + } } -$left_size = getPref($data_dir, $username, 'left_size'); +// Determine where the navigation frame should be $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 = $temp_location_of_bar; } -$temp_location_of_bar = ''; - -if ($left_size == "") { - if (isset($default_left_size)) { - $left_size = $default_left_size; - } - else { - $left_size = 200; - } -} -if ($location_of_bar == 'right') { - $output .= "\n"; -} -else { - $output .= "\n"; -} +// this value may be changed by a plugin, but initialize +// it first to avoid register_globals headaches +// +$right_frame_url = ''; +do_hook('webmail_top', $null); +// Determine the main frame URL /* * There are three ways to call webmail.php * 1. webmail.php @@ -140,45 +81,55 @@ 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. + * + * Note that plugins are allowed to completely and freely override the URI + * used for the "right" (content) frame, and they do so by modifying the + * global variable $right_frame_url. + * */ - -if (empty($right_frame) || (strpos(urldecode($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" - . (!empty($sort)?"&sort=$sort":'') - . (!empty($startMessage)?"&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?' . $mailto; -} else if ($right_frame == '') { - $right_frame_url = 'right_main.php'; +if ( strpos($right_frame,'?') ) { + $right_frame_file = substr($right_frame,0,strpos($right_frame,'?')); } else { - $right_frame_url = htmlspecialchars($right_frame); + $right_frame_file = $right_frame; +} +if (empty($right_frame_url)) { + switch($right_frame) { + case 'right_main.php': + $right_frame_url = "right_main.php?mailbox=".urlencode($mailbox) + . (!empty($sort)?"&sort=$sort":'') + . (!empty($startMessage)?"&startMessage=$startMessage":''); + break; + case 'options.php': + $right_frame_url = 'options.php'; + break; + case 'folders.php': + $right_frame_url = 'folders.php'; + break; + case 'compose.php': + $right_frame_url = 'compose.php?' . $mailtourl; + break; + case '': + $right_frame_url = 'right_main.php'; + break; + default: + $right_frame_url = urlencode($right_frame); + break; + } } -$left_frame = '\n"; -$right_frame = '\n"; +$oErrorHandler->setDelayedErrors(true); + +$oTemplate->assign('nav_size', $left_size); +$oTemplate->assign('nav_on_left', $location_of_bar=='left'); +$oTemplate->assign('right_frame_url', $right_frame_url); + +displayHtmlHeader($org_title, '', false, true); + +$oTemplate->display('webmail.tpl'); -if ($location_of_bar == 'right') { - $output .= $right_frame . $left_frame; -} -else { - $output .= $left_frame . $right_frame; -} -$ret = concat_hook_function('webmail_bottom', $output); -if($ret != '') { - $output = $ret; -} -echo $output; -?> - -