From 8e7ed506c41ea8b8f725f7e122ca6f0b091de5e4 Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Sun, 21 Dec 2014 14:25:23 -0500
Subject: [PATCH] Merge pull request #248 from flanpy/master
---
program/include/rcmail_install.php | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index eec21ec..26c613a 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -55,6 +55,7 @@
'SQLite (v2)' => 'pdo_sqlite2',
'SQL Server (SQLSRV)' => 'pdo_sqlsrv',
'SQL Server (DBLIB)' => 'pdo_dblib',
+ 'Oracle' => 'oci8',
);
@@ -233,6 +234,14 @@
else if (is_numeric($value)) {
$value = intval($value);
}
+ else if ($prop == 'plugins') {
+ $value = array();
+ foreach(array_keys($_POST) as $key)
+ {
+ if (preg_match('/^_plugins_*/', $key))
+ array_push($value, $_POST[$key]);
+ }
+ }
// skip this property
if (($value == $this->defaults[$prop]) && !in_array($prop, $this->local_config)
@@ -289,7 +298,7 @@
$out = $seen = array();
// iterate over the current configuration
- foreach ($this->config as $prop => $value) {
+ foreach (array_keys($this->config) as $prop) {
if ($replacement = $this->replaced_config[$prop]) {
$out['replaced'][] = array('prop' => $prop, 'replacement' => $replacement);
$seen[$replacement] = true;
@@ -476,7 +485,7 @@
$types = array(
'application/zip' => 'zip',
'application/x-tar' => 'tar',
- 'application/java-archive' => 'jar',
+ 'application/pdf' => 'pdf',
'image/gif' => 'gif',
'image/svg+xml' => 'svg',
);
@@ -484,7 +493,7 @@
$errors = array();
foreach ($types as $mimetype => $expected) {
$ext = rcube_mime::get_mime_extensions($mimetype);
- if ($ext[0] != $expected) {
+ if (!in_array($expected, (array) $ext)) {
$errors[] = array($mimetype, $ext, $expected);
}
}
@@ -558,6 +567,34 @@
}
/**
+ * Return a list with available subfolders of the plugins directory
+ * (with their associated description in composer.json)
+ */
+ function list_plugins()
+ {
+ $plugins = array();
+ $plugin_dir = INSTALL_PATH . 'plugins/';
+
+ foreach (glob($plugin_dir . '*') as $path)
+ {
+
+ if (is_dir($path) && file_exists($path.'/composer.json'))
+ {
+ $file_json = json_decode(file_get_contents($path.'/composer.json'));
+ $plugin_desc = $file_json->description;
+ }
+ else
+ {
+ $plugin_desc = 'N/A';
+ }
+
+ $plugins[] = array('name' => substr($path, strlen($plugin_dir)), 'desc' => $plugin_desc);
+ }
+
+ return $plugins;
+ }
+
+ /**
* Display OK status
*
* @param string Test name
--
Gitblit v1.9.1