Changeset 1894

Timestamp:

11/28/2004 12:33:04 AM (22 years ago)

Author:

rboren

Message:

Allow plugins to be loaded from subdirs of wp-content/plugins.

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (4 diffs)
• admin.php (modified) (1 diff)
• plugin-editor.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -733 +733 @@
 }
 
+function plugin_basename($file) {
+        return preg_replace('#^.*wp-content/plugins/#', '', $file);
+}
+
 function add_menu_page($page_title, $menu_title, $access_level, $file) {
         global $menu;
 
-        $file = basename($file);
+        $file = plugin_basename($file);
 
         $menu[] = array($menu_title, $access_level, $file, $page_title);
@@ -744 +748 @@
         global $submenu;
 
-        $file = basename($file);
+        $file = plugin_basename($file);
 
         $submenu[$parent][] = array($menu_title, $access_level, $file, $page_title);
@@ -885 +889 @@
         if ($plugins_dir) {
                 while(($file = $plugins_dir->read()) !== false) {
-                        if ( !preg_match('|^\.+$|', $file) && preg_match('|\.php$|', $file) ) 
-                                $plugin_files[] = $file;
+                        if ( preg_match('|^\.+$|', $file) )
+                                continue;
+                        if (is_dir($plugin_root . '/' . $file)) {
+                                $plugins_subdir = @ dir($plugin_root . '/' . $file);
+                                if ($plugins_subdir) {
+                                        while(($subfile = $plugins_subdir->read()) !== false) {
+                                                if ( preg_match('|^\.+$|', $subfile) )
+                                                        continue;
+                                                if ( preg_match('|\.php$|', $subfile) )
+                                                        $plugin_files[] = "$file/$subfile";
+                                        }
+                                }
+                        } else {
+                                if ( preg_match('|\.php$|', $file) ) 
+                                        $plugin_files[] = $file;
+                        }
                 }
         }
@@ -903 +921 @@
                 }
 
-                $wp_plugins[basename($plugin_file)] = $plugin_data;
+                $wp_plugins[plugin_basename($plugin_file)] = $plugin_data;
         }
 

trunk/wp-admin/admin.php

@@ -55 +55 @@
 // Handle plugin admin pages.
 if (isset($_GET['page'])) {
-        $plugin_page = basename($_GET['page']);
+        $plugin_page = plugin_basename($_GET['page']);
         if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page")) {
                 die(sprintf(__('Cannot load %s.'), $plugin_page));

trunk/wp-admin/plugin-editor.php

@@ -21 +21 @@
 }
 
-$plugins_dir = @ dir(ABSPATH . 'wp-content/plugins');
-if ($plugins_dir) {
-        while(($plug_file = $plugins_dir->read()) !== false) {
-                if ( !preg_match('|^\.+$|', $plug_file) && preg_match('|\.php$|', $plug_file) ) 
-                        $plugin_files[] = "wp-content/plugins/$plug_file";
-        }
-}
-
-if (count($plugin_files)) {
-        natcasesort($plugin_files);
-}
-
-if (file_exists(ABSPATH . 'my-hacks.php')) {
-        $plugin_files[] = 'my-hacks.php';
-}
-
+$plugins = get_plugins();
+$plugin_files = array_keys($plugins);
 
 if (empty($file)) {
@@ -43 +29 @@
 
 $file = validate_file_to_edit($file, $plugin_files);
-$real_file = get_real_file_to_edit($file);
+$real_file = get_real_file_to_edit("wp-content/plugins/$file");
 
 switch($action) {
@@ -105 +91 @@
   <ul>
 <?php foreach($plugin_files as $plugin_file) : ?>
-                 <li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo get_file_description(basename($plugin_file)); ?></a></li>
+                 <li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
 <?php endforeach; ?>
   </ul>