Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-admin / plugin-editor.php

diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 0f9da3b91f2e61c93c9ab98712ef0f0c0615826f..b25b3d45b72cda30873df91e69b5c7eec573e5e2 100644 (file)
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -4,21 +4,7 @@ require_once('admin.php');
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
 
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
 

-$wpvarstoreset = array('action','redirect','profile','error','warning','a','file');
-for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-       $wpvar = $wpvarstoreset[$i];
-       if (!isset($$wpvar)) {
-               if (empty($_POST["$wpvar"])) {
-                       if (empty($_GET["$wpvar"])) {
-                               $$wpvar = '';
-                       } else {
-                               $$wpvar = $_GET["$wpvar"];
-                       }
-               } else {
-                       $$wpvar = $_POST["$wpvar"];
-               }
-       }
-}
+wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file'));

 
 $plugins = get_plugins();
 $plugin_files = array_keys($plugins);
 
 $plugins = get_plugins();
 $plugin_files = array_keys($plugins);


@@ -28,7 +14,7 @@ if (empty($file)) {
 }
 
 $file = validate_file_to_edit($file, $plugin_files);
 }
 
 $file = validate_file_to_edit($file, $plugin_files);

-$real_file = get_real_file_to_edit("wp-content/plugins/$file");
+$real_file = get_real_file_to_edit( PLUGINDIR . "/$file");

 
 switch($action) {
 
 
 switch($action) {
 


@@ -37,13 +23,24 @@ case 'update':
        check_admin_referer('edit-plugin_' . $file);
 
        if ( !current_user_can('edit_plugins') )
        check_admin_referer('edit-plugin_' . $file);
 
        if ( !current_user_can('edit_plugins') )

-       die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
+               wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');

 
        $newcontent = stripslashes($_POST['newcontent']);
        if (is_writeable($real_file)) {
                $f = fopen($real_file, 'w+');
                fwrite($f, $newcontent);
                fclose($f);
 
        $newcontent = stripslashes($_POST['newcontent']);
        if (is_writeable($real_file)) {
                $f = fopen($real_file, 'w+');
                fwrite($f, $newcontent);
                fclose($f);

+
+               // Deactivate so we can test it.
+               $current = get_option('active_plugins');
+               if ( in_array($file, $current) || isset($_POST['phperror']) ) {
+                       if ( in_array($file, $current) ) {
+                               array_splice($current, array_search( $file, $current), 1 ); // 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"));
+                       exit();
+               }

                wp_redirect("plugin-editor.php?file=$file&a=te");
        } else {
                wp_redirect("plugin-editor.php?file=$file");
                wp_redirect("plugin-editor.php?file=$file&a=te");
        } else {
                wp_redirect("plugin-editor.php?file=$file");


@@ -54,16 +51,35 @@ case 'update':
 break;
 
 default:
 break;
 
 default:

-       
-       require_once('admin-header.php');
+

        if ( !current_user_can('edit_plugins') )
        if ( !current_user_can('edit_plugins') )

-       die('<p>'.__('You have 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'] ) {
+               check_admin_referer('edit-plugin-test_' . $file);
+               $current = get_option('active_plugins');
+               $plugin = $file;
+               if ( validate_file($plugin) )
+                       wp_die(__('Invalid plugin.'));
+               if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) )
+                       wp_die(__('Plugin file does not exist.'));
+               if (!in_array($plugin, $current)) {
+                       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");
+       }
+
+       require_once('admin-header.php');
+
+       update_recently_edited(PLUGINDIR . "/$file");

 
 

-       update_recently_edited("wp-content/plugins/$file");
-       

        if (!is_file($real_file))
                $error = 1;
        if (!is_file($real_file))
                $error = 1;

-       
+

        if (!$error) {
                $f = fopen($real_file, 'r');
                $content = fread($f, filesize($real_file));
        if (!$error) {
                $f = fopen($real_file, 'r');
                $content = fread($f, filesize($real_file));


@@ -73,13 +89,23 @@ default:
        ?>
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
        ?>
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>

+<?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>

 <?php endif; ?>
 <?php endif; ?>

- <div class="wrap"> 
-  <?php
-       if (is_writeable($real_file)) {
-               echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), $file) . '</h2>';
+ <div class="wrap">
+       <?php
+       if ( in_array($file, (array) get_option('active_plugins')) ) {
+               if (is_writeable($real_file)) {
+                       echo '<h2>' . sprintf(__('Editing <strong>%s</strong> (active)'), $file) . '</h2>';
+               } else {
+               echo '<h2>' . sprintf(__('Browsing <strong>%s</strong> (active)'), $file) . '</h2>';
+               }

        } else {
        } else {

-               echo '<h2>' . sprintf(__('Browsing <strong>%s</strong>'), $file) . '</h2>';
+               if (is_writeable($real_file)) {
+                       echo '<h2>' . sprintf(__('Editing <strong>%s</strong> (inactive)'), $file) . '</h2>';
+               } else {
+               echo '<h2>' . sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file) . '</h2>';
+               }

        }
        ?>
        <div id="templateside">
        }
        ?>
        <div id="templateside">


@@ -88,39 +114,45 @@ default:
 <?php
 if ($plugin_files) :
 ?>
 <?php
 if ($plugin_files) :
 ?>

-  <ul>
-<?php foreach($plugin_files as $plugin_file) : ?>
+       <ul>
+       <?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; ?>
-  </ul>
+       <?php endforeach; ?>
+       </ul>

 <?php endif; ?>
 </div>
 <?php endif; ?>
 </div>

-       <?php   if (!$error) { ?> 
-  <form name="template" id="template" action="plugin-editor.php" method="post">
-  <?php wp_nonce_field('edit-plugin_' . $file) ?>
-                <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
+<?php  if (!$error) { ?>
+       <form name="template" id="template" action="plugin-editor.php" method="post">
+       <?php wp_nonce_field('edit-plugin_' . $file) ?>
+               <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
+               <input type="hidden" name="action" value="update" />
+               <input type="hidden" name="file" value="<?php echo $file ?>" />

                </div>
 <?php if ( is_writeable($real_file) ) : ?>
                </div>
 <?php if ( is_writeable($real_file) ) : ?>

-     <p class="submit">
-<?php
-       echo "<input type='submit' name='submit' value='        " . __('Update File') . " &raquo;' tabindex='2' />";
-?>
-</p>
+       <?php if ( in_array($file, (array) get_option('active_plugins')) ) { ?>
+               <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended.  If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
+       <?php } ?>
+       <p class="submit">
+       <?php
+               if ( isset($_GET['phperror']) )
+                       echo "<input type='hidden' name='phperror' value='1' /><input type='submit' name='submit' value='" . __('Update File and Attempt to Reactivate &raquo;') . "' tabindex='2' />";
+               else
+                       echo "<input type='submit' name='submit' value='" . __('Update File &raquo;') . "' tabindex='2' />";
+       ?>
+       </p>

 <?php else : ?>
 <?php else : ?>

-<p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
+       <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>

 <?php endif; ?>
 <?php endif; ?>

-   </form> 
-  <?php
+ </form>
+<?php

        } else {
                echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
        }
        } else {
                echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
        }

-       ?>
+?>

 <div class="clear"> &nbsp; </div>
 <div class="clear"> &nbsp; </div>

-</div> 
+</div>

 <?php
 break;
 }
 
 <?php
 break;
 }
 

-include("admin-footer.php") ?> 
+include("admin-footer.php") ?>