Use array storage for plugins list.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-08-09 07:17:54 +00:00
parent ee4edd73e5
commit a4aa259156
3 changed files with 22 additions and 25 deletions

View File

@ -1,26 +1,23 @@
<?php <?php
if (isset($_GET['action'])) { if ( isset($_GET['action']) ) {
$standalone = 1; $standalone = 1;
require_once('admin-header.php'); require_once('admin-header.php');
check_admin_referer(); check_admin_referer();
if ('activate' == $_GET['action']) { if ('activate' == $_GET['action']) {
$current = "\n" . get_settings('active_plugins') . "\n"; $current = get_settings('active_plugins');
$current = preg_replace("|(\n)+\s*|", "\n", $current); $current[] = trim( $_GET['plugin'] );
$current = trim($current) . "\n " . trim($_GET['plugin']); sort($current);
$current = trim($current);
$current = preg_replace("|\n\s*|", "\n", $current); // I don't know where this is coming from
update_option('active_plugins', $current); update_option('active_plugins', $current);
header('Location: plugins.php?activate=true'); header('Location: plugins.php?activate=true');
} }
if ('deactivate' == $_GET['action']) { if ('deactivate' == $_GET['action']) {
$current = "\n" . get_settings('active_plugins') . "\n"; $current = get_settings('active_plugins');
$current = str_replace("\n" . $_GET['plugin'], '', $current); array_splice($current, array_search( $_GET['plugin'], $current), 1 ); // Array-fu!
$current = preg_replace("|(\n)+\s*|", "\n", $current); update_option('active_plugins', $current);
update_option('active_plugins', trim($current));
header('Location: plugins.php?deactivate=true'); header('Location: plugins.php?deactivate=true');
} }
} }
@ -30,23 +27,19 @@ $title = __('Manage Plugins');
require_once('admin-header.php'); require_once('admin-header.php');
if ($user_level < 9) // Must be at least level 9 if ($user_level < 9) // Must be at least level 9
die (__("Sorry, you must be at least a level 8 user to modify plugins.")); die (__('Sorry, you must be at least a level 8 user to modify plugins.'));
// Clean up options // Clean up options
// if any files are in the option that don't exist, axe 'em // If any plugins don't exist, axe 'em
$check_plugins = explode("\n", (get_settings('active_plugins'))); $check_plugins = get_settings('active_plugins');
foreach ($check_plugins as $check_plugin) { foreach ($check_plugins as $check_plugin) {
if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) { if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) {
$current = get_settings('active_plugins') . "\n"; $current = get_settings('active_plugins');
$current = str_replace($check_plugin . "\n", '', $current); unset($current[$_GET['plugin']]);
$current = preg_replace("|\n+|", "\n", $current); update_option('active_plugins', $current);
update_option('active_plugins', trim($current));
} }
} }
?> ?>
<?php if (isset($_GET['activate'])) : ?> <?php if (isset($_GET['activate'])) : ?>
@ -60,7 +53,7 @@ foreach ($check_plugins as $check_plugin) {
<div class="wrap"> <div class="wrap">
<h2><?php _e('Plugin Management'); ?></h2> <h2><?php _e('Plugin Management'); ?></h2>
<p><?php _e('Plugins are files you usually download separately from WordPress that add functionality. To install a plugin you generally just need to put the plugin file into your <code>wp-content/plugins</code> directory. Once a plugin is installed, you may activate it or deactivate it here.'); ?></p> <p><?php _e('Plugins are files you usually download separately from WordPress that add functionality. To install a plugin you generally just need to put the plugin file into your <code>wp-content/plugins</code> directory. Once a plugin is installed, you may activate it or deactivate it here. If something goes wrong with a plugin and you can&#8217;t use WordPress, delete that plugin from the <code>wp-content/plugins</code> directory and it will be automatically deactivated.'); ?></p>
<?php <?php
// Files in wp-content/plugins directory // Files in wp-content/plugins directory
$plugins_dir = @ dir(ABSPATH . 'wp-content/plugins'); $plugins_dir = @ dir(ABSPATH . 'wp-content/plugins');
@ -71,9 +64,8 @@ if ($plugins_dir) {
} }
} }
if ('' != trim(get_settings('active_plugins'))) { if ( get_settings('active_plugins') )
$current_plugins = explode("\n", (get_settings('active_plugins'))); $current_plugins = get_settings('active_plugins');
}
if (!$plugins_dir || !$plugin_files) { if (!$plugins_dir || !$plugin_files) {
_e("<p>Couldn't open plugins directory or there are no plugins available.</p>"); // TODO: make more helpful _e("<p>Couldn't open plugins directory or there are no plugins available.</p>"); // TODO: make more helpful

View File

@ -923,6 +923,11 @@ function upgrade_130() {
if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged') { if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged') {
$wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'"); $wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'");
} }
if ( !is_array( get_settings('active_plugins') ) ) {
$plugins = explode("\n", get_settings('active_plugins') );
update_option('active_plugins', $plugins);
}
} }
?> ?>

View File

@ -81,7 +81,7 @@ if (get_settings('hack_file')) {
} }
if ( get_settings('active_plugins') ) { if ( get_settings('active_plugins') ) {
$current_plugins = explode("\n", get_settings('active_plugins') ); $current_plugins = get_settings('active_plugins');
foreach ($current_plugins as $plugin) { foreach ($current_plugins as $plugin) {
if (file_exists(ABSPATH . 'wp-content/plugins/' . $plugin)) if (file_exists(ABSPATH . 'wp-content/plugins/' . $plugin))
include(ABSPATH . 'wp-content/plugins/' . $plugin); include(ABSPATH . 'wp-content/plugins/' . $plugin);