X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fplugin.php;h=a6371dfa62e1c744e720e055451b2051090fe31e;hp=35dc67763d6fadb4d69229fd9904738aa7ba3168;hb=dae1f3e5f7dc0454a26535f7c3181c882ac146a3;hpb=245a6892bf5c780904ef9677f24d624ea17e0749

diff --git a/functions/plugin.php b/functions/plugin.php
index 35dc6776..a6371dfa 100644
--- a/functions/plugin.php
+++ b/functions/plugin.php
@@ -16,16 +16,35 @@
  **/
 
 
-   $plugin_php = true;
+   if (defined('plugin_php'))
+      return;
+   define('plugin_php', true);
+
+   global $plugin_general_debug, $squirrelmail_plugin_hooks;
+   $plugin_general_debug = false;
+   
+   $squirrelmail_plugin_hooks = array();
 
    // This function adds a plugin
    function use_plugin ($name) {
+      global $plugin_general_debug;
+      
       if (file_exists('../plugins/'.$name.'/setup.php')) {
+         if ($plugin_general_debug)
+	    echo "plugin:  --  Loading $name/setup.php<br>\n";
          include ('../plugins/'.$name.'/setup.php');
          $function = 'squirrelmail_plugin_init_'.$name;
          if (function_exists($function))
-            $function();
+	 {
+	    if ($plugin_general_debug)
+	       echo "plugin:  ---- Executing $function to init plugin<br>\n";
+            $function($plugin_general_debug);
+	 }
+	 elseif ($plugin_general_debug)
+	    echo "plugin:  -- Init function $function doesn't exist.<br>\n";
       }
+      elseif ($plugin_general_debug)
+         echo "plugin:  Couldn't find $name/setup.php<br>\n";
    }
 
    // This function executes a hook
@@ -37,7 +56,7 @@
          foreach ($squirrelmail_plugin_hooks[$name] as $id => $function) {
             // Add something to set correct gettext domain for plugin
             if (function_exists($function)) {
-                $function(&$Data);
+                $function($Data);
             }
          }
       }
@@ -50,6 +69,22 @@
    // On startup, register all plugins configured for use
    if (isset($plugins) && is_array($plugins))
       foreach ($plugins as $id => $name)
+      {
+         if ($plugin_general_debug)
+	    echo "plugin:  Attempting load of plugin $name<br>\n";
          use_plugin($name);
+      }
+
+   if ($plugin_general_debug)
+   {
+      echo "plugin:  Hook list<br>\n";
+      foreach ($squirrelmail_plugin_hooks as $Hook => $Plugins)
+      {
+          foreach ($Plugins as $Name => $Func)
+	  {
+	      echo "[$Hook][$Name] = $Func<br>\n";
+	  }
+      }
+   }
 
 ?>