Fix broken subject line that I doubt has worked since we went rg=0

[squirrelmail.git] / functions / plugin.php

diff --git a/functions/plugin.php b/functions/plugin.php
index 9b52a649aa274e735cf2a27dd2241126436273d6..e99b7fefbcc59544260b0fd45c6b59b472b2580a 100644 (file)
--- a/functions/plugin.php
+++ b/functions/plugin.php
@@ -3,7 +3,7 @@
 /**
  * plugin.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file provides the framework for a plugin architecture.
@@ -18,8 +18,8 @@ $squirrelmail_plugin_hooks = array();
 
 /* This function adds a plugin. */
 function use_plugin ($name) {
-    if (file_exists("../plugins/$name/setup.php")) {
-        include_once("../plugins/$name/setup.php");
+    if (file_exists(SM_PATH . "plugins/$name/setup.php")) {
+        include_once(SM_PATH . "plugins/$name/setup.php");
         $function = "squirrelmail_plugin_init_$name";
         if (function_exists($function)) {
             $function();
@@ -68,7 +68,25 @@ function do_hook_function($name,$parm=NULL) {
     return $ret;
 }
 
+/* This function executes a hook. */
+function concat_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) {
+            /* Concatenate results from hook. */
+            if (function_exists($function)) {
+                $ret .= $function($parm);
+            }
+        }
+    }
 
+    /* Variable-length argument lists have a slight problem when */
+    /* passing values by reference. Pity. This is a workaround.  */
+    return $ret;
+}
 
 /**
  * This function checks whether the user's USER_AGENT is known to
@@ -77,12 +95,10 @@ function do_hook_function($name,$parm=NULL) {
  */
 function soupNazi(){
 
-    global $HTTP_USER_AGENT;
-
     $soup_menu = array('Mozilla/3','Mozilla/2','Mozilla/1', 'Opera 4',
                        'Opera/4', 'OmniWeb', 'Lynx');
     foreach($soup_menu as $browser) {
-        if(stristr($HTTP_USER_AGENT, $browser)) {
+        if(stristr($_SERVER['HTTP_USER_AGENT'], $browser)) {
             return 1;
         }
     }