Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-admin / templates.php

diff --git a/wp-admin/templates.php b/wp-admin/templates.php
index 5f678046aba5b412643638a9a4559018aadcbdbd..a061072eea0afe8db81fd2ffa7996a19e437f8dd 100644 (file)
--- a/wp-admin/templates.php
+++ b/wp-admin/templates.php
@@ -3,21 +3,7 @@ require_once('admin.php');
 $title = __('Template & File Editing');
 $parent_file =         'edit.php';
 
 $title = __('Template & File Editing');
 $parent_file =         'edit.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'));

 
 $recents = get_option('recently_edited');
 
 
 $recents = get_option('recently_edited');
 


@@ -39,7 +25,7 @@ case 'update':
        check_admin_referer('edit-file_' . $file);
 
        if ( ! current_user_can('edit_files') )
        check_admin_referer('edit-file_' . $file);
 
        if ( ! current_user_can('edit_files') )

-       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)) {
 
        $newcontent = stripslashes($_POST['newcontent']);
        if (is_writeable($real_file)) {


@@ -62,18 +48,19 @@ break;
 default:
 
        require_once('./admin-header.php');
 default:
 
        require_once('./admin-header.php');

-       
+

        if ( ! current_user_can('edit_files') )
        if ( ! current_user_can('edit_files') )

-       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>');

 
 

-       if ( strstr( $file, 'wp-config.php' ) )
-       die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
+       if (strpos($file, 'wp-config.php') !== false)
+       wp_die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');

 
        update_recently_edited($file);
 
 
        update_recently_edited($file);
 

-       if ( !is_file($real_file) ) {
+       if (!is_file($real_file))

                $error = true;
                $error = true;

-       } else {
+
+       if (!$error) {

                $f = @ fopen($real_file, 'r');
                if ( $f ) {
                        if ( filesize($real_file ) > 0 ) {
                $f = @ fopen($real_file, 'r');
                if ( $f ) {
                        if ( filesize($real_file ) > 0 ) {


@@ -93,9 +80,9 @@ default:
  <div id="message" class="error"><p><?php _e('Could not save file.') ?></p></div>
        <?php else: ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
  <div id="message" class="error"><p><?php _e('Could not save file.') ?></p></div>
        <?php else: ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>

-       <?php endif; ?> 
+       <?php endif; ?>

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

- <div class="wrap"> 
+ <div class="wrap">

 <?php
 if (is_writeable($real_file)) {
        echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), wp_specialchars($file) ) . '</h2>';
 <?php
 if (is_writeable($real_file)) {
        echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), wp_specialchars($file) ) . '</h2>';


@@ -104,8 +91,8 @@ if (is_writeable($real_file)) {
 }
 ?>
 <div id="templateside">
 }
 ?>
 <div id="templateside">

-<?php 
-if ( $recents ) : 
+<?php
+if ( $recents ) :

 ?>
 <h3><?php _e('Recent'); ?></h3>
 <?php
 ?>
 <h3><?php _e('Recent'); ?></h3>
 <?php


@@ -123,30 +110,30 @@ endif;
         if (file_exists(ABSPATH . $old_file))
                 $common_files[] = $old_file;
  } ?>
         if (file_exists(ABSPATH . $old_file))
                 $common_files[] = $old_file;
  } ?>

-  <ul>
-        <?php foreach ($common_files as $common_file) : ?>
-         <li><a href="templates.php?file=<?php echo $common_file?>"><?php echo get_file_description($common_file); ?></a></li>
-        <?php endforeach; ?>
-  </ul>
+<ul>
+       <?php foreach ($common_files as $common_file) : ?>
+               <li><a href="templates.php?file=<?php echo $common_file?>"><?php echo get_file_description($common_file); ?></a></li>
+       <?php endforeach; ?>
+</ul>

 </div>
 <?php if (!$error) { ?>
 </div>
 <?php if (!$error) { ?>

-  <form name="template" id="template" action="templates.php" method="post"> 
-  <?php wp_nonce_field('edit-file_' . $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>
+       <form name="template" id="template" action="templates.php" method="post">
+       <?php wp_nonce_field('edit-file_' . $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) ) : ?>
 <?php if ( is_writeable($real_file) ) : ?>

-     <p class="submit">
+       <p class="submit">

 <?php
 <?php

-       echo "<input type='submit' name='submit' value='        " . __('Update File') . " &raquo;' tabindex='2' />";
+       echo "<input type='submit' name='submit' value='        " . __('Update File &raquo;') . "' tabindex='2' />";

 ?>
 </p>
 <?php else : ?>
 <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
 ?>
 </p>
 <?php else : ?>
 <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?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>';
        }


@@ -156,14 +143,14 @@ endif;
 <div class="wrap">
 <h2><?php _e('Other Files') ?></h2>
 
 <div class="wrap">
 <h2><?php _e('Other Files') ?></h2>
 

-  <p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://codex.wordpress.org/Changing_File_Permissions" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p> 
-  <form name="file" action="templates.php" method="get"> 
-    <input type="text" name="file" /> 
-    <input type="submit" name="submit"  value="<?php _e('Edit file &raquo;') ?>" /> 
-  </form> 
+       <p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://codex.wordpress.org/Changing_File_Permissions" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p>
+       <form name="file" action="templates.php" method="get">
+               <input type="text" name="file" />
+               <input type="submit" name="submit"  value="<?php _e('Edit file &raquo;') ?>" />
+       </form>

 
 

-  <p><?php _e('Note: of course, you can also edit the files/templates in your text editor of choice and upload them. This online editor is only meant to be used when you don&#8217;t have access to a text editor or FTP client.') ?></p>
-</div> 
+       <p><?php _e('Note: of course, you can also edit the files/templates in your text editor of choice and upload them. This online editor is only meant to be used when you don&#8217;t have access to a text editor or FTP client.') ?></p>
+</div>

 <?php
 
 break;
 <?php
 
 break;