From b8837e3f43aac8ed64d52d9046a6822521fb1fe1 Mon Sep 17 00:00:00 2001
From: Flanpy <none@none.com>
Date: Wed, 12 Nov 2014 11:16:24 +0100
Subject: Add the ability to enable plugins in the installer

---
 installer/config.php               | 20 ++++++++++++++++++++
 program/include/rcmail_install.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/installer/config.php b/installer/config.php
index 0e4ac5af2..590bbe0e7 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -671,6 +671,26 @@ echo $select_param_folding->show(strval($RCI->getprop('mime_param_folding')));
 <p class="hint"><span class="userconf">*</span>&nbsp; These settings are defaults for the user preferences</p>
 </fieldset>
 
+
+<fieldset>
+<legend>Plugins</legend>
+<dl class="configblock" id="cgfblockdisplay">
+
+<?php
+$plugins = $RCI->list_plugins();
+foreach($plugins as $p) {
+	$p_check = new html_checkbox(array('name' => '_plugins_'.$p['name'], 'id' => 'cfgplugin_'.$p['name']));
+	echo '<dt class="propname">'.$p['name'].'</dt><dd>';
+	echo $p_check->show(0, array('value' => $p['name']));
+	echo '<label for="cfgplugin_'.$p['name'].'">'.$p['desc'].'</label><br/></dd>';
+}
+
+?>
+</dl>
+
+<p class="hint">Before enabling any plugin, check their dependencies</p>
+</fieldset>
+
 <?php
 
 echo '<p><input type="submit" name="submit" value="' . ($RCI->configured ? 'UPDATE' : 'CREATE') . ' CONFIG" ' . ($RCI->failures ? 'disabled' : '') . ' /></p>';
diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index 7877b8e33..d5df897eb 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -234,6 +234,13 @@ class rcmail_install
       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)
@@ -773,5 +780,26 @@ class rcmail_install
     return $out;
   }
 
+	/**
+	 * Return a list with available plugins & their description in plugins directory 
+	 */
+	function list_plugins() 
+	{
+		$plugins = array();
+		$plugin_dir = INSTALL_PATH . 'plugins/';
+		foreach (glob($plugin_dir . '*') as $path) {
+			if (is_dir($path) && is_readable($path)) {
+				if(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;
+	}
+
 }
 
-- 
cgit v1.2.3


From 8f576d87d23be5f170054a8454b7917ae64f5696 Mon Sep 17 00:00:00 2001
From: Flanpy <none@none.com>
Date: Wed, 12 Nov 2014 11:24:34 +0100
Subject: Add the ability to select plugins in the installer

---
 installer/config.php               |  5 +--
 program/include/rcmail_install.php | 64 +++++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/installer/config.php b/installer/config.php
index 590bbe0e7..82d7f55d6 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -678,7 +678,8 @@ echo $select_param_folding->show(strval($RCI->getprop('mime_param_folding')));
 
 <?php
 $plugins = $RCI->list_plugins();
-foreach($plugins as $p) {
+foreach($plugins as $p) 
+{
 	$p_check = new html_checkbox(array('name' => '_plugins_'.$p['name'], 'id' => 'cfgplugin_'.$p['name']));
 	echo '<dt class="propname">'.$p['name'].'</dt><dd>';
 	echo $p_check->show(0, array('value' => $p['name']));
@@ -688,7 +689,7 @@ foreach($plugins as $p) {
 ?>
 </dl>
 
-<p class="hint">Before enabling any plugin, check their dependencies</p>
+<p class="hint">Please consider checking dependencies of enabled plugins</p>
 </fieldset>
 
 <?php
diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index d5df897eb..a13cbd20b 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -234,13 +234,14 @@ class rcmail_install
       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]);
-				}
-			}
+      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)
@@ -565,6 +566,34 @@ class rcmail_install
     return $skins;
   }
 
+  /**
+  * 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
    *
@@ -780,26 +809,5 @@ class rcmail_install
     return $out;
   }
 
-	/**
-	 * Return a list with available plugins & their description in plugins directory 
-	 */
-	function list_plugins() 
-	{
-		$plugins = array();
-		$plugin_dir = INSTALL_PATH . 'plugins/';
-		foreach (glob($plugin_dir . '*') as $path) {
-			if (is_dir($path) && is_readable($path)) {
-				if(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;
-	}
-
 }
 
-- 
cgit v1.2.3