From b737021a905a33c8eb4331692475cca7791e533c Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sat, 27 Dec 2014 08:53:21 -0500
Subject: [PATCH] Improve plugin selection in installer; check already selected plugins
---
program/include/rcmail_install.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index 26c613a..2ba9069 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -578,17 +578,18 @@
foreach (glob($plugin_dir . '*') as $path)
{
- if (is_dir($path) && file_exists($path.'/composer.json'))
+ if (is_dir($path) && is_readable($path.'/composer.json'))
{
$file_json = json_decode(file_get_contents($path.'/composer.json'));
- $plugin_desc = $file_json->description;
+ $plugin_desc = $file_json->description ?: 'N/A';
}
else
{
$plugin_desc = 'N/A';
}
- $plugins[] = array('name' => substr($path, strlen($plugin_dir)), 'desc' => $plugin_desc);
+ $name = substr($path, strlen($plugin_dir));
+ $plugins[] = array('name' => $name, 'desc' => $plugin_desc, 'enabled' => in_array($name, $this->config['plugins']));
}
return $plugins;
--
Gitblit v1.9.1