From 2ac00a258b9aa859ea78da25cd906e1709df5b75 Mon Sep 17 00:00:00 2001
From: Paweł Słowik <pawel.slowik@iq.pl>
Date: Thu, 30 Aug 2012 13:31:40 -0400
Subject: [PATCH] Sieve enotify/notify - parser
---
installer/check.php | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index 0ba5f58..52460bb 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(
@@ -16,20 +17,14 @@
'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(
@@ -38,10 +33,14 @@
'zend.ze1_compatibility_mode' => 0,
'mbstring.func_overload' => 0,
'suhosin.session.encrypt' => 0,
+ 'magic_quotes_runtime' => 0,
+ 'magic_quotes_sybase' => 0,
);
$optional_checks = array(
- 'date.timezone' => '-NOTEMPTY-',
+ // required for utils/modcss.inc, should we require this?
+ 'allow_url_fopen' => 1,
+ 'date.timezone' => '-NOTEMPTY-',
);
$source_urls = array(
@@ -56,10 +55,18 @@
'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',
- 'MDB2' => 'http://pear.php.net/package/MDB2',
'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) . '" />';
@@ -121,14 +128,14 @@
<?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);
}
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 />';
}
--
Gitblit v1.9.1