Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix plugin error scraping in the plugin editor. Props DD32. fixes #6332

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@7525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-03-26 16:14:29 +00:00
parent 5d7980a249
commit 6a700defeb
1 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
wp-admin/plugin-editor.php
View File

@ -14,9 +14,8 @@ function theme_editor_css(){
$plugins = get_plugins(); $plugins = get_plugins();
$plugin_files = array_keys($plugins); $plugin_files = array_keys($plugins);
if (empty($file)) { if (empty($file))
$file = $plugin_files[0]; $file = $plugin_files[0];
}
$file = validate_file_to_edit($file, $plugin_files); $file = validate_file_to_edit($file, $plugin_files);
$real_file = get_real_file_to_edit( PLUGINDIR . "/$file"); $real_file = get_real_file_to_edit( PLUGINDIR . "/$file");
@ -37,22 +36,17 @@ case 'update':
fclose($f); fclose($f);
// Deactivate so we can test it. // Deactivate so we can test it.
$current = get_option('active_plugins'); if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
if ( in_array($file, $current) || isset($_POST['phperror']) ) { if ( is_plugin_active($file) )
if ( in_array($file, $current) ) { deactivate_plugins($file, true);
if ( ( $key = array_search( $plugin, $current) ) !== false )
array_splice($current, $key, 1 ); // Fixed Array-fu!
update_option('active_plugins', $current);
}
wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1")); wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1"));
exit(); exit;
} }
wp_redirect("plugin-editor.php?file=$file&a=te"); wp_redirect("plugin-editor.php?file=$file&a=te");
} else { } else {
wp_redirect("plugin-editor.php?file=$file"); wp_redirect("plugin-editor.php?file=$file");
} }
exit;
exit();
break; break;
@ -61,22 +55,18 @@ default:
if ( !current_user_can('edit_plugins') ) if ( !current_user_can('edit_plugins') )
wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>'); wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
if ( $_GET['liveupdate'] ) { if ( isset($_GET['liveupdate']) ) {
check_admin_referer('edit-plugin-test_' . $file); check_admin_referer('edit-plugin-test_' . $file);
$current = get_option('active_plugins');
$plugin = $file; $error = validate_plugin($file);
if ( validate_file($plugin) ) if( is_wp_error($error) )
wp_die(__('Invalid plugin.')); wp_die( $error );
if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) )
wp_die(__('Plugin file does not exist.')); if ( ! is_plugin_active($file) )
if (!in_array($plugin, $current)) { activate_plugin($file, "plugin-editor.php?file=$file&phperror=1");// we'll override this later if the plugin can be included without fatal error
wp_redirect("plugin-editor.php?file=$file&phperror=1"); // we'll override this later if the plugin can be included without fatal error
@include(ABSPATH . PLUGINDIR . '/' . $plugin);
$current[] = $plugin;
sort($current);
update_option('active_plugins', $current);
}
wp_redirect("plugin-editor.php?file=$file&a=te"); wp_redirect("plugin-editor.php?file=$file&a=te");
exit;
} }
require_once('admin-header.php'); require_once('admin-header.php');
@ -86,17 +76,19 @@ default:
if ( ! is_file($real_file) ) if ( ! is_file($real_file) )
$error = 1; $error = 1;
if (!$error) { if ( ! $error )
$f = fopen($real_file, 'r'); $content = htmlspecialchars(file_get_contents($real_file));
$content = fread($f, filesize($real_file));
$content = htmlspecialchars($content);
}
?> ?>
<?php if (isset($_GET['a'])) : ?> <?php if (isset($_GET['a'])) : ?>
<div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div> <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
<?php elseif (isset($_GET['phperror'])) : ?> <?php elseif (isset($_GET['phperror'])) : ?>
<div id="message" class="updated fade"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p></div> <div id="message" class="updated fade"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
<?php
if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
<iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo attribute_escape($file); ?>&amp;_wpnonce=<?php echo attribute_escape($_GET['_error_nonce']); ?>"></iframe>
<?php } ?>
</div>
<?php endif; ?> <?php endif; ?>
<div class="wrap"> <div class="wrap">
<div class="bordertitle"> <div class="bordertitle">
@ -105,31 +97,29 @@ default:
<div class="tablenav"> <div class="tablenav">
<div class="alignleft"> <div class="alignleft">
<big><strong><?php <big><strong><?php
if ( in_array($file, (array) get_option('active_plugins')) ) { if ( is_plugin_active($file) ) {
if (is_writeable($real_file)) { if ( is_writeable($real_file) )
echo sprintf(__('Editing <strong>%s</strong> (active)'), $file); echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
} else { else
echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file); echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
}
} else { } else {
if (is_writeable($real_file)) { if ( is_writeable($real_file) )
echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file); echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
} else { else
echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file); echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
} }
}
?></strong></big> ?></strong></big>
</div> </div>
<br class="clear" /> <br class="clear" />
</div> </div>
<br class="clear" /> <br class="clear" />
<div id="templateside"> <div id="templateside">
<h3 id="bordertitle"><?php _e("Plugin Files"); ?></h3> <h3 id="bordertitle"><?php _e('Plugin Files'); ?></h3>
<h4><?php _e('Plugins'); ?></h4> <h4><?php _e('Plugins'); ?></h4>
<ul> <ul>
<?php foreach($plugin_files as $plugin_file) : ?> <?php foreach($plugin_files as $plugin_file) : ?>
<li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li> <li><a href="plugin-editor.php?file=<?php echo $plugin_file; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
</div> </div>