$org_title

X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault%2Fwebmail.tpl;h=33949634e26e591d28965fd27d625f3e1ee5ce86;hb=d9f83cf8cd23f773fde77e3233a10a07aa64b37b;hp=d8e0ecdbb93e3e6438c838f380ba35633aa52bba;hpb=a7b89aa0274a37d74dc03698e2930952e08f1f17;p=squirrelmail.git diff --git a/templates/default/webmail.tpl b/templates/default/webmail.tpl index d8e0ecdb..33949634 100644 --- a/templates/default/webmail.tpl +++ b/templates/default/webmail.tpl @@ -1,11 +1,15 @@ \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"; +$output = ''; +if ($nav_on_left) { + $output .= "\n"; } else { - $output .= "\n"; + $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. - */ +$left_frame = ''."\n"; +$right_frame = ''."\n"; -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,'?')); +if ($nav_on_left) { + $output .= $left_frame . $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 . ''; +echo $output ."\n\n";