resubmitting last Monday updates and adding php 5.1.0 timezone support

[squirrelmail.git] / src / configtest.php

diff --git a/src/configtest.php b/src/configtest.php
index 6756a96120477619252284779ffaf8f3775fbd29..1ffb18d2f418b95e801ea78964b650654641276a 100644 (file)
--- a/src/configtest.php
+++ b/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";