Changeset 904

Timestamp:

09/22/07 22:15:42 (14 months ago)

Author:

epithet

Message:

Updated to use system/plugins for core plugins.

Location:

branches/systemplugins/system

Files:

• classes/plugins.php (modified) (1 diff)
• plugins (added)
• plugins/index.html (moved) (moved from branches/systemplugins/user/plugins/index.html)
• plugins/pingback (moved) (moved from branches/systemplugins/user/plugins/pingback)
• plugins/spamchecker (moved) (moved from branches/systemplugins/user/plugins/spamchecker)
• plugins/undelete (moved) (moved from branches/systemplugins/user/plugins/undelete)
• plugins/wpimport (moved) (moved from branches/systemplugins/user/plugins/wpimport)

branches/systemplugins/system/classes/plugins.php

@@ -169 +169 @@
     {
         $plugins= array();
-        $files= array();
-        $plugindir= HABARI_PATH . '/user/plugins/';
-        $dirs= glob( $plugindir . '*', GLOB_ONLYDIR | GLOB_MARK );
-        if ( Site::CONFIG_LOCAL != Site::$config_type )
-        {
+        $plugindirs= array( HABARI_PATH . '/system/plugins/', HABARI_PATH . '/user/plugins/' );
+        if ( Site::CONFIG_LOCAL != Site::$config_type ) {
             // include site-specific plugins
-            $site_dirs= glob( Site::get_dir('config') . '/plugins/*', GLOB_ONLYDIR | GLOB_MARK );
-            if ( is_array( $site_dirs ) && ! empty( $site_dirs ) ) {
-                $dirs= array_merge( $dirs, $site_dirs );
-            }
+            $plugindirs[]= Site::get_dir('config') . '/plugins/'; 
+        }
+        $dirs = array();
+        foreach($plugindirs as $plugindir) {
+            $dirs+= glob( $plugindir . '*', GLOB_ONLYDIR | GLOB_MARK );
         }
         foreach( $dirs as $dir ) {
             $dirfiles = glob( $dir . '*.plugin.php' );
-            $files = array_merge($dirfiles, $files);
-        }
-        // return $files;
-        // massage the return value so that this works on Windows
-        $plugins= array_map( create_function( '$s', 'return str_replace(\'\\\\\', \'/\', $s);' ), $files );
+            if(count($dirfiles) > 0) {
+                $dirfiles = array_combine(
+                    // Use the basename of the file as the index to use the named plugin from the last directory in $dirs
+                    array_map('basename', $dirfiles),
+                    // massage the filenames so that this works on Windows
+                    array_map( create_function( '$s', 'return str_replace(\'\\\\\', \'/\', $s);' ), $dirfiles )
+                );
+                $plugins = array_merge($plugins, $dirfiles);
+            }
+        }
         sort($plugins);
         return $plugins;