$org_title

From: vanmer Date: Sun, 9 Jul 2006 22:27:40 +0000 (+0000) Subject: - moved all output from webmail.php to webmail.tpl template X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=a6f35c1643c40a44c519f6668148017862be3996 - moved all output from webmail.php to webmail.tpl template git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11383 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/src/webmail.php b/src/webmail.php index a7bc9586..24bc1b14 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -45,109 +45,18 @@ if(!sqgetGlobalVar('mailto', $mailto)) { do_hook('webmail_top'); -$output = "\n". - "\n" . - "\n" . - "$org_title\n". - ""; - -$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'; -} - -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"; -} - -/* - * There are three ways to call webmail.php - * 1. webmail.php - * - This just loads the default entry screen. - * 2. webmail.php?right_frame=right_main.php&sort=X&startMessage=X&mailbox=XXXX - * - This loads the frames starting at the given values. - * 3. webmail.php?right_frame=folders.php - * - Loads the frames with the Folder options in the right frame. - * - * 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 (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; -} - -echo $output . ''; +$oTemplate->assign('org_title',$org_title); +$oTemplate->assign('mailto',$mailto); +$oTemplate->assign('startMessage',$startMessage); +$oTemplate->assign('mailbox',$mailbox); +$oTemplate->assign('sort',$sort); +$oTemplate->assign('username',$username); +$oTemplate->assign('delimiter',$delimiter); +$oTemplate->assign('onetimepad',$onetimepad); +$oTemplate->assign('languages',$languages); +$oTemplate->assign('default_left_size',$default_left_size); +$oTemplate->assign('right_frame',$right_frame); + +$oTemplate->display('webmail.tpl'); $oTemplate->display('footer.tpl');