From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports
---
installer/check.php | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index 80c22bb..6742774 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -15,16 +15,16 @@
'XML' => 'xml',
'JSON' => 'json',
'PDO' => 'PDO',
+ 'Multibyte' => 'mbstring',
+ 'OpenSSL' => 'openssl',
);
$optional_php_exts = array(
'FileInfo' => 'fileinfo',
'Libiconv' => 'iconv',
- 'Multibyte' => 'mbstring',
- 'OpenSSL' => 'openssl',
- 'Mcrypt' => 'mcrypt',
'Intl' => 'intl',
'Exif' => 'exif',
+ 'LDAP' => 'ldap',
);
$required_libs = array(
@@ -32,15 +32,16 @@
'Auth_SASL' => 'pear.php.net',
'Net_SMTP' => 'pear.php.net',
'Net_IDNA2' => 'pear.php.net',
- 'Net_LDAP3' => 'git.kolab.org',
'Mail_mime' => 'pear.php.net',
- 'Mail_mimeDecode' => 'pear.php.net',
+);
+
+$optional_libs = array(
+ 'Net_LDAP3' => 'git.kolab.org',
);
$ini_checks = array(
'file_uploads' => 1,
'session.auto_start' => 0,
- 'zend.ze1_compatibility_mode' => 0,
'mbstring.func_overload' => 0,
'suhosin.session.encrypt' => 0,
'magic_quotes_runtime' => 0,
@@ -61,7 +62,6 @@
'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',
@@ -69,6 +69,7 @@
'Exif' => 'http://www.php.net/manual/en/book.exif.php',
'oci8' => 'http://www.php.net/manual/en/book.oci8.php',
'PDO' => 'http://www.php.net/manual/en/book.pdo.php',
+ 'LDAP' => 'http://www.php.net/manual/en/book.ldap.php',
'pdo_mysql' => 'http://www.php.net/manual/en/ref.pdo-mysql.php',
'pdo_pgsql' => 'http://www.php.net/manual/en/ref.pdo-pgsql.php',
'pdo_sqlite' => 'http://www.php.net/manual/en/ref.pdo-sqlite.php',
@@ -79,6 +80,7 @@
'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',
+ 'Net_LDAP3' => 'https://git.kolab.org/diffusion/PNL',
);
echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />';
@@ -165,7 +167,6 @@
<?php
foreach ($required_libs as $classname => $vendor) {
- @include_once $file;
if (class_exists($classname)) {
$RCI->pass($classname);
}
@@ -175,6 +176,15 @@
echo "<br />";
}
+foreach ($optional_libs as $classname => $vendor) {
+ if (class_exists($classname)) {
+ $RCI->pass($classname);
+ }
+ else {
+ $RCI->na($classname, "Recommended to install $classname from $vendor", $source_urls[$classname]);
+ }
+ echo "<br />";
+}
?>
--
Gitblit v1.9.1