resubmitting last Monday updates and adding php 5.1.0 timezone support

ChangeLog

@@ -32,7 +32,9 @@ Version 1.5.2 - CVS
     configuration variable is removed.
   - Added system locale tests to configtest.php script.
   - Fixed invalid HTML output that caused error notices in compose.php (#1454409).
-  - Introduction of centralised initialization file init.php.
+  - Introduction of centralised initialization file init.php. Location of some
+    scripts is changed. If code tries to use older script layout, scripts will
+    break and display error messages.
   - Added session regenrate id functionality to prohibit session hijacking.
   - Fixed sqsession_cookie function for setting HttpOnly cookie attribute.
   - Reduce references header in a smart way to avoid "header too long"
@@ -50,6 +52,9 @@ Version 1.5.2 - CVS
   - Fixed possibility to use single quote in provider name (#1475744).
   - Improve recovery when EHLO not supported on legacy SMTP servers
     (#1031455).
+  - Added error handling and $onlylocal argument to abook_init hook.
+  - Added PHP 5.1.0 date_default_timezone_set() function support. Allows
+    to use time zone settings in PHP safe_mode.
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

class/deliver/Deliver.class.php

@@ -395,7 +395,7 @@ class Deliver {
         $rn = "\r\n";
 
         /* This creates an RFC 822 date */
-        $date = date('D, j M Y H:i:s ', mktime()) . $this->timezone();
+        $date = date('D, j M Y H:i:s ', time()) . $this->timezone();
         /* Create a message-id */
         $message_id = '<' . $REMOTE_PORT . '.';
         if (isset($encode_header_key) && trim($encode_header_key)!='') {

config/conf.pl

@@ -3524,7 +3524,7 @@ sub commandA2 {
     print "This option controls what character set is used when sending\n";
     print "mail and when sending HTML to the browser. Option works only\n";
     print "with US English (en_US) translation. Other translations use\n";
-    print "charsets that are set in functions/i18n.php.\n";
+    print "charsets that are set in translation settings.\n";
     print "\n";
 
     print "[$WHT$default_charset$NRM]: $WHT";

config/config_default.php

@@ -1029,7 +1029,7 @@ $squirrelmail_default_language = 'en_US';
  * This option controls what character set is used when sending
  * mail and when sending HTML to the browser. Option works only
  * with US English (en_US) translation. Other translations use
- * charsets that are set in functions/i18n.php.
+ * charsets that are set in translation settings.
  *
  * @global string $default_charset
  */

doc/Development/plugin.txt

@@ -194,7 +194,8 @@ that is no longer necessary and is a hold-over from older SquirrelMail
 versions.
 
 List of files, that are included by include/validate.php (If SquirrelMail
-version is not listed, files are included from v.1.3.2.):
+version is not listed, files are included from v.1.3.2.). This table is
+specific to SquirrelMail 1.3.2 - 1.5.1. Script layout was changed in 1.5.2.
    1. class/mime.class.php
       1.1. class/mime/Rfc822Header.class.php
       1.2. class/mime/MessageHeader.class.php

doc/i18n.txt

@@ -92,8 +92,8 @@ Charset totals:
 -------------------
 2. $languages array
 -------------------
-$languages array is stored in functions/i18n.php and defines translations
-that are enabled in SquirrelMail.
+$languages array is stored in functions/i18n.php (v. 1.5.0 or older) or 
+locale/*/setup.php files and defines enabled SquirrelMail translations.
 
 Format of array:
     $languages['language_code']['key'] = 'value'
@@ -127,8 +127,8 @@ optional.
 XTRA_CODE functions provide way to change interface behavior, when translation
 requires special handling of some SquirrelMail functions. Functions are enabled
 by setting XTRA_CODE option in $languages array and including appropriate
-functions in functions/i18n.php. First part of function name is word listed in
-$languages['language_code']['XTRA_CODE'] value. Second part is one of special
+functions in locale/language_code/setup.php. First part of function name is word 
+listed in $languages['language_code']['XTRA_CODE'] value. Second part is one of special
 keywords. Possible keywords:
 * _decode
 Used in src/compose.php, src/i18n.php, src/view_text.php, functions/mime.php

doc/translating.txt

@@ -29,8 +29,18 @@ c) To translate the actual strings fill in the msgstr after each
    running the command "msgfmt -o squirrelmail.mo squirrelmail.po" in
    the directory where the translated squirrelmail.po is residing.
 
-d) Add the language name and language code to the array at the top of
-   squirrelmail/functions/i18n.php.
+d) Create locale/language_code/setup.php file with your translation description.
+   For example locale/tlh/setup.php
+   <?php
+   /* Klingon translation setup */
+   $languages['tlh']['NAME'] = 'Klingon';
+   $languages['tlh']['CHARSET'] = 'utf-8';
+   ?>
+   
+   Before SquirrelMail 1.5.1 translation description should be added to
+   functions/i18n.php. Sample uses only required settings. Translation 
+   description can use other advanced settings. Check include/i18n.php 
+   or SquirrelMail developer's manual.
 
 There is also a small script in the po/ directory that can help in
 creating charset mappings from the mappings files that are provided by

functions/addressbook.php

@@ -12,8 +12,7 @@
  * @subpackage addressbook
  */
 
-
-/* required includes */
+/** required includes */
 // FIXME, NO display code in functions files
 include_once(SM_PATH . 'templates/util_global.php');
 
@@ -21,7 +20,10 @@ include_once(SM_PATH . 'templates/util_global.php');
  * Create and initialize an addressbook object.
  * @param boolean $showerr display any address book init errors. html page header
  * must be created before calling addressbook_init() with $showerr enabled.
- * @param boolean $onlylocal enable only local address book backends
+ * @param boolean $onlylocal enable only local address book backends. Should 
+ *  be used when code does not need access to remote backends. Backends
+ *  that provide read only address books with limited listing options can be
+ *  tagged as remote.
  * @return object address book object.
  */
 function addressbook_init($showerr = true, $onlylocal = false) {
@@ -122,11 +124,17 @@ function addressbook_init($showerr = true, $onlylocal = false) {
      * hook allows to include different address book backends.
      * plugins should extract $abook and $r from arguments
      * and use same add_backend commands as above functions.
+     * Since 1.5.2 hook sends third ($onlylocal) argument to address book
+     * plugins in order to allow detection of local address book init.
      * @since 1.5.1 and 1.4.5
      */
-    $hookReturn = do_hook('abook_init', $abook, $r);
+    $hookReturn = do_hook('abook_init', $abook, $r, $onlylocal);
     $abook = $hookReturn[1];
     $r = $hookReturn[2];
+    if (!$r && $showerr) {
+        if ($abook_init_error!='') $abook_init_error.="<br />\n";
+        $abook_init_error.=_("Error initializing other address books.") . "<br />\n" . $abook->error;
+    }
 
     if (! $onlylocal) {
         /* Load configured LDAP servers (if PHP has LDAP support) */
@@ -961,4 +969,4 @@ class addressbook_backend {
         return false;
     }
 }
-?>
+?>

functions/auth.php

@@ -3,9 +3,11 @@
 /**
  * auth.php
  *
- * Contains functions used to do authentication. Library depends on
- * functions from functions/global.php, functions/i18n.php and
- * functions/strings.php.
+ * Contains functions used to do authentication.
+ * 
+ * Dependencies:
+ *  functions/global.php
+ *  functions/strings.php.
  *
  * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License

functions/constants.php

@@ -1,162 +1,14 @@
 <?php
-
 /**
- * constants.php
- *
- * Loads constants used by the rest of the SquirrelMail source.
- * This file is include by src/login.php, src/redirect.php and
- * src/load_prefs.php.
+ * old constants function file location
  *
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
- * @since 1.2.0
- */
-
-/** @ignore */
-if (! defined('SM_PATH')) define('SM_PATH','../');
-
-/** Need to enable plugin functions for a hook */
-require_once(SM_PATH . 'functions/plugin.php');  /* Required for the hook */
-
-/**************************************************************/
-/* Set values for constants used by SquirrelMail preferences. */
-/**************************************************************/
-
-/**
- * Define basic, general purpose preference constants.
- * @since 1.2.0
- */
-define('SMPREF_NO', 0);
-define('SMPREF_OFF', 0);
-define('SMPREF_YES', 1);
-define('SMPREF_ON', 1);
-define('SMPREF_NONE', 'none');
-
-/**
- * Define constants for location based preferences.
- * @since 1.2.0
- */
-define('SMPREF_LOC_TOP', 'top');
-define('SMPREF_LOC_BETWEEN', 'between');
-define('SMPREF_LOC_BOTTOM', 'bottom');
-define('SMPREF_LOC_LEFT', '');
-define('SMPREF_LOC_RIGHT', 'right');
-
-/**
- * Define preferences for folder settings.
- * @since 1.2.0
- */
-define('SMPREF_UNSEEN_NONE', 1);
-define('SMPREF_UNSEEN_INBOX', 2);
-define('SMPREF_UNSEEN_ALL', 3);
-define('SMPREF_UNSEEN_SPECIAL', 4); // Only special folders (since 1.2.5)
-define('SMPREF_UNSEEN_NORMAL', 5);  // Only normal folders (since 1.2.5)
-define('SMPREF_UNSEEN_ONLY', 1);
-define('SMPREF_UNSEEN_TOTAL', 2);
-
-/**
- * Define constants for time/date display preferences.
- * @since 1.2.0
- */
-define('SMPREF_TIME_24HR', 1);
-define('SMPREF_TIME_12HR', 2);
-
-/**
- * Define constants for javascript preferences.
- * @since 1.2.0
- */
-define('SMPREF_JS_OFF', 0);
-define('SMPREF_JS_ON', 1);
-define('SMPREF_JS_AUTODETECT', 2);
-
-/**
- * default value for page_selector_max
- * @since 1.5.1
  */
-define('PG_SEL_MAX', 10);
-
-
-/**
- * The number of pages to cache msg headers
- * @since 1.5.1
- */
-define('SQM_MAX_PAGES_IN_CACHE',5);
-
-/**
- * The number of mailboxes to cache msg headers
- * @since 1.5.1
- */
-define('SQM_MAX_MBX_IN_CACHE',3);
-
-/**
- * Sort constants used for sorting of messages
- * @since 1.5.1
- */
-define('SQSORT_NONE',0);
-define('SQSORT_DATE_ASC',1);
-define('SQSORT_DATE_DESC',2);
-define('SQSORT_FROM_ASC',3);
-define('SQSORT_FROM_DESC',4);
-define('SQSORT_SUBJ_ASC',5);
-define('SQSORT_SUBJ_DESC',6);
-define('SQSORT_SIZE_ASC',7);
-define('SQSORT_SIZE_DESC',8);
-define('SQSORT_TO_ASC',9);
-define('SQSORT_TO_DESC',10);
-define('SQSORT_CC_ASC',11);
-define('SQSORT_CC_DESC',12);
-define('SQSORT_INT_DATE_ASC',13);
-define('SQSORT_INT_DATE_DESC',14);
-
-/**
- * Special sort constant thread which is added to above sort mode.
- * By doing a bitwise check ($sort & SQSORT_THREAD) we know if the mailbox
- * is sorted by thread.
- * @since 1.5.1
- */
-define('SQSORT_THREAD',32);
-
-/**
- * Mailbox preference array keys
- * @since 1.5.1
- */
-define('MBX_PREF_SORT',0);
-define('MBX_PREF_LIMIT',1);
-define('MBX_PREF_AUTO_EXPUNGE',2);
-define('MBX_PREF_INTERNALDATE',3);
-define('MBX_PREF_COLUMNS',4);
-// define('MBX_PREF_FUTURE',unique integer key);
-
-/**
- * Email address array keys
- * @since 1.5.1
- */
-define('SQM_ADDR_PERSONAL', 0);
-define('SQM_ADDR_ADL',      1);
-define('SQM_ADDR_MAILBOX',  2);
-define('SQM_ADDR_HOST',     3);
-
-/**
- * Supported columns to show in a messages list
- * The MBX_PREF_COLUMNS contains an ordered array with these columns
- * @since 1.5.1
- */
-define('SQM_COL_CHECK',0);
-define('SQM_COL_FROM',1);
-define('SQM_COL_DATE', 2);
-define('SQM_COL_SUBJ', 3);
-define('SQM_COL_FLAGS', 4);
-define('SQM_COL_SIZE', 5);
-define('SQM_COL_PRIO', 6);
-define('SQM_COL_ATTACHMENT', 7);
-define('SQM_COL_INT_DATE', 8);
-define('SQM_COL_TO', 9);
-define('SQM_COL_CC', 10);
-define('SQM_COL_BCC', 11);
-
-/** @since 1.2.0 */
-do_hook('loading_constants');
 
+/** break if somebody tries to load this file */
+die('Rewrite your code, functions/constants.php file location is changed in 1.5.2.'
+    .' Direct loading of functions/constants.php is deprecated.');
 ?>

functions/i18n.php

@@ -1,1095 +1,14 @@
 <?php
-
 /**
- * SquirrelMail internationalization functions
- *
- * This file contains variuos functions that are needed to do
- * internationalization of SquirrelMail.
- *
- * Internally the output character set is used. Other characters are
- * encoded using Unicode entities according to HTML 4.0.
+ * old i18n function file location
  *
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
- * @subpackage i18n
- */
-
-/** @ignore */
-if (! defined('SM_PATH')) define('SM_PATH','../');
-
-/** Everything uses global.php... */
-require_once(SM_PATH . 'functions/global.php');
-
-/**
- * Gettext bindtextdomain wrapper.
- *
- * Wrapper solves differences between php versions in order to provide
- * ngettext support. Should be used if translation uses ngettext
- * functions.
- * @since 1.5.1
- * @param string $domain gettext domain name
- * @param string $dir directory that contains all translations
- * @return string path to translation directory
- */
-function sq_bindtextdomain($domain,$dir) {
-    global $l10n, $gettext_flags, $sm_notAlias;
-
-    if ($gettext_flags==7) {
-        // gettext extension without ngettext
-        if (substr($dir, -1) != '/') $dir .= '/';
-        $mofile=$dir . $sm_notAlias . '/LC_MESSAGES/' . $domain . '.mo';
-        $input = new FileReader($mofile);
-        $l10n[$domain] = new gettext_reader($input);
-    }
-
-    $dir=bindtextdomain($domain,$dir);
-
-    return $dir;
-}
-
-/**
- * Gettext textdomain wrapper.
- * Makes sure that gettext_domain global is modified.
- * @since 1.5.1
- * @param string $name gettext domain name
- * @return string gettext domain name
- */
-function sq_textdomain($domain) {
-    global $gettext_domain;
-    $gettext_domain=textdomain($domain);
-    return $gettext_domain;
-}
-
-/**
- * php setlocale function wrapper
- *
- * From php 4.3.0 it is possible to use arrays in order to set locale.
- * php gettext extension works only when locale is set. This wrapper
- * function allows to use more than one locale name.
- *
- * @param int $category locale category name. Use php named constants
- *     (LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME)
- * @param mixed $locale option contains array with possible locales or string with one locale
- * @return string name of set locale or false, if all locales fail.
- * @since 1.5.1 and 1.4.5
- * @see http://www.php.net/setlocale
- */
-function sq_setlocale($category,$locale) {
-    // string with only one locale
-    if (is_string($locale))
-        return setlocale($category,$locale);
-
-    if (! check_php_version(4,3)) {
-        $ret=false;
-        $index=0;
-        while ( ! $ret && $index<count($locale)) {
-            $ret=setlocale($category,$locale[$index]);
-            $index++;
-        }
-    } else {
-        // php 4.3.0 or better, use entire array
-        $ret=setlocale($category,$locale);
-    }
-    return $ret;
-}
-
-/**
- * Converts string from given charset to charset, that can be displayed by user translation.
- *
- * Function by default returns html encoded strings, if translation uses different encoding.
- * If Japanese translation is used - function returns string converted to euc-jp
- * If iconv or recode functions are enabled and translation uses utf-8 - function returns utf-8 encoded string.
- * If $charset is not supported - function returns unconverted string.
- *
- * sanitizing of html tags is also done by this function.
- *
- * @param string $charset
- * @param string $string Text to be decoded
- * @param boolean $force_decode converts string to html without $charset!=$default_charset check.
- * Argument is available since 1.5.1 and 1.4.5.
- * @param boolean $save_html disables htmlspecialchars() in order to preserve 
- *  html formating. Use with care. Available since 1.5.1
- * @return string decoded string
- */
-function charset_decode ($charset, $string, $force_decode=false, $save_html=false) {
-    global $languages, $squirrelmail_language, $default_charset;
-    global $use_php_recode, $use_php_iconv, $aggressive_decoding;
-
-    if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
-        function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode')) {
-        $string = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode', $string);
-    }
-
-    $charset = strtolower($charset);
-
-    set_my_charset();
-
-    // Variables that allow to use functions without function_exist() calls
-    if (! isset($use_php_recode) || $use_php_recode=="" ) {
-        $use_php_recode=false; }
-    if (! isset($use_php_iconv) || $use_php_iconv=="" ) {
-        $use_php_iconv=false; }
-
-    // Don't do conversion if charset is the same.
-    if ( ! $force_decode && $charset == strtolower($default_charset) )
-        return ($save_html ? $string : htmlspecialchars($string));
-
-    // catch iso-8859-8-i thing
-    if ( $charset == "iso-8859-8-i" )
-        $charset = "iso-8859-8";
-
-    /*
-     * Recode converts html special characters automatically if you use
-     * 'charset..html' decoding. There is no documented way to put -d option
-     * into php recode function call.
-     */
-    if ( $use_php_recode ) {
-        if ( $default_charset == "utf-8" ) {
-            // other charsets can be converted to utf-8 without loss.
-            // and output string is smaller
-            $string = recode_string($charset . "..utf-8",$string);
-            return ($save_html ? $string : htmlspecialchars($string));
-        } else {
-            $string = recode_string($charset . "..html",$string);
-            // recode does not convert single quote, htmlspecialchars does.
-            $string = str_replace("'", '&#039;', $string);
-            // undo html specialchars
-            if ($save_html) 
-                $string=str_replace(array('&amp;','&quot;','&lt;','&gt;'),
-                                    array('&','"','<','>'),$string);
-            return $string;
-        }
-    }
-
-    // iconv functions does not have html target and can be used only with utf-8
-    if ( $use_php_iconv && $default_charset=='utf-8') {
-        $string = iconv($charset,$default_charset,$string);
-        return ($save_html ? $string : htmlspecialchars($string));
-    }
-
-    // If we don't use recode and iconv, we'll do it old way.
-
-    /* All HTML special characters are 7 bit and can be replaced first */
-    if (! $save_html) $string = htmlspecialchars ($string);
-
-    /* controls cpu and memory intensive decoding cycles */
-    if (! isset($aggressive_decoding) || $aggressive_decoding=="" ) {
-        $aggressive_decoding=false; }
-
-    $decode=fixcharset($charset);
-    $decodefile=SM_PATH . 'functions/decode/' . $decode . '.php';
-    if (file_exists($decodefile)) {
-        include_once($decodefile);
-        // send $save_html argument to decoding function. needed for iso-2022-xx decoding.
-        $ret = call_user_func('charset_decode_'.$decode, $string, $save_html);
-    } else {
-        $ret = $string;
-    }
-    return( $ret );
-}
-
-/**
- * Converts html string to given charset
- * @since 1.5.1 and 1.4.4
- * @param string $string
- * @param string $charset
- * @param boolean $htmlencode keep htmlspecialchars encoding
- * @param string
- */
-function charset_encode($string,$charset,$htmlencode=true) {
-    global $default_charset;
-
-    $encode=fixcharset($charset);
-    $encodefile=SM_PATH . 'functions/encode/' . $encode . '.php';
-    if (file_exists($encodefile)) {
-        include_once($encodefile);
-        $ret = call_user_func('charset_encode_'.$encode, $string);
-    } elseif(file_exists(SM_PATH . 'functions/encode/us_ascii.php')) {
-        // function replaces all 8bit html entities with question marks.
-        // it is used when other encoding functions are unavailable
-        include_once(SM_PATH . 'functions/encode/us_ascii.php');
-        $ret = charset_encode_us_ascii($string);
-    } else {
-        /**
-         * fix for yahoo users that remove all us-ascii related things
-         */
-        $ret = $string;
-    }
-
-    /**
-     * Undo html special chars, some places (like compose form) have
-     * own sanitizing functions and don't need html symbols.
-     * Undo chars only after encoding in order to prevent conversion of
-     * html entities in plain text emails.
-     */
-    if (! $htmlencode ) {
-        $ret = str_replace(array('&amp;','&gt;','&lt;','&quot;'),array('&','>','<','"'),$ret);
-    }
-    return( $ret );
-}
-
-/**
- * Combined decoding and encoding functions
- *
- * If conversion is done to charset different that utf-8, unsupported symbols
- * will be replaced with question marks.
- * @since 1.5.1 and 1.4.4
- * @param string $in_charset initial charset
- * @param string $string string that has to be converted
- * @param string $out_charset final charset
- * @param boolean $htmlencode keep htmlspecialchars encoding
- * @return string converted string
- */
-function charset_convert($in_charset,$string,$out_charset,$htmlencode=true) {
-    $string=charset_decode($in_charset,$string,true);
-    $string=sqi18n_convert_entities($string);
-    $string=charset_encode($string,$out_charset,$htmlencode);
-    return $string;
-}
-
-/**
- * Makes charset name suitable for decoding cycles
- *
- * @since 1.5.0 and 1.4.4
- * @param string $charset Name of charset
- * @return string $charset Adjusted name of charset
- */
-function fixcharset($charset) {
-    /* remove minus and characters that might be used in paths from charset
-     * name in order to be able to use it in function names and include calls.
-     */
-    $charset=preg_replace("/[-:.\/\\\]/",'_',$charset);
-
-    // OE ks_c_5601_1987 > cp949 
-    $charset=str_replace('ks_c_5601_1987','cp949',$charset);
-    // Moz x-euc-tw > euc-tw
-    $charset=str_replace('x_euc','euc',$charset);
-    // Moz x-windows-949 > cp949
-    $charset=str_replace('x_windows_','cp',$charset);
-
-    // windows-125x and cp125x charsets
-    $charset=str_replace('windows_','cp',$charset);
-
-    // ibm > cp
-    $charset=str_replace('ibm','cp',$charset);
-
-    // iso-8859-8-i -> iso-8859-8
-    // use same cycle until I'll find differences
-    $charset=str_replace('iso_8859_8_i','iso_8859_8',$charset);
-
-    return $charset;
-}
-
-/**
- * Set up the language to be output
- * if $do_search is true, then scan the browser information
- * for a possible language that we know
- *
- * Function sets system locale environment (LC_ALL, LANG, LANGUAGE),
- * gettext translation bindings and html header information.
- *
- * Function returns error codes, if there is some fatal error.
- *  0 = no error,
- *  1 = mbstring support is not present,
- *  2 = mbstring support is not present, user's translation reverted to en_US.
- *
- * @param string $sm_language translation used by user's interface
- * @param bool $do_search use browser's preferred language detection functions. Defaults to false.
- * @param bool $default set $sm_language to $squirrelmail_default_language if language detection fails or language is not set. Defaults to false.
- * @return int function execution error codes.
  */
-function set_up_language($sm_language, $do_search = false, $default = false) {
-
-    static $SetupAlready = 0;
-    global $use_gettext, $languages,
-           $squirrelmail_language, $squirrelmail_default_language, $default_charset,
-           $sm_notAlias, $username, $data_dir;
-
-    if ($SetupAlready) {
-        return;
-    }
-
-    $SetupAlready = TRUE;
-    sqgetGlobalVar('HTTP_ACCEPT_LANGUAGE',  $accept_lang, SQ_SERVER);
-
-    /**
-     * If function is asked to detect preferred language
-     *  OR squirrelmail default language is set to empty string
-     *    AND
-     * squirrelmail language ($sm_language) is empty string
-     * (not set in user's prefs and no cookie with language info)
-     *    AND
-     * browser provides list of preferred languages
-     *  THEN
-     * get preferred language from HTTP_ACCEPT_LANGUAGE header
-     */
-    if (($do_search || empty($squirrelmail_default_language)) &&
-        ! $sm_language &&
-        isset($accept_lang)) {
-        // TODO: use more than one language, if first language is not available
-        // FIXME: function assumes that string contains two or more characters.
-        // FIXME: some languages use 5 chars
-        $sm_language = substr($accept_lang, 0, 2);
-    }
-
-    /**
-     * If language preference is not set OR script asks to use default language
-     *  AND
-     * default squirrelmail language is not set to empty string
-     *  THEN
-     * use default squirrelmail language value from configuration.
-     */
-    if ((!$sm_language||$default) &&
-        ! empty($squirrelmail_default_language)) {
-        $squirrelmail_language = $squirrelmail_default_language;
-        $sm_language = $squirrelmail_default_language;
-    }
-
-    /** provide failsafe language when detection fails */
-    if (! $sm_language) $sm_language='en_US';
-
-    $sm_notAlias = $sm_language;
-
-    // Catching removed translation
-    // System reverts to English translation if user prefs contain translation
-    // that is not available in $languages array
-    if (!isset($languages[$sm_notAlias])) {
-        $sm_notAlias="en_US";
-    }
-
-    while (isset($languages[$sm_notAlias]['ALIAS'])) {
-        $sm_notAlias = $languages[$sm_notAlias]['ALIAS'];
-    }
-
-    if ( isset($sm_language) &&
-         $use_gettext &&
-         $sm_language != '' &&
-         isset($languages[$sm_notAlias]['CHARSET']) ) {
-        sq_bindtextdomain( 'squirrelmail', SM_PATH . 'locale/' );
-        sq_textdomain( 'squirrelmail' );
-
-        // set codeset in order to avoid gettext charset conversions
-        if (function_exists('bind_textdomain_codeset')) {
-            // Japanese translation uses different internal charset
-            if ($sm_notAlias == 'ja_JP') {
-                bind_textdomain_codeset ('squirrelmail', 'EUC-JP');
-            } else {
-                bind_textdomain_codeset ('squirrelmail', $languages[$sm_notAlias]['CHARSET'] );
-            }
-        }
-
-        // Use LOCALE key, if it is set.
-        if (isset($languages[$sm_notAlias]['LOCALE'])){
-            $longlocale=$languages[$sm_notAlias]['LOCALE'];
-        } else {
-            $longlocale=$sm_notAlias;
-        }
-
-        // try setting locale
-        $retlocale=sq_setlocale(LC_ALL, $longlocale);
-
-        // check if locale is set and assign that locale to $longlocale
-        // in order to use it in putenv calls.
-        if (! is_bool($retlocale)) {
-            $longlocale=$retlocale;
-        } elseif (is_array($longlocale)) {
-            // setting of all locales failed.
-            // we need string instead of array used in LOCALE key.
-            $longlocale=$sm_notAlias;
-        }
-
-        if ( !((bool)ini_get('safe_mode')) &&
-             getenv( 'LC_ALL' ) != $longlocale ) {
-            putenv( "LC_ALL=$longlocale" );
-            putenv( "LANG=$longlocale" );
-            putenv( "LANGUAGE=$longlocale" );
-            putenv( "LC_NUMERIC=C" );
-            if ($sm_notAlias=='tr_TR') putenv( "LC_CTYPE=C" );
-        }
-        // Workaround for plugins that use numbers with floating point
-        // It might be removed if plugins use correct decimal delimiters
-        // according to locale settings.
-        setlocale(LC_NUMERIC, 'C');
-        // Workaround for specific Turkish strtolower/strtoupper rules.
-        // Many functions expect English conversion rules.
-        if ($sm_notAlias=='tr_TR') setlocale(LC_CTYPE,'C');
-
-        /**
-         * Set text direction/alignment variables
-         * When language environment is setup, scripts can use these globals 
-         * without accessing $languages directly and making checks for optional
-         * array key.
-         */
-        global $text_direction, $left_align, $right_align;
-        if (isset($languages[$sm_notAlias]['DIR']) &&
-            $languages[$sm_notAlias]['DIR'] == 'rtl') {
-            /**
-             * Text direction
-             * @global string $text_direction
-             */
-            $text_direction='rtl';
-            /**
-             * Left alignment
-             * @global string $left_align
-             */
-            $left_align='right';
-            /**
-             * Right alignment
-             * @global string $right_align
-             */
-            $right_align='left';
-        } else {
-            $text_direction='ltr';
-            $left_align='left';
-            $right_align='right';
-        }
-
-        $squirrelmail_language = $sm_notAlias;
-        if ($squirrelmail_language == 'ja_JP') {
-            header ('Content-Type: text/html; charset=EUC-JP');
-            if (!function_exists('mb_internal_encoding')) {
-                // Error messages can't be displayed here
-                $error = 1;
-                // Revert to English if possible.
-                if (function_exists('setPref')  && $username!='' && $data_dir!="") {
-                    setPref($data_dir, $username, 'language', "en_US");
-                    $error = 2;
-                }
-                // stop further execution in order not to get php errors on mb_internal_encoding().
-                return $error;
-            }
-            if (function_exists('mb_language')) {
-                mb_language('Japanese');
-            }
-            mb_internal_encoding('EUC-JP');
-            mb_http_output('pass');
-        } elseif ($squirrelmail_language == 'en_US') {
-            header( 'Content-Type: text/html; charset=' . $default_charset );
-        } else {
-            header( 'Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET'] );
-        }
-        /**
-         * mbstring.func_overload fix (#929644).
-         *
-         * php mbstring extension can replace standard string functions with their multibyte
-         * equivalents. See http://www.php.net/ref.mbstring#mbstring.overload. This feature 
-         * was added in php v.4.2.0
-         *
-         * Some SquirrelMail functions work with 8bit strings in bytes. If interface is forced
-         * to use mbstring functions and mbstring internal encoding is set to multibyte charset,
-         * interface can't trust regular string functions. Due to mbstring overloading design
-         * limits php scripts can't control this setting.
-         *
-         * This hack should fix some issues related to 8bit strings in passwords. Correct fix is
-         * to disable mbstring overloading. Japanese translation uses different internal encoding.
-         */
-        if ($squirrelmail_language != 'ja_JP' &&
-            function_exists('mb_internal_encoding') &&
-            check_php_version(4,2,0) &&
-            (int)ini_get('mbstring.func_overload')!=0) {
-            mb_internal_encoding('pass');
-        }
-    }
-    return 0;
-}
-
-/**
- * Sets default_charset variable according to the one that is used by user's translations.
- *
- * Function changes global $default_charset variable in order to be sure, that it
- * contains charset used by user's translation. Sanity of $squirrelmail_language
- * and $default_charset combination is also tested.
- *
- * There can be a $default_charset setting in the
- * config.php file, but the user may have a different language
- * selected for a user interface. This function checks the
- * language selected by the user and tags the outgoing messages
- * with the appropriate charset corresponding to the language
- * selection. This is "more right" (tm), than just stamping the
- * message blindly with the system-wide $default_charset.
- */
-function set_my_charset(){
-    global $data_dir, $username, $default_charset, $languages, $squirrelmail_language;
-
-    $my_language = getPref($data_dir, $username, 'language');
-    if (!$my_language) {
-        $my_language = $squirrelmail_language ;
-    }
-    // Catch removed translation
-    if (!isset($languages[$my_language])) {
-        $my_language="en_US";
-    }
-    while (isset($languages[$my_language]['ALIAS'])) {
-        $my_language = $languages[$my_language]['ALIAS'];
-    }
-    $my_charset = $languages[$my_language]['CHARSET'];
-    if ($my_language!='en_US') {
-        $default_charset = $my_charset;
-    }
-}
-
-/**
- * Replaces non-braking spaces inserted by some browsers with regular space
- *
- * This function can be used to replace non-braking space symbols
- * that are inserted in forms by some browsers instead of normal
- * space symbol.
- *
- * @param string $string Text that needs to be cleaned
- * @param string $charset Charset used in text
- * @return string Cleaned text
- */
-function cleanup_nbsp($string,$charset) {
-
-  // reduce number of case statements
-  if (stristr('iso-8859-',substr($charset,0,9))){
-    $output_charset="iso-8859-x";
-  }
-  if (stristr('windows-125',substr($charset,0,11))){
-    $output_charset="cp125x";
-  }
-  if (stristr('koi8',substr($charset,0,4))){
-    $output_charset="koi8-x";
-  }
-  if (! isset($output_charset)){
-    $output_charset=strtolower($charset);
-  }
-
-// where is non-braking space symbol
-switch($output_charset):
- case "iso-8859-x":
- case "cp125x":
- case "iso-2022-jp":
-  $nbsp="\xA0";
-  break;
- case "koi8-x":
-   $nbsp="\x9A";
-   break;
- case "utf-8":
-   $nbsp="\xC2\xA0";
-   break;
- default:
-   // don't change string if charset is unmatched
-   return $string;
-endswitch;
-
-// return space instead of non-braking space.
- return str_replace($nbsp,' ',$string);
-}
-
-/**
- * Function informs if it is safe to convert given charset to the one that is used by user.
- *
- * It is safe to use conversion only if user uses utf-8 encoding and when
- * converted charset is similar to the one that is used by user.
- *
- * @param string $input_charset Charset of text that needs to be converted
- * @return bool is it possible to convert to user's charset
- */
-function is_conversion_safe($input_charset) {
-    global $languages, $sm_notAlias, $default_charset, $lossy_encoding;
-
-    if (isset($lossy_encoding) && $lossy_encoding )
-        return true;
-
-    // convert to lower case
-    $input_charset = strtolower($input_charset);
-
-    // Is user's locale Unicode based ?
-    if ( $default_charset == "utf-8" ) {
-        return true;
-    }
-
-    // Charsets that are similar
-    switch ($default_charset) {
-    case "windows-1251":
-        if ( $input_charset == "iso-8859-5" ||
-             $input_charset == "koi8-r" ||
-             $input_charset == "koi8-u" ) {
-            return true;
-        } else {
-            return false;
-        }
-    case "windows-1257":
-        if ( $input_charset == "iso-8859-13" ||
-             $input_charset == "iso-8859-4" ) {
-            return true;
-        } else {
-            return false;
-        }
-    case "iso-8859-4":
-        if ( $input_charset == "iso-8859-13" ||
-             $input_charset == "windows-1257" ) {
-            return true;
-        } else {
-            return false;
-        }
-    case "iso-8859-5":
-        if ( $input_charset == "windows-1251" ||
-             $input_charset == "koi8-r" ||
-             $input_charset == "koi8-u" ) {
-            return true;
-        } else {
-            return false;
-        }
-    case "iso-8859-13":
-        if ( $input_charset == "iso-8859-4" ||
-             $input_charset == "windows-1257" ) {
-            return true;
-        } else {
-            return false;
-        }
-    case "koi8-r":
-        if ( $input_charset == "windows-1251" ||
-             $input_charset == "iso-8859-5" ||
-             $input_charset == "koi8-u" ) {
-            return true;
-        } else {
-            return false;
-        }
-    case "koi8-u":
-        if ( $input_charset == "windows-1251" ||
-             $input_charset == "iso-8859-5" ||
-             $input_charset == "koi8-r" ) {
-            return true;
-        } else {
-            return false;
-        }
-    default:
-        return false;
-    }
-}
-
-/**
- * Converts html character entities to numeric entities
- * 
- * SquirrelMail encoding functions work only with numeric entities.
- * This function fixes issues with decoding functions that might convert
- * some symbols to character entities. Issue is specific to PHP recode 
- * extension decoding. Function is used internally in charset_convert()
- * function.
- * @param string $str string that might contain html character entities
- * @return string string with character entities converted to decimals. 
- * @since 1.5.2
- */
-function sqi18n_convert_entities($str) {
-
-    $entities = array(
-        // Latin 1
-        '&nbsp;'   => '&#160;',
-        '&iexcl;'  => '&#161;',
-        '&cent;'   => '&#162;',
-        '&pound;'  => '&#163;',
-        '&curren;' => '&#164;',
-        '&yen;'    => '&#165;',
-        '&brvbar;' => '&#166;',
-        '&sect;'   => '&#167;',
-        '&uml;'    => '&#168;',
-        '&copy;'   => '&#169;',
-        '&ordf;'   => '&#170;',
-        '&laquo;'  => '&#171;',
-        '&not;'    => '&#172;',
-        '&shy;'    => '&#173;',
-        '&reg;'    => '&#174;',
-        '&macr;'   => '&#175;',
-        '&deg;'    => '&#176;',
-        '&plusmn;' => '&#177;',
-        '&sup2;'   => '&#178;',
-        '&sup3;'   => '&#179;',
-        '&acute;'  => '&#180;',
-        '&micro;'  => '&#181;',
-        '&para;'   => '&#182;',
-        '&middot;' => '&#183;',
-        '&cedil;'  => '&#184;',
-        '&sup1;'   => '&#185;',
-        '&ordm;'   => '&#186;',
-        '&raquo;'  => '&#187;',
-        '&frac14;' => '&#188;',
-        '&frac12;' => '&#189;',
-        '&frac34;' => '&#190;',
-        '&iquest;' => '&#191;',
-        '&Agrave;' => '&#192;',
-        '&Aacute;' => '&#193;',
-        '&Acirc;'  => '&#194;',
-        '&Atilde;' => '&#195;',
-        '&Auml;'   => '&#196;',
-        '&Aring;'  => '&#197;',
-        '&AElig;'  => '&#198;',
-        '&Ccedil;' => '&#199;',
-        '&Egrave;' => '&#200;',
-        '&Eacute;' => '&#201;',
-        '&Ecirc;'  => '&#202;',
-        '&Euml;'   => '&#203;',
-        '&Igrave;' => '&#204;',
-        '&Iacute;' => '&#205;',
-        '&Icirc;'  => '&#206;',
-        '&Iuml;'   => '&#207;',
-        '&ETH;'    => '&#208;',
-        '&Ntilde;' => '&#209;',
-        '&Ograve;' => '&#210;',
-        '&Oacute;' => '&#211;',
-        '&Ocirc;'  => '&#212;',
-        '&Otilde;' => '&#213;',
-        '&Ouml;'   => '&#214;',
-        '&times;'  => '&#215;',
-        '&Oslash;' => '&#216;',
-        '&Ugrave;' => '&#217;',
-        '&Uacute;' => '&#218;',
-        '&Ucirc;'  => '&#219;',
-        '&Uuml;'   => '&#220;',
-        '&Yacute;' => '&#221;',
-        '&THORN;'  => '&#222;',
-        '&szlig;'  => '&#223;',
-        '&agrave;' => '&#224;',
-        '&aacute;' => '&#225;',
-        '&acirc;'  => '&#226;',
-        '&atilde;' => '&#227;',
-        '&auml;'   => '&#228;',
-        '&aring;'  => '&#229;',
-        '&aelig;'  => '&#230;',
-        '&ccedil;' => '&#231;',
-        '&egrave;' => '&#232;',
-        '&eacute;' => '&#233;',
-        '&ecirc;'  => '&#234;',
-        '&euml;'   => '&#235;',
-        '&igrave;' => '&#236;',
-        '&iacute;' => '&#237;',
-        '&icirc;'  => '&#238;',
-        '&iuml;'   => '&#239;',
-        '&eth;'    => '&#240;',
-        '&ntilde;' => '&#241;',
-        '&ograve;' => '&#242;',
-        '&oacute;' => '&#243;',
-        '&ocirc;'  => '&#244;',
-        '&otilde;' => '&#245;',
-        '&ouml;'   => '&#246;',
-        '&divide;' => '&#247;',
-        '&oslash;' => '&#248;',
-        '&ugrave;' => '&#249;',
-        '&uacute;' => '&#250;',
-        '&ucirc;'  => '&#251;',
-        '&uuml;'   => '&#252;',
-        '&yacute;' => '&#253;',
-        '&thorn;'  => '&#254;',
-        '&yuml;'   => '&#255;',
-        // Latin Extended-A
-        '&OElig;'  => '&#338;',
-        '&oelig;'  => '&#339;',
-        '&Scaron;' => '&#352;',
-        '&scaron;' => '&#353;',
-        '&Yuml;'   => '&#376;',
-        // Spacing Modifier Letters
-        '&circ;'   => '&#710;',
-        '&tilde;'  => '&#732;',
-        // General Punctuation
-        '&ensp;'   => '&#8194;',
-        '&emsp;'   => '&#8195;',
-        '&thinsp;' => '&#8201;',
-        '&zwnj;'   => '&#8204;',
-        '&zwj;'    => '&#8205;',
-        '&lrm;'    => '&#8206;',
-        '&rlm;'    => '&#8207;',
-        '&ndash;'  => '&#8211;',
-        '&mdash;'  => '&#8212;',
-        '&lsquo;'  => '&#8216;',
-        '&rsquo;'  => '&#8217;',
-        '&sbquo;'  => '&#8218;',
-        '&ldquo;'  => '&#8220;',
-        '&rdquo;'  => '&#8221;',
-        '&bdquo;'  => '&#8222;',
-        '&dagger;' => '&#8224;',
-        '&Dagger;' => '&#8225;',
-        '&permil;' => '&#8240;',
-        '&lsaquo;' => '&#8249;',
-        '&rsaquo;' => '&#8250;',
-        '&euro;'   => '&#8364;',
-        // Latin Extended-B
-        '&fnof;' => '&#402;',
-        // Greek
-        '&Alpha;'  => '&#913;',
-        '&Beta;'   => '&#914;',
-        '&Gamma;'  => '&#915;',
-        '&Delta;'  => '&#916;',
-        '&Epsilon;' => '&#917;',
-        '&Zeta;'   => '&#918;',
-        '&Eta;'    => '&#919;',
-        '&Theta;'  => '&#920;',
-        '&Iota;'   => '&#921;',
-        '&Kappa;'  => '&#922;',
-        '&Lambda;' => '&#923;',
-        '&Mu;'     => '&#924;',
-        '&Nu;'     => '&#925;',
-        '&Xi;'     => '&#926;',
-        '&Omicron;' => '&#927;',
-        '&Pi;'     => '&#928;',
-        '&Rho;'    => '&#929;',
-        '&Sigma;'  => '&#931;',
-        '&Tau;'    => '&#932;',
-        '&Upsilon;' => '&#933;',
-        '&Phi;'    => '&#934;',
-        '&Chi;'    => '&#935;',
-        '&Psi;'    => '&#936;',
-        '&Omega;'  => '&#937;',
-        '&alpha;'  => '&#945;',
-        '&beta;'   => '&#946;',
-        '&gamma;'  => '&#947;',
-        '&delta;'  => '&#948;',
-        '&epsilon;' => '&#949;',
-        '&zeta;'   => '&#950;',
-        '&eta;'    => '&#951;',
-        '&theta;'  => '&#952;',
-        '&iota;'   => '&#953;',
-        '&kappa;'  => '&#954;',
-        '&lambda;' => '&#955;',
-        '&mu;'     => '&#956;',
-        '&nu;'     => '&#957;',
-        '&xi;'     => '&#958;',
-        '&omicron;' => '&#959;',
-        '&pi;'     => '&#960;',
-        '&rho;'    => '&#961;',
-        '&sigmaf;' => '&#962;',
-        '&sigma;'  => '&#963;',
-        '&tau;'    => '&#964;',
-        '&upsilon;' => '&#965;',
-        '&phi;'    => '&#966;',
-        '&chi;'    => '&#967;',
-        '&psi;'    => '&#968;',
-        '&omega;'  => '&#969;',
-        '&thetasym;' => '&#977;',
-        '&upsih;'  => '&#978;',
-        '&piv;'    => '&#982;',
-        // General Punctuation
-        '&bull;'   => '&#8226;',
-        '&hellip;' => '&#8230;',
-        '&prime;'  => '&#8242;',
-        '&Prime;'  => '&#8243;',
-        '&oline;'  => '&#8254;',
-        '&frasl;'  => '&#8260;',
-        // Letterlike Symbols
-        '&weierp;' => '&#8472;',
-        '&image;'  => '&#8465;',
-        '&real;'   => '&#8476;',
-        '&trade;'  => '&#8482;',
-        '&alefsym;' => '&#8501;',
-        // Arrows
-        '&larr;'   => '&#8592;',
-        '&uarr;'   => '&#8593;',
-        '&rarr;'   => '&#8594;',
-        '&darr;'   => '&#8595;',
-        '&harr;'   => '&#8596;',
-        '&crarr;'  => '&#8629;',
-        '&lArr;'   => '&#8656;',
-        '&uArr;'   => '&#8657;',
-        '&rArr;'   => '&#8658;',
-        '&dArr;'   => '&#8659;',
-        '&hArr;'   => '&#8660;',
-        // Mathematical Operators
-        '&forall;' => '&#8704;',
-        '&part;'   => '&#8706;',
-        '&exist;'  => '&#8707;',
-        '&empty;'  => '&#8709;',
-        '&nabla;'  => '&#8711;',
-        '&isin;'   => '&#8712;',
-        '&notin;'  => '&#8713;',
-        '&ni;'     => '&#8715;',
-        '&prod;'   => '&#8719;',
-        '&sum;'    => '&#8721;',
-        '&minus;'  => '&#8722;',
-        '&lowast;' => '&#8727;',
-        '&radic;'  => '&#8730;',
-        '&prop;'   => '&#8733;',
-        '&infin;'  => '&#8734;',
-        '&ang;'    => '&#8736;',
-        '&and;'    => '&#8743;',
-        '&or;'     => '&#8744;',
-        '&cap;'    => '&#8745;',
-        '&cup;'    => '&#8746;',
-        '&int;'    => '&#8747;',
-        '&there4;' => '&#8756;',
-        '&sim;'    => '&#8764;',
-        '&cong;'   => '&#8773;',
-        '&asymp;'  => '&#8776;',
-        '&ne;'     => '&#8800;',
-        '&equiv;'  => '&#8801;',
-        '&le;'     => '&#8804;',
-        '&ge;'     => '&#8805;',
-        '&sub;'    => '&#8834;',
-        '&sup;'    => '&#8835;',
-        '&nsub;'   => '&#8836;',
-        '&sube;'   => '&#8838;',
-        '&supe;'   => '&#8839;',
-        '&oplus;'  => '&#8853;',
-        '&otimes;' => '&#8855;',
-        '&perp;'   => '&#8869;',
-        '&sdot;'   => '&#8901;',
-        // Miscellaneous Technical
-        '&lceil;'  => '&#8968;',
-        '&rceil;'  => '&#8969;',
-        '&lfloor;' => '&#8970;',
-        '&rfloor;' => '&#8971;',
-        '&lang;'   => '&#9001;',
-        '&rang;'   => '&#9002;',
-        // Geometric Shapes
-        '&loz;'    => '&#9674;',
-        // Miscellaneous Symbols
-        '&spades;' => '&#9824;',
-        '&clubs;'  => '&#9827;',
-        '&hearts;' => '&#9829;',
-        '&diams;'  => '&#9830;');
-
-    $str = str_replace(array_keys($entities), array_values($entities), $str);
-
-    return $str;
-}
-
-/* ------------------------------ main --------------------------- */
-
-global $squirrelmail_language, $languages, $use_gettext;
-
-if (! sqgetGlobalVar('squirrelmail_language',$squirrelmail_language,SQ_COOKIE)) {
-    $squirrelmail_language = '';
-}
-
-/**
- * Array specifies the available translations.
- *
- * Structure of array:
- * $languages['language']['variable'] = 'value'
- *
- * Possible 'variable' names:
- *  NAME      - Translation name in English
- *  CHARSET   - Encoding used by translation
- *  ALIAS     - used when 'language' is only short name and 'value' should provide long language name
- *  ALTNAME   - Native translation name. Any 8bit symbols must be html encoded.
- *  LOCALE    - Full locale name (in xx_XX.charset format). It can use array with more than one locale name since 1.4.5 and 1.5.1
- *  DIR       - Text direction. Used to define Right-to-Left languages. Possible values 'rtl' or 'ltr'. If undefined - defaults to 'ltr'
- *  XTRA_CODE - translation uses special functions. See doc/i18n.txt
- *
- * Each 'language' definition requires NAME+CHARSET or ALIAS variables.
- *
- * @name $languages
- * @global array $languages
- */
-$languages['en_US']['NAME']    = 'English';
-$languages['en_US']['CHARSET'] = 'iso-8859-1';
-$languages['en_US']['LOCALE']  = 'en_US.ISO8859-1';
-$languages['en']['ALIAS'] = 'en_US';
-
-/**
- * Automatic translation loading from setup.php files.
- * Solution for bug. 1240889.
- * setup.php file can contain $languages array entries and XTRA_CODE functions.
- */
-if (is_dir(SM_PATH . 'locale') &&
-    is_readable(SM_PATH . 'locale')) {
-    $localedir = dir(SM_PATH . 'locale');
-    while($lang_dir=$localedir->read()) {
-        // remove trailing slash, if present
-        if (substr($lang_dir,-1)=='/') {
-            $lang_dir = substr($lang_dir,0,-1);
-        }
-        if ($lang_dir != '..' && $lang_dir != '.' && $lang_dir != 'CVS' &&
-            is_dir(SM_PATH.'locale/'.$lang_dir) && 
-            file_exists(SM_PATH.'locale/'.$lang_dir.'/setup.php')) {
-            include_once(SM_PATH.'locale/'.$lang_dir.'/setup.php');
-        }
-    }
-    $localedir->close();
-}
-
-/* Detect whether gettext is installed. */
-$gettext_flags = 0;
-if (function_exists('_')) {
-    $gettext_flags += 1;
-}
-if (function_exists('bindtextdomain')) {
-    $gettext_flags += 2;
-}
-if (function_exists('textdomain')) {
-    $gettext_flags += 4;
-}
-if (function_exists('ngettext')) {
-    $gettext_flags += 8;
-}
-
-/* If gettext is fully loaded, cool */
-if ($gettext_flags == 15) {
-    $use_gettext = true;
-}
-
-/* If ngettext support is missing, load it */
-elseif ($gettext_flags == 7) {
-    $use_gettext = true;
-    // load internal ngettext functions
-    include_once(SM_PATH . 'class/l10n.class.php');
-    include_once(SM_PATH . 'functions/ngettext.php');
-}
 
-/* If we can fake gettext, try that */
-elseif ($gettext_flags == 0) {
-    $use_gettext = true;
-    include_once(SM_PATH . 'functions/gettext.php');
-} else {
-    /* Uh-ho.  A weird install */
-    if (! $gettext_flags & 1) {
-      /**
-       * Function is used as replacement in broken installs
-       * @ignore
-       */
-        function _($str) {
-            return $str;
-        }
-    }
-    if (! $gettext_flags & 2) {
-      /**
-       * Function is used as replacement in broken installs
-       * @ignore
-       */
-        function bindtextdomain() {
-            return;
-        }
-    }
-    if (! $gettext_flags & 4) {
-      /**
-       * Function is used as replacemet in broken installs
-       * @ignore
-       */
-        function textdomain() {
-            return;
-        }
-    }
-    if (! $gettext_flags & 8) {
-        /**
-         * Function is used as replacemet in broken installs
-         * @ignore
-         */
-        function ngettext($str,$str2,$number) {
-            if ($number>1) {
-                return $str2;
-            } else {
-                return $str;
-            }
-        }
-    }
-    if (! function_exists('dgettext')) {
-        /**
-         * Replacement for broken setups.
-         * @ignore
-         */
-        function dgettext($domain,$str) {
-            return $str;
-        }
-    }
-    if (! function_exists('dngettext')) {
-        /**
-         * Replacement for broken setups
-         * @ignore
-         */
-        function dngettext($domain,$str1,$strn,$number) {
-            return ($number==1 ? $str1 : $strn);
-        }
-    }
-}
+/** break if somebody tries to load this file */
+die('Rewrite your code, functions/i18n.php file location is changed in 1.5.2.'
+    .' Direct loading of functions/i18n.php is deprecated.');
 ?>

include/constants.php

@@ -4,9 +4,8 @@
  * constants.php
  *
  * Loads constants used by the rest of the SquirrelMail source.
- * This file is include by src/login.php, src/redirect.php and
- * src/load_prefs.php.
  *
+ * Before 1.5.2 script was stored in functions/constants.php
  * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
@@ -152,7 +151,10 @@ define('SQM_COL_TO', 9);
 define('SQM_COL_CC', 10);
 define('SQM_COL_BCC', 11);
 
-/** @since 1.2.0 */
+/**
+ * FIXME: error notice on direct load
+ * @since 1.2.0
+ */
 do_hook('loading_constants');
 
 ?>

include/init.php

@@ -392,6 +392,20 @@ switch ($sInitLocation) {
                 putenv("TZ=".$realTimeZone);
             }
         }
+
+        /**
+         * php 5.1.0 added time zone functions. Set time zone with them in order
+         * to prevent E_STRICT notices and allow time zone modifications in safe_mode.
+         */
+        if (function_exists('date_default_timezone_set')) {
+            if ($timeZone != SMPREF_NONE && $timeZone != "") {
+                date_default_timezone_set($timeZone);
+            } else {
+                // interface runs on server's time zone. Remove php E_STRICT complains
+                $default_timezone = @date_default_timezone_get();
+                date_default_timezone_set($default_timezone);        
+            }
+        }
         break;
 }
 
@@ -430,7 +444,7 @@ if (version_compare(PHP_VERSION, "4.3.0", ">=")) {
 /**
  * Javascript support detection function
  * @param boolean $reset recheck javascript support if set to true.
- * @return integer SMPREF_JS_ON or SMPREF_JS_OFF ({@see functions/constants.php})
+ * @return integer SMPREF_JS_ON or SMPREF_JS_OFF ({@see include/constants.php})
  * @since 1.5.1
  */
 function checkForJavascript($reset = FALSE) {

include/languages.php

@@ -9,6 +9,11 @@
  * Internally the output character set is used. Other characters are
  * encoded using Unicode entities according to HTML 4.0.
  *
+ * Before 1.5.2 functions were stored in functions/i18n.php. Script is moved
+ * because it executes some code in order to detect functions supported by
+ * existing PHP installation and implements fallback functions when required
+ * functions are not available. Scripts in functions/ directory should not
+ * setup anything when they are loaded.
  * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$

include/options/personal.php

@@ -131,7 +131,7 @@ function load_optpage_data_personal() {
         );
     }
 
-    if ( $tzChangeAllowed ) {
+    if ( $tzChangeAllowed || function_exists('date_default_timezone_set')) {
         $TZ_ARRAY[SMPREF_NONE] = _("Same as server");
 
         $aTimeZones = sq_get_tz_array();

plugins/abook_take/functions.php

@@ -12,6 +12,7 @@
  * @subpackage abook_take
  */
 
+/** */
 function valid_email ($email, $verify)
 {
     global $Email_RegExp_Match;

plugins/administrator/defines.php

@@ -11,7 +11,7 @@
  * @subpackage administrator
  */
 
-/* Define constants for the various option types. */
+/** Define constants for the various option types. */
 define('SMOPT_TYPE_UNDEFINED', -1);
 define('SMOPT_TYPE_STRING', 0);
 define('SMOPT_TYPE_STRLIST', 1);

src/configtest.php

@@ -515,7 +515,7 @@ if (function_exists('gettext')) {
 
     /* optional setlocale() tests. Should work only on glibc systems. */
     if (sqgetGlobalVar('testlocales',$testlocales,SQ_GET)) {
-        include_once(SM_PATH . 'functions/i18n.php');
+        include_once(SM_PATH . 'include/languages.php');
         echo $IND . $IND . 'Testing translations:<br>';
         foreach ($languages as $lang_code => $lang_data) {
             /* don't test aliases */
@@ -588,9 +588,9 @@ if (function_exists('iconv')) {
 } else {
     echo "Iconv functions are unavailable.<br />\n";
 }
-// same test as in include/validate.php
+// same test as in include/init.php + date_default_timezone_set check
 echo "$IND timezone - ";
-if ( (!ini_get('safe_mode')) ||
+if ( (!ini_get('safe_mode')) || function_exists('date_default_timezone_set') ||
         !strcmp(ini_get('safe_mode_allowed_env_vars'),'') ||
         preg_match('/^([\w_]+,)*TZ/', ini_get('safe_mode_allowed_env_vars')) ) {
     echo "Webmail users can change their time zone settings. \n";

src/view_text.php

@@ -13,8 +13,7 @@
  * @package squirrelmail
  */
 
-
-/* SquirrelMail required files. */
+/** SquirrelMail required files. */
 include('../include/init.php');
 include(SM_PATH . 'functions/imap_general.php');
 include(SM_PATH . 'functions/imap_messages.php');