X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=0c6ef8e1b257e8b41cb2275927cb14e2777470b7;hb=c720eadda2bcf0e3710754ca4e642d641a9a1395;hp=9825da3d2adf59b1e9dc8ad43d0b7c548ac695e1;hpb=8f6f9ba5df6491d396aa690dcf3e5b9070a565ca;p=squirrelmail.git diff --git a/src/webmail.php b/src/webmail.php index 9825da3d..0c6ef8e1 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -3,18 +3,21 @@ /** * webmail.php -- Displays the main frameset * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 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$ + * @version $Id$ * @package squirrelmail */ -/** Path for SquirrelMail required files. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -63,12 +66,25 @@ 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". - ""; +$err=set_up_language(getPref($data_dir, $username, 'language')); + +$output = "\n". + "\n" . + "$org_title\n". + ""; + +// Japanese translation used without mbstring support +if ($err==2) { + echo $output. + "\n". + "

You need to have php4 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'); @@ -95,10 +111,10 @@ if ($left_size == "") { } if ($location_of_bar == 'right') { - echo "\n"; + $output .= "\n"; } else { - echo "\n"; + $output .= "\n"; } /* @@ -115,7 +131,7 @@ else { */ if (!isset($right_frame)) { $right_frame = ''; -} +} if ($right_frame == 'right_main.php') { $urlMailbox = urlencode($mailbox); $right_frame_url = @@ -138,12 +154,16 @@ $right_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; +} +$ret = concat_hook_function('webmail_bottom', $output); +if($ret != '') { + $output = $ret; } -do_hook('webmail_bottom'); +echo $output; ?> - + \ No newline at end of file