X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=a2bc1c2e670d2454e360ec9c7ab06614331ad0ba;hp=7deb64b4f0d3743048ebd2a5fe6301c9e1c32172;hb=1411972c35809b94d9a499545e82e8a0b7a749b6;hpb=9a186afeace97d007378a097c996f3e13691b144 diff --git a/src/webmail.php b/src/webmail.php index 7deb64b4..a2bc1c2e 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; -} - -$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'; +if(!sqgetGlobalVar('mailtodata', $mailtodata)) { + $mailtourl = 'mailtodata='.urlencode($mailtodata); } else { - $temp_location_of_bar = 'left'; + $mailtourl = ''; } -if ($location_of_bar == '') { - $location_of_bar = $temp_location_of_bar; -} -$temp_location_of_bar = ''; - +// 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; @@ -123,13 +48,19 @@ if ($left_size == "") { } } -if ($location_of_bar == 'right') { - $output .= "\n"; +// 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'; } -else { - $output .= "\n"; +if ($location_of_bar == '') { + $location_of_bar = $temp_location_of_bar; } +// Determine the main frame URL /* * There are three ways to call webmail.php * 1. webmail.php @@ -145,17 +76,14 @@ else { * The test for // should catch any attempt to include off-site webpages into * our frameset. */ - 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) @@ -169,7 +97,7 @@ switch($right_frame) { $right_frame_url = 'folders.php'; break; case 'compose.php': - $right_frame_url = 'compose.php?' . $mailto; + $right_frame_url = 'compose.php?' . $mailtourl; break; case '': $right_frame_url = 'right_main.php'; @@ -177,25 +105,18 @@ switch($right_frame) { default: $right_frame_url = urlencode($right_frame); break; -} +} -$left_frame = '\n"; -$right_frame = '\n"; +$oErrorHandler->setDelayedErrors(true); -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; +$oTemplate->assign('nav_size', $left_size); +$oTemplate->assign('nav_on_left', $location_of_bar=='left'); +$oTemplate->assign('right_frame_url', $right_frame_url); + +do_hook('webmail_top', $null); + +displayHtmlHeader($org_title, '', false, true); + +$oTemplate->display('webmail.tpl'); -?> - - +$oTemplate->display('footer.tpl');