summaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
Diffstat (limited to 'installer')
-rw-r--r--installer/check.php15
-rw-r--r--installer/index.php9
2 files changed, 16 insertions, 8 deletions
diff --git a/installer/check.php b/installer/check.php
index 31b4c2955..6974d3720 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -28,10 +28,13 @@ $optional_php_exts = array(
);
$required_libs = array(
- 'PEAR' => 'PEAR.php',
- 'Net_SMTP' => 'Net/SMTP.php',
- 'Net_IDNA2' => 'Net/IDNA2.php',
- 'Mail_mime' => 'Mail/mime.php',
+ 'PEAR' => 'pear.php.net',
+ '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',
);
$ini_checks = array(
@@ -160,13 +163,13 @@ if (empty($found_db_driver)) {
<?php
-foreach ($required_libs as $classname => $file) {
+foreach ($required_libs as $classname => $vendor) {
@include_once $file;
if (class_exists($classname)) {
$RCI->pass($classname);
}
else {
- $RCI->fail($classname, "Failed to load $file", $source_urls[$classname]);
+ $RCI->fail($classname, "Failed to load class $classname from $vendor", $source_urls[$classname]);
}
echo "<br />";
}
diff --git a/installer/index.php b/installer/index.php
index 044eb3f57..b93ad2f94 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -3,9 +3,9 @@
/*
+-------------------------------------------------------------------------+
| Roundcube Webmail setup tool |
- | Version 0.9-git |
+ | Version 1.1-git |
| |
- | Copyright (C) 2009-2013, The Roundcube Dev Team |
+ | Copyright (C) 2009-2014, The Roundcube Dev Team |
| |
| This program is free software: you can redistribute it and/or modify |
| it under the terms of the GNU General Public License (with exceptions |
@@ -49,6 +49,11 @@ $include_path .= ini_get('include_path');
set_include_path($include_path);
+// include composer autoloader (if available)
+if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) {
+ require INSTALL_PATH . 'vendor/autoload.php';
+}
+
require_once 'Roundcube/bootstrap.php';
// deprecated aliases (to be removed)
require_once 'bc.php';