X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=a7bc9586fd594d35eb1b34e2912032d60cc74d4f;hp=565c5c079e9db88c9f2d8f50755fcbb5ffc4a2c0;hb=154ad29922545208762478453537397b094ae2d5;hpb=748ba6c04d400a0433b06dd90d4d6042d86478e2 diff --git a/src/webmail.php b/src/webmail.php index 565c5c07..a7bc9586 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -3,39 +3,36 @@ /** * webmail.php -- Displays the main frameset * - * Copyright (c) 1999-2003 The SquirrelMail development team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * This file generates the main frameset. The files that are * shown can be given as parameters. If the user is not logged in * this file will verify username and password. * - * $Id$ + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ -define('SM_PATH','../'); +/** + * Include the SquirrelMail initialization file. + */ +require('../include/init.php'); -/* SquirrelMail required files. */ -require_once(SM_PATH . 'functions/strings.php'); -require_once(SM_PATH . 'config/config.php'); -require_once(SM_PATH . 'functions/prefs.php'); -require_once(SM_PATH . 'functions/imap.php'); -require_once(SM_PATH . 'functions/plugin.php'); -require_once(SM_PATH . 'functions/i18n.php'); -require_once(SM_PATH . 'functions/auth.php'); -require_once(SM_PATH . 'functions/global.php'); +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); -if (!function_exists('sqm_baseuri')){ - require_once(SM_PATH . 'functions/display_messages.php'); +if (sqgetGlobalVar('sort', $sort)) { + $sort = (int) $sort; } -$base_uri = sqm_baseuri(); -sqsession_is_active(); +if (sqgetGlobalVar('startMessage', $startMessage)) { + $startMessage = (int) $startMessage; +} -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); +if (!sqgetGlobalVar('mailbox', $mailbox)) { + $mailbox = 'INBOX'; +} sqgetGlobalVar('right_frame', $right_frame, SQ_GET); @@ -46,28 +43,14 @@ if(!sqgetGlobalVar('mailto', $mailto)) { $mailto = ''; } -is_logged_in(); - do_hook('webmail_top'); -/** - * We'll need this to later have a noframes version - * - * Check if the user has a language preference, but no cookie. - * Send him a cookie with his language preference, if there is - * such discrepancy. - */ -$my_language = getPref($data_dir, $username, 'language'); -if ($my_language != $squirrelmail_language) { - setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri); -} - -set_up_language(getPref($data_dir, $username, 'language')); - -echo "\n". - "\n" . - "$org_title\n". - ""; +$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'); @@ -94,10 +77,10 @@ if ($left_size == "") { } if ($location_of_bar == 'right') { - echo "\n"; + $output .= "\n"; } else { - echo "\n"; + $output .= "\n"; } /* @@ -111,24 +94,42 @@ 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. */ -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?' . $mailto; -} else if ($right_frame == '') { - $right_frame_url = 'right_main.php'; +} + +if ( strpos($right_frame,'?') ) { + $right_frame_file = substr($right_frame,0,strpos($right_frame,'?')); } else { - $right_frame_url = $right_frame; + $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"; if ($location_of_bar == 'right') { - echo $right_frame . $left_frame; + $output .= $right_frame . $left_frame; } else { - echo $left_frame . $right_frame; + $output .= $left_frame . $right_frame; } -do_hook('webmail_bottom'); -?> - - +$ret = concat_hook_function('webmail_bottom', $output); +if($ret != '') { + $output = $ret; +} + +echo $output . ''; + +$oTemplate->display('footer.tpl');