diff options
author | Thomas B. <thomas@roundcube.net> | 2014-12-21 20:25:23 +0100 |
---|---|---|
committer | Thomas B. <thomas@roundcube.net> | 2014-12-21 20:25:23 +0100 |
commit | 8e7ed506c41ea8b8f725f7e122ca6f0b091de5e4 (patch) | |
tree | 3a005041bf1a50adf5aa051976a1477f6833adcb | |
parent | 06410e41e0e0ac4503cd88df48480afe5033dba7 (diff) | |
parent | 8f576d87d23be5f170054a8454b7917ae64f5696 (diff) |
Merge pull request #248 from flanpy/master
#1489096 : Ability to select plugins to enable in the installer
-rw-r--r-- | installer/config.php | 21 | ||||
-rw-r--r-- | program/include/rcmail_install.php | 36 |
2 files changed, 57 insertions, 0 deletions
diff --git a/installer/config.php b/installer/config.php index 0e4ac5af2..82d7f55d6 100644 --- a/installer/config.php +++ b/installer/config.php @@ -671,6 +671,27 @@ echo $select_param_folding->show(strval($RCI->getprop('mime_param_folding'))); <p class="hint"><span class="userconf">*</span> 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">Please consider checking dependencies of enabled plugins</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 96e0afbd4..26c613a11 100644 --- a/program/include/rcmail_install.php +++ b/program/include/rcmail_install.php @@ -234,6 +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]); + } + } // skip this property if (($value == $this->defaults[$prop]) && !in_array($prop, $this->local_config) @@ -559,6 +567,34 @@ class rcmail_install } /** + * 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 |