From 8be6483a2a4a6fa26aa6013d47a2fe60153484d9 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 29 Sep 2010 09:15:29 +0000 Subject: [PATCH] * added valid timezone set in php.ini check --- setup/check_install.php | 22 ++++++++++++++++++++++ setup/lang/egw_de.lang | 2 ++ setup/lang/egw_en.lang | 2 ++ 3 files changed, 26 insertions(+) diff --git a/setup/check_install.php b/setup/check_install.php index 6765d1a6cb..d7d93ee945 100644 --- a/setup/check_install.php +++ b/setup/check_install.php @@ -122,6 +122,14 @@ $checks = array( 'check' => 'contain', 'error' => lang('include_path need to contain "." - the current directory'), ), + 'date.timezone' => array( + 'func' => 'php_ini_check', + 'value' => 'System/Localtime', + 'verbose_value' => '"System/Localtime"', + 'check' => '!=', + 'error' => lang('No VALID timezone set! ("%1" is NOT sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4)', + 'System/Localtime','Europe/Berlin','',''), + ), 'pdo' => array( 'func' => 'extension_check', 'error' => lang('The PDO extension plus a database specific driver is needed by the VFS (virtual file system)!'), @@ -696,11 +704,25 @@ function php_ini_check($name,$args) $sep = $is_windows ? '/[; ]+/' : '/[: ]+/'; $result = in_array($args['value'],preg_split($sep,$ini_value)); break; + case '!=': + $check = lang('set and not'); + $result = !empty($ini_value) && $ini_value != $args['value']; + break; case '=': default: $result = $ini_value == $args['value']; break; } + if ($name == 'date.timezone') + { + try { + $tz = new DateTimeZone($ini_value); + unset($tz); + } + catch(Exception $e) { + $result = false; // no valid timezone + } + } $msg = ' '.lang('Checking php.ini').": $name $check $verbose_value: ini_get('$name')='$ini_value'$ini_value_verbose"; if ($result) diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang index cad4d7f0f9..d794be451b 100644 --- a/setup/lang/egw_de.lang +++ b/setup/lang/egw_de.lang @@ -409,6 +409,7 @@ no egroupware domains / database instances exist! use --edit-header --domain to no header admin password set! use --edit-header [,] to set one (--usage gives more options). setup de Kein Passwort für die Headerverwaltung gesetzt! Benutzen Sie --edit-header Passwort[,Benutzer] um eines zu setzen (--usage gibt weitere Optionen). no modes available setup de kein Modus verfügbar no update necessary, domain %1(%2) is up to date. setup de Keine Aktualisierung notwendig, Domain %1(%2) ist aktuell. +no valid timezone set! ("%1" is not sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4) setup de Keine gültige Zeitzone gesetzt! ("%1" ist nicht ausreichend, Sie müssen eine Zeitzone wie "%2" verwenden, siehe %3Liste der gültigen Zeitzonen%4) no xml support found. disabling setup de Keine Unterstützung für XML gefunden. Abgeschaltet not setup de nicht not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off. setup de Nicht alle MCrypt-Algorithmen und -Modi funktionieren mit eGroupWare. Wenn Sie Probleme feststellen, versuchen Sie es abzuschalten. @@ -521,6 +522,7 @@ server root setup de Server-Root session handler class used. setup de Benutze Sitzunghandler Klasse. sessions handler setup de Sitzunghandler set setup de gesetzt +set and not setup de gesetzt und nicht setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets. setup de Den Systemzeichensatz auf UTF-8 (unicode) zu setzten, erlaubt die Koexistenz von Daten in Sprachen mit verschiedenen Zeichensätzen. settings setup de Einstellungen setup setup de Einrichtung diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang index 67533b9bda..3be079637a 100644 --- a/setup/lang/egw_en.lang +++ b/setup/lang/egw_en.lang @@ -409,6 +409,7 @@ no egroupware domains / database instances exist! use --edit-header --domain to no header admin password set! use --edit-header [,] to set one (--usage gives more options). setup en No header admin password set! Use --edit-header [,] to set one (--usage gives more options). no modes available setup en no modes available no update necessary, domain %1(%2) is up to date. setup en No update necessary, domain %1(%2) is up to date. +no valid timezone set! ("%1" is not sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4) setup en No VALID timezone set! ("%1" is NOT sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4) no xml support found. disabling setup en No XML support found. Disabling not setup en not not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off. setup en Not all mcrypt algorithms and modes work with eGroupWare. If you experience problems try switching it off. @@ -521,6 +522,7 @@ server root setup en Server Root session handler class used. setup en Session handler class used. sessions handler setup en Sessions Handler set setup en set +set and not setup en set and not setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets. setup en Setting the system-charset to UTF-8 (unicode) allows the coexistens of data from languages of different charsets. settings setup en Settings setup setup en Setup