summaryrefslogtreecommitdiff
path: root/installer/check.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-09-17 19:25:57 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-09-17 19:25:57 +0200
commite8e2e76ed987d911ec878345e88d3c611a4b7b32 (patch)
treeae43d047a288e58d7e9c8e3ac8885dc12bc436a2 /installer/check.php
parentba3cd80c0c61e679cef92a1f4f51e645090a1472 (diff)
parent32ba62889c1def94f555c3e683fc8087ee16c9b3 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'installer/check.php')
-rw-r--r--installer/check.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/installer/check.php b/installer/check.php
index 52460bb0f..d6c9f5c40 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -35,12 +35,12 @@ $ini_checks = array(
'suhosin.session.encrypt' => 0,
'magic_quotes_runtime' => 0,
'magic_quotes_sybase' => 0,
+ 'date.timezone' => '-NOTEMPTY-',
);
$optional_checks = array(
// required for utils/modcss.inc, should we require this?
'allow_url_fopen' => 1,
- 'date.timezone' => '-NOTEMPTY-',
);
$source_urls = array(
@@ -171,7 +171,15 @@ foreach ($ini_checks as $var => $val) {
$status = ini_get($var);
if ($val === '-NOTEMPTY-') {
if (empty($status)) {
- $RCI->fail($var, "cannot be empty and needs to be set");
+ $RCI->fail($var, "empty value detected");
+ } else if ($var == 'date.timezone') {
+ try {
+ $tz = new DateTimeZone($status);
+ $RCI->pass($var);
+ }
+ catch (Exception $e) {
+ $RCI->fail($var, "invalid value detected: $status");
+ }
} else {
$RCI->pass($var);
}