X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=3ad1f06cce7eef25427504c862c52592780cfbfa;hb=151562a780a0919b32e04d204ba7f33fb215bd84;hp=0df533a317f591d477be83330de8f97984da868d;hpb=f38b7cf06c3343a7fead417d90bd67d291f5dc29;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 0df533a3..3ad1f06c 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -3,17 +3,20 @@ /** * 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. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -31,17 +34,32 @@ if (!function_exists('sqm_baseuri')){ } $base_uri = sqm_baseuri(); -session_start(); +sqsession_is_active(); sqgetGlobalVar('username', $username, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); +if (sqgetGlobalVar('sort', $sort)) { + $sort = (int) $sort; +} + +if (sqgetGlobalVar('startMessage', $startMessage)) { + $startMessage = (int) $startMessage; +} + +if (!sqgetGlobalVar('mailbox', $mailbox)) { + $mailbox = 'INBOX'; +} + sqgetGlobalVar('right_frame', $right_frame, SQ_GET); if ( isset($_SESSION['session_expired_post']) ) { sqsession_unregister('session_expired_post'); } +if(!sqgetGlobalVar('mailto', $mailto)) { + $mailto = ''; +} is_logged_in(); @@ -56,15 +74,30 @@ do_hook('webmail_top'); */ $my_language = getPref($data_dir, $username, 'language'); if ($my_language != $squirrelmail_language) { - setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri); + sqsetcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri); } -set_up_language(getPref($data_dir, $username, 'language')); - -echo "\n". - "\n" . - "$org_title\n". - ""; +$err=set_up_language(getPref($data_dir, $username, 'language')); + +$output = "\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'); @@ -91,10 +124,10 @@ if ($left_size == "") { } if ($location_of_bar == 'right') { - echo "\n"; + $output .= "\n"; } else { - echo "\n"; + $output .= "\n"; } /* @@ -108,33 +141,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. */ -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'; -} else if ($right_frame == '') { - $right_frame_url = 'right_main.php'; -} else { - $right_frame_url = $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') { - echo "\n" . - "\n"; + $output .= $right_frame . $left_frame; } else { - echo "\n". - "\n"; + $output .= $left_frame . $right_frame; } -do_hook('webmail_bottom'); +$ret = concat_hook_function('webmail_bottom', $output); +if($ret != '') { + $output = $ret; +} +echo $output; + ?>