Fix so valid and set date.timezone is not required by installer checks (#1489180)

pull/88/head
Aleksander Machniak 11 years ago
parent 6376aaff0c
commit 738c446078

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Fix so valid and set date.timezone is not required by installer checks (#1489180)
- Canonize boolean ini_get() results (#1489189)
- Fix so install do not fail when one of DB driver checks fails but other drivers exist (#1489178)
- Fix so exported vCard specifies encoding in v3-compatible format (#1489183)

@ -42,12 +42,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' => '-VALID-',
);
$source_urls = array(
@ -189,23 +189,15 @@ foreach ($ini_checks as $var => $val) {
if ($val === '-NOTEMPTY-') {
if (empty($status)) {
$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 {
}
else {
$RCI->pass($var);
}
echo '<br />';
continue;
}
if (filter_var($status, FILTER_VALIDATE_BOOLEAN) == $val) {
else if (filter_var($status, FILTER_VALIDATE_BOOLEAN) == $val) {
$RCI->pass($var);
} else {
}
else {
$RCI->fail($var, "is '$status', should be '$val'");
}
echo '<br />';
@ -227,9 +219,24 @@ foreach ($optional_checks as $var => $val) {
echo '<br />';
continue;
}
if (filter_var($status, FILTER_VALIDATE_BOOLEAN) == $val) {
if ($val === '-VALID-') {
if ($var == 'date.timezone') {
try {
$tz = new DateTimeZone($status);
$RCI->pass($var);
}
catch (Exception $e) {
$RCI->optfail($var, empty($status) ? "not set" : "invalid value detected: $status");
}
}
else {
$RCI->pass($var);
}
}
else if (filter_var($status, FILTER_VALIDATE_BOOLEAN) == $val) {
$RCI->pass($var);
} else {
}
else {
$RCI->optfail($var, "is '$status', could be '$val'");
}
echo '<br />';

Loading…
Cancel
Save