Sorry, last commit broke the code. I had to make a separate plugin function.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2327 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index f6fafd930aa5da34952e0a42b02de25072b498b5..d9be41fd39e78feae686509ff0296d42f0247f39 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -51,7 +51,7 @@ function isSpecialMailbox( $box ) {
              ($save_as_draft && $box == $draft_folder ) );
 
     if ( !$ret ) {
-        $ret = do_hook( 'special_mailbox', $box );
+        $ret = do_hook_function( 'special_mailbox', $box );
     }
 
     return( $ret );

diff --git a/functions/plugin.php b/functions/plugin.php
index 9ef6d7f5e5c5994b9a5c0166be3df4bfc43b2897..2d9083fbed8fdd89f7cb220df1e1cc033b391580 100644 (file)
--- a/functions/plugin.php
+++ b/functions/plugin.php
@@ -28,7 +28,7 @@ function use_plugin ($name) {
 }
 
 /* This function executes a hook. */
-function do_hook ($name,$parm=NULL) {
+function do_hook ($name) {
     global $squirrelmail_plugin_hooks;
     $data = func_get_args();
     $ret = '';
@@ -38,7 +38,27 @@ function do_hook ($name,$parm=NULL) {
         foreach ($squirrelmail_plugin_hooks[$name] as $function) {
             /* Add something to set correct gettext domain for plugin. */
             if (function_exists($function)) {
-                $ret = $function($data,$parm);
+                $function($data);
+            }
+        }
+    }
+
+    /* Variable-length argument lists have a slight problem when */
+    /* passing values by reference. Pity. This is a workaround.  */
+    return $data;
+}
+
+/* This function executes a hook. */
+function do_hook_function($name,$parm=NULL) {
+    global $squirrelmail_plugin_hooks;
+    $ret = '';
+
+    if (isset($squirrelmail_plugin_hooks[$name])
+          && is_array($squirrelmail_plugin_hooks[$name])) {
+        foreach ($squirrelmail_plugin_hooks[$name] as $function) {
+            /* Add something to set correct gettext domain for plugin. */
+            if (function_exists($function)) {
+                $ret = $function($parm);
             }
         }
     }
@@ -48,6 +68,7 @@ function do_hook ($name,$parm=NULL) {
     return $ret;
 }
 
+
 /*************************************/
 /*** MAIN PLUGIN LOADING CODE HERE ***/
 /*************************************/

diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php
index c8f5749ce7f2beab6646a79f75bdd3d106b5ce3d..efa1cab9d1563c30164d816404d026c4ec15ad1b 100644 (file)
--- a/plugins/filters/setup.php
+++ b/plugins/filters/setup.php
@@ -72,7 +72,7 @@
       $squirrelmail_plugin_hooks['special_mailbox']['filters'] = 'filters_special_mailbox';
    }
 
-   function filters_special_mailbox( $data, $mb ) {
+   function filters_special_mailbox( $mb ) {
 
        if ( $mb == getPref($data_dir, $username, 'filters_spam_folder', 'na' ) ) {
            return( TRUE );