Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 46 insertions, 45 deletions

diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 8fd3253e0..ce727e2e7 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -43,6 +43,7 @@ class rcube_plugin_api
     public $active_plugins        = array();
 
     protected $plugins           = array();
+    protected $plugins_initialized = array();
     protected $tasks             = array();
     protected $actions           = array();
     protected $actionmap         = array();
@@ -94,8 +95,9 @@ class rcube_plugin_api
 
         foreach ($this->plugins as $plugin) {
             // ... task, request type and framed mode
-            if (!$this->filter($plugin)) {
+            if (!$this->plugins_initialized[$plugin_name] && !$this->filter($plugin)) {
                 $plugin->init();
+                $this->plugins_initialized[$plugin->ID] = $plugin;
             }
         }
 
@@ -146,7 +148,7 @@ class rcube_plugin_api
     /**
      * Load the specified plugin
      *
-     * @param string Plugin name
+     * @param string  Plugin name
      * @param boolean Force loading of the plugin even if it doesn't match the filter
      * @param boolean Require loading of the plugin, error if it doesn't exist
      *
@@ -161,63 +163,62 @@ class rcube_plugin_api
             $plugins_dir = unslashify($dir->path);
         }
 
-        // plugin already loaded
-        if ($this->plugins[$plugin_name]) {
-            return true;
-        }
+        // plugin already loaded?
+        if (!$this->plugins[$plugin_name]) {
+            $fn = "$plugins_dir/$plugin_name/$plugin_name.php";
+
+            if (!is_readable($fn)) {
+                if ($require) {
+                    rcube::raise_error(array('code' => 520, 'type' => 'php',
+                        'file' => __FILE__, 'line' => __LINE__,
+                        'message' => "Failed to load plugin file $fn"), true, false);
+                }
 
-        $fn = "$plugins_dir/$plugin_name/$plugin_name.php";
+                return false;
+            }
 
-        if (is_readable($fn)) {
             if (!class_exists($plugin_name, false)) {
                 include $fn;
             }
 
             // instantiate class if exists
-            if (class_exists($plugin_name, false)) {
-                $plugin = new $plugin_name($this);
-                $this->active_plugins[] = $plugin_name;
-
-                // check inheritance...
-                if (is_subclass_of($plugin, 'rcube_plugin')) {
-                    // ... task, request type and framed mode
-
-                    // call onload method on plugin if it exists.
-                    // this is useful if you want to be called early in the boot process
-                    if (method_exists($plugin, 'onload')) {
-                        $plugin->onload();
-                    }
+            if (!class_exists($plugin_name, false)) {
+                rcube::raise_error(array('code' => 520, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "No plugin class $plugin_name found in $fn"),
+                    true, false);
 
-                    // init a plugin only if $force is set or if we're called after initialization
-                    if (($force || $this->initialized)
-                        && !$this->filter($plugin))
-                    {
-                        $plugin->init();
-                    }
+                return false;
+            }
 
-                    $this->plugins[$plugin_name] = $plugin;
+            $plugin = new $plugin_name($this);
+            $this->active_plugins[] = $plugin_name;
 
-                    if (!empty($plugin->allowed_prefs)) {
-                        $this->allowed_prefs = array_merge($this->allowed_prefs, $plugin->allowed_prefs);
-                    }
+            // check inheritance...
+            if (is_subclass_of($plugin, 'rcube_plugin')) {
+                // call onload method on plugin if it exists.
+                // this is useful if you want to be called early in the boot process
+                if (method_exists($plugin, 'onload')) {
+                    $plugin->onload();
+                }
 
-                    return true;
+                if (!empty($plugin->allowed_prefs)) {
+                    $this->allowed_prefs = array_merge($this->allowed_prefs, $plugin->allowed_prefs);
                 }
-            }
-            else {
-                rcube::raise_error(array('code' => 520, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "No plugin class $plugin_name found in $fn"),
-                    true, false);
+
+                $this->plugins[$plugin_name] = $plugin;
             }
         }
-        else if ($require) {
-            rcube::raise_error(array('code' => 520, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Failed to load plugin file $fn"), true, false);
+
+        if ($plugin = $this->plugins[$plugin_name]) {
+            // init a plugin only if $force is set or if we're called after initialization
+            if (($force || $this->initialized) && !$this->plugins_initialized[$plugin_name] && ($force || !$this->filter($plugin))) {
+                $plugin->init();
+                $this->plugins_initialized[$plugin_name] = $plugin;
+            }
         }
 
-        return false;
+        return true;
     }
 
     /**
@@ -228,9 +229,9 @@ class rcube_plugin_api
      */
     private function filter($plugin)
     {
-        return (($plugin->noajax  && !(is_object($this->output) && $this->output->type == 'html') )
+        return ($plugin->noajax  && !(is_object($this->output) && $this->output->type == 'html'))
              || ($plugin->task && !preg_match('/^('.$plugin->task.')$/i', $this->task))
-             || ($plugin->noframe && !empty($_REQUEST['_framed']))) ? true : false;
+             || ($plugin->noframe && !empty($_REQUEST['_framed']));
     }
 
     /**