X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=b3bd9d6576597231b113c87573b31d150fb733f9;hp=86ac26545285f96b3590bcab58dc3a1c6497abb5;hb=babad50305f1b991f32209a7f2e3b72a5eefe5c7;hpb=434d41148acadee1282a3a085d04e3ba399aaa36 diff --git a/src/webmail.php b/src/webmail.php index 86ac2654..b3bd9d65 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,5 +1,4 @@ \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; +// 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 @@ -141,58 +84,52 @@ else { * * 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), '//') !== false)) { $right_frame = ''; } - if ( strpos($right_frame,'?') ) { $right_frame_file = substr($right_frame,0,strpos($right_frame,'?')); } else { $right_frame_file = $right_frame; } - -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?' . $mailto; - break; - case '': - $right_frame_url = 'right_main.php'; - break; - default: - $right_frame_url = urlencode($right_frame); - break; -} - -$left_frame = '\n"; -$right_frame = '\n"; - -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; +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; + } } -echo $output; -?> - - +$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'); +