php-blog-cvs

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25565

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_api.php 
Log Message:
- A bit of code cleanup, nothing new


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -d -r1.23.2.2 -r1.23.2.3
--- serendipity_plugin_api.php	21 Sep 2004 18:28:29 -0000	1.23.2.2
+++ serendipity_plugin_api.php	21 Sep 2004 18:46:42 -0000	1.23.2.3
@@ -356,52 +356,54 @@
         return (strstr($name, '_event_'));
     }
 
-    function &get_event_plugins($instance = false) {
-        global $serendipity;
+    function &get_event_plugins($getInstance = false) {
+        static $event_plugins;
 
-        if (!isset($serendipity['event_plugins']) || !is_array($serendipity['event_plugins'])) {
-            $plugins = serendipity_plugin_api::enum_plugins('event');
-            $serendipity['event_plugins'] = array();
+        if ( isset($event_plugins) && is_array($event_plugins) ) {
+            return $event_plugins;
+        }
 
-            if (!is_array($plugins)) {
-                return false;
-            }
+        $plugins = serendipity_plugin_api::enum_plugins('event');
 
-            foreach ($plugins as $plugin_data) {
-                if ($serendipity['event_plugins'][$plugin_data['name']]['p'] =& serendipity_plugin_api::load_plugin($plugin_data['name'])) {
-                    /* query for its name, description and configuration data */
-                    $serendipity['event_plugins'][$plugin_data['name']]['b'] = new serendipity_property_bag;
-                    $serendipity['event_plugins'][$plugin_data['name']]['p']->introspect($serendipity['event_plugins'][$plugin_data['name']]['b']);
-                    $serendipity['event_plugins'][$plugin_data['name']]['t'] = serendipity_plugin_api::get_plugin_title($serendipity['event_plugins'][$plugin_data['name']]['p']);
-                }
+        if (!is_array($plugins)) {
+            return false;
+        }
+
+        $event_plugins = array();
+        foreach ($plugins as $plugin_data) {
+            if ($event_plugins[$plugin_data['name']]['p'] = &serendipity_plugin_api::load_plugin($plugin_data['name'])) {
+                /* query for its name, description and configuration data */
+                $event_plugins[$plugin_data['name']]['b'] = new serendipity_property_bag;
+                $event_plugins[$plugin_data['name']]['p']->introspect($event_plugins[$plugin_data['name']]['b']);
+                $event_plugins[$plugin_data['name']]['t'] = serendipity_plugin_api::get_plugin_title($event_plugins[$plugin_data['name']]['p']);
             }
         }
 
-        if ($instance) {
-            if (isset($serendipity['event_plugins'][$instance]['p'])) {
-                return $serendipity['event_plugins'][$instance]['p'];
-            } else {
-                return false;
+        if ($getInstance) {
+            if (isset($event_plugins[$getInstance]['p'])) {
+                return $event_plugins[$getInstance]['p'];
             }
-        } else {
-            return $serendipity['event_plugins'];
+            return false;
         }
+
+        return $event_plugins;
     }
 
     function hook_event($event_name, &$eventData, $addData = null) {
         global $serendipity;
 
-        // Can be bypassed globally
-        // $serendipity['no_events'] = TRUE;
-        if (!isset($serendipity['no_events']) || !$serendipity['no_events']) {
-            $plugins = &serendipity_plugin_api::get_event_plugins();
+        // Can be bypassed globally by setting $serendipity['no_events'] = TRUE;
+        if (isset($serendipity['no_events']) && $serendipity['no_events'] == true) {
+            return false;
+        }
+
+        $plugins = &serendipity_plugin_api::get_event_plugins();
  
-            if (is_array($plugins)) {
-                foreach($plugins AS $plugin => $plugin_data) {
-                    $bag = &$plugin_data['b'];
-                    if ( array_key_exists($event_name, $bag->get('event_hooks')) ) {
-                        $plugin_data['p']->event_hook($event_name, $plugin_data['b'], $eventData, $addData);
-                    }
+        if (is_array($plugins)) {
+            foreach($plugins AS $plugin => $plugin_data) {
+                $bag = &$plugin_data['b'];
+                if ( array_key_exists($event_name, $bag->get('event_hooks')) ) {
+                    $plugin_data['p']->event_hook($event_name, $plugin_data['b'], $eventData, $addData);
                 }
             }
         }