X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=2493ff0b2467ec2a3a7004eb2dcca12d66d3c8cf;hp=0c96bebe1a4e3f3194caa9142741b9bceac6a2d5;hb=b9a873d7ed3979bb6de827ea831301a336e5327e;hpb=594d29a1b801a30477c9cc5eb2ef76e96924cdb7 diff --git a/src/webmail.php b/src/webmail.php index 0c96bebe..2493ff0b 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -1,54 +1,47 @@ \n" . - "$org_title"; +if (!sqgetGlobalVar('mailbox', $mailbox)) { + $mailbox = 'INBOX'; +} -$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'; +sqgetGlobalVar('right_frame', $right_frame, SQ_GET); + +if (sqgetGlobalVar('mailtodata', $mailtodata)) { + $mailtourl = 'mailtodata='.urlencode($mailtodata); +} else { + $mailtourl = ''; } + +// 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; @@ -58,13 +51,25 @@ if ($left_size == "") { } } -if ($location_of_bar == 'right') { - echo ""; +// 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 { - echo ""; +if ($location_of_bar == '') { + $location_of_bar = $temp_location_of_bar; } +// 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 @@ -76,34 +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 (!isset($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 = 'options.php'; -} elseif ($right_frame == 'folders.php') { - $right_frame_url = 'folders.php'; -} elseif ($right_frame == 'compose.php') { - $right_frame_url = "compose.php?send_to=$rcptaddress"; +if ( strpos($right_frame,'?') ) { + $right_frame_file = substr($right_frame,0,strpos($right_frame,'?')); } else { - $right_frame_url = 'right_main.php'; + $right_frame_file = $right_frame; } - -if ($location_of_bar == 'right') { - echo "" . - ''; -} -else { - echo ''. - ""; +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; + } } -?> - - +$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'); +