From aabeab1e4e08ffba5d709aa71de1182dfeb698d1 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 26 Dec 2012 12:48:46 -0500
Subject: [PATCH] Updated localizations from launchpad
---
installer/check.php | 79 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index 408f477..886200b 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -6,7 +6,8 @@
'DOM' => 'dom',
'Session' => 'session',
'XML' => 'xml',
- 'JSON' => 'json'
+ 'JSON' => 'json',
+ 'PDO' => 'PDO',
);
$optional_php_exts = array(
@@ -15,20 +16,15 @@
'Multibyte' => 'mbstring',
'OpenSSL' => 'openssl',
'Mcrypt' => 'mcrypt',
+ 'Intl' => 'intl',
+ 'Exif' => 'exif',
);
$required_libs = array(
'PEAR' => 'PEAR.php',
- 'MDB2' => 'MDB2.php',
'Net_SMTP' => 'Net/SMTP.php',
+ 'Net_IDNA2' => 'Net/IDNA2.php',
'Mail_mime' => 'Mail/mime.php',
-);
-
-$supported_dbs = array(
- 'MySQL' => 'mysql',
- 'MySQLi' => 'mysqli',
- 'PostgreSQL' => 'pgsql',
- 'SQLite (v2)' => 'sqlite',
);
$ini_checks = array(
@@ -37,27 +33,40 @@
'zend.ze1_compatibility_mode' => 0,
'mbstring.func_overload' => 0,
'suhosin.session.encrypt' => 0,
+ 'magic_quotes_runtime' => 0,
+ 'magic_quotes_sybase' => 0,
+ 'date.timezone' => '-NOTEMPTY-',
);
$optional_checks = array(
- 'date.timezone' => '-NOTEMPTY-',
+ // required for utils/modcss.inc, should we require this?
+ 'allow_url_fopen' => 1,
);
$source_urls = array(
- 'Sockets' => 'http://www.php.net/manual/en/book.sockets.php',
- 'Session' => 'http://www.php.net/manual/en/book.session.php',
- 'PCRE' => 'http://www.php.net/manual/en/book.pcre.php',
- 'FileInfo' => 'http://www.php.net/manual/en/book.fileinfo.php',
- 'Libiconv' => 'http://www.php.net/manual/en/book.iconv.php',
+ 'Sockets' => 'http://www.php.net/manual/en/book.sockets.php',
+ 'Session' => 'http://www.php.net/manual/en/book.session.php',
+ 'PCRE' => 'http://www.php.net/manual/en/book.pcre.php',
+ 'FileInfo' => 'http://www.php.net/manual/en/book.fileinfo.php',
+ 'Libiconv' => 'http://www.php.net/manual/en/book.iconv.php',
'Multibyte' => 'http://www.php.net/manual/en/book.mbstring.php',
- 'Mcrypt' => 'http://www.php.net/manual/en/book.mcrypt.php',
- 'OpenSSL' => 'http://www.php.net/manual/en/book.openssl.php',
- 'JSON' => 'http://www.php.net/manual/en/book.json.php',
- 'DOM' => 'http://www.php.net/manual/en/book.dom.php',
- 'PEAR' => 'http://pear.php.net',
- 'MDB2' => 'http://pear.php.net/package/MDB2',
- 'Net_SMTP' => 'http://pear.php.net/package/Net_SMTP',
+ 'Mcrypt' => 'http://www.php.net/manual/en/book.mcrypt.php',
+ 'OpenSSL' => 'http://www.php.net/manual/en/book.openssl.php',
+ 'JSON' => 'http://www.php.net/manual/en/book.json.php',
+ 'DOM' => 'http://www.php.net/manual/en/book.dom.php',
+ 'Intl' => 'http://www.php.net/manual/en/book.intl.php',
+ 'Exif' => 'http://www.php.net/manual/en/book.exif.php',
+ 'PDO' => 'http://www.php.net/manual/en/book.pdo.php',
+ 'pdo_mysql' => 'http://www.php.net/manual/en/book.pdo-mysql.php',
+ 'pdo_pgsql' => 'http://www.php.net/manual/en/book.pdo-pgsql.php',
+ 'pdo_sqlite' => 'http://www.php.net/manual/en/book.pdo-sqlite.php',
+ 'pdo_sqlite2' => 'http://www.php.net/manual/en/book.pdo-sqlite.php',
+ 'pdo_sqlsrv' => 'http://www.php.net/manual/en/book.pdo-sqlsrv.php',
+ 'pdo_dblib' => 'http://www.php.net/manual/en/book.pdo-dblib.php',
+ 'PEAR' => 'http://pear.php.net',
+ 'Net_SMTP' => 'http://pear.php.net/package/Net_SMTP',
'Mail_mime' => 'http://pear.php.net/package/Mail_mime',
+ 'Net_IDNA2' => 'http://pear.php.net/package/Net_IDNA2',
);
echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />';
@@ -66,7 +75,7 @@
<h3>Checking PHP version</h3>
<?php
-define('MIN_PHP_VERSION', '5.2.0');
+define('MIN_PHP_VERSION', '5.2.1');
if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
$RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected');
} else {
@@ -119,14 +128,20 @@
<?php
$prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
-foreach ($supported_dbs as $database => $ext) {
+foreach ($RCI->supported_dbs as $database => $ext) {
if (extension_loaded($ext)) {
- $RCI->pass($database);
+ // MySQL driver requires PHP >= 5.3 (#1488875)
+ if ($ext == 'pdo_mysql' && version_compare(PHP_VERSION, '5.3.0', '<')) {
+ $RCI->fail($database, 'PHP >= 5.3 required');
+ }
+ else {
+ $RCI->pass($database);
+ }
}
else {
$_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
- $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : 'Not installed';
- $RCI->na($database, $msg, $source_urls[$database]);
+ $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : '';
+ $RCI->na($database, $msg, $source_urls[$ext]);
}
echo '<br />';
}
@@ -162,7 +177,15 @@
$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);
}
--
Gitblit v1.9.1