Wordpress 2.9

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

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index db79d786ea1fded62d83b5181d40a98453d97e3d..c85fa0abd21a8222150c47cc4aba5e932ffe2f49 100644 (file)
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -9,10 +9,13 @@
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
 
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
 

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

 $title = __("Edit Themes");
 $parent_file = 'themes.php';
 
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
 

-wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme'));
+wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme', 'dir'));

 
 wp_admin_css( 'theme-editor' );
 
 
 wp_admin_css( 'theme-editor' );
 


@@ -22,8 +25,7 @@ if (empty($theme)) {
        $theme = get_current_theme();
 } else {
        $theme = stripslashes($theme);
        $theme = get_current_theme();
 } else {
        $theme = stripslashes($theme);

- }
-
+}

 
 if ( ! isset($themes[$theme]) )
        wp_die(__('The requested theme does not exist.'));
 
 if ( ! isset($themes[$theme]) )
        wp_die(__('The requested theme does not exist.'));


@@ -32,11 +34,17 @@ $allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme
 
 if (empty($file)) {
        $file = $allowed_files[0];
 
 if (empty($file)) {
        $file = $allowed_files[0];

+} else {
+       $file = stripslashes($file);
+       if ( 'theme' == $dir ) {
+               $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ; 
+       } else if ( 'style' == $dir) {
+               $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ; 
+       }

 }
 
 }
 

-$file = validate_file_to_edit($file, $allowed_files);
-$real_file = get_real_file_to_edit($file);
-
+validate_file_to_edit($file, $allowed_files);
+$scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;

 $file_show = basename( $file );
 
 switch($action) {
 $file_show = basename( $file );
 
 switch($action) {


@@ -45,28 +53,25 @@ case 'update':
 
        check_admin_referer('edit-theme_' . $file . $theme);
 
 
        check_admin_referer('edit-theme_' . $file . $theme);
 

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

        $newcontent = stripslashes($_POST['newcontent']);
        $theme = urlencode($theme);
        $newcontent = stripslashes($_POST['newcontent']);
        $theme = urlencode($theme);

-       if (is_writeable($real_file)) {
+       if (is_writeable($file)) {

                //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
                //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable

-               $f = fopen($real_file, 'w+');
+               $f = fopen($file, 'w+');

                if ($f !== FALSE) {
                        fwrite($f, $newcontent);
                        fclose($f);
                if ($f !== FALSE) {
                        fwrite($f, $newcontent);
                        fclose($f);

-                       $location = "theme-editor.php?file=$file&theme=$theme&a=te";
+                       $location = "theme-editor.php?file=$file&theme=$theme&a=te&scrollto=$scrollto";

                } else {
                } else {

-                       $location = "theme-editor.php?file=$file&theme=$theme";
+                       $location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";

                }
        } else {
                }
        } else {

-               $location = "theme-editor.php?file=$file&theme=$theme";
+               $location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";

        }
 
        $location = wp_kses_no_null($location);
        }
 
        $location = wp_kses_no_null($location);

-       $strip = array('%0d', '%0a');
-       $location = str_replace($strip, '', $location);
+       $strip = array('%0d', '%0a', '%0D', '%0A');
+       $location = _deep_replace($strip, $location);

        header("Location: $location");
        exit();
 
        header("Location: $location");
        exit();
 


@@ -74,24 +79,18 @@ break;
 
 default:
 
 
 default:
 

-       if ( !current_user_can('edit_themes') )
-               wp_die('<p>'.__('You do not have sufficient permissions to edit themes for this blog.').'</p>');
-
-       if ( use_codepress() )
-               wp_enqueue_script( 'codepress' );
-

        require_once('admin-header.php');
 
        update_recently_edited($file);
 
        require_once('admin-header.php');
 
        update_recently_edited($file);
 

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

                $error = 1;
 
                $error = 1;
 

-       if ( !$error && filesize($real_file) > 0 ) {
-               $f = fopen($real_file, 'r');
-               $content = fread($f, filesize($real_file));
+       if ( !$error && filesize($file) > 0 ) {
+               $f = fopen($file, 'r');
+               $content = fread($f, filesize($file));

 
 

-               if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
+               if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {

                        $functions = wp_doc_link_parse( $content );
 
                        $docs_select = '<select name="docs-list" id="docs-list">';
                        $functions = wp_doc_link_parse( $content );
 
                        $docs_select = '<select name="docs-list" id="docs-list">';


@@ -103,7 +102,7 @@ default:
                }
 
                $content = htmlspecialchars( $content );
                }
 
                $content = htmlspecialchars( $content );

-               $codepress_lang = codepress_get_lang($real_file);
+               $codepress_lang = codepress_get_lang($file);

        }
 
        ?>
        }
 
        ?>


@@ -117,8 +116,13 @@ $desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>

-<div class="bordertitle">
-       <form id="themeselector" action="theme-editor.php" method="post">
+
+<div class="fileedit-sub">
+<div class="alignleft">
+<big><?php echo sprintf($desc_header, $file_show); ?></big>
+</div>
+<div class="alignright">
+       <form action="theme-editor.php" method="post">

                <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
                <select name="theme" id="theme">
 <?php
                <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
                <select name="theme" id="theme">
 <?php


@@ -134,15 +138,11 @@ $desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (
                <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
        </form>
 </div>
                <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
        </form>
 </div>

-<div class="tablenav">
-<div class="alignleft">
-<big><?php echo sprintf($desc_header, $file_show); ?></big>
-</div>

 <br class="clear" />
 </div>
 <br class="clear" />
        <div id="templateside">
 <br class="clear" />
 </div>
 <br class="clear" />
        <div id="templateside">

-       <h3 id="bordertitle"><?php _e("Theme Files"); ?></h3>
+       <h3><?php _e("Theme Files"); ?></h3>

 
 <?php
 if ($allowed_files) :
 
 <?php
 if ($allowed_files) :


@@ -162,46 +162,46 @@ if ($allowed_files) :
                // This means that we display the correct files for child themes which overload Templates as well as Styles
                if( array_key_exists($description, $template_mapping ) ) {
                        if ( false !== strpos( $template_file, $template_dir ) )  {
                // This means that we display the correct files for child themes which overload Templates as well as Styles
                if( array_key_exists($description, $template_mapping ) ) {
                        if ( false !== strpos( $template_file, $template_dir ) )  {

-                               $template_mapping[ $description ] = array( $template_file, $filedesc );
+                               $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );

                        }
                } else {
                        }
                } else {

-                       $template_mapping[ $description ] = array( $template_file, $filedesc );
+                       $template_mapping[ $description ] = array( _get_template_edit_filename($template_file, $template_dir), $filedesc );

                }
        }
        ksort( $template_mapping );
        while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :
        ?>
                }
        }
        ksort( $template_mapping );
        while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) :
        ?>

-               <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
+               <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=theme"><?php echo $filedesc ?></a></li>

 <?php endwhile; ?>
        </ul>
        <h4><?php /* translators: Theme stylesheets in theme editor */ echo _x('Styles', 'Theme stylesheets in theme editor'); ?></h4>
        <ul>
 <?php
        $template_mapping = array();
 <?php endwhile; ?>
        </ul>
        <h4><?php /* translators: Theme stylesheets in theme editor */ echo _x('Styles', 'Theme stylesheets in theme editor'); ?></h4>
        <ul>
 <?php
        $template_mapping = array();

+       $stylesheet_dir = $themes[$theme]['Stylesheet Dir'];

        foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
                $description = trim( get_file_description($style_file) );
                $style_show = basename($style_file);
                $filedesc = ( $description != $style_file ) ? "$description <span class='nonessential'>($style_show)</span>" : "$description";
                $filedesc = ( $style_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($style_show)</span></span>" : $filedesc;
        foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
                $description = trim( get_file_description($style_file) );
                $style_show = basename($style_file);
                $filedesc = ( $description != $style_file ) ? "$description <span class='nonessential'>($style_show)</span>" : "$description";
                $filedesc = ( $style_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($style_show)</span></span>" : $filedesc;

-               $template_mapping[ $description ] = array( $style_file, $filedesc );
+               $template_mapping[ $description ] = array( _get_template_edit_filename($style_file, $stylesheet_dir), $filedesc );

        }
        ksort( $template_mapping );
        while ( list( $template_sorted_key, list( $style_file, $filedesc ) ) = each( $template_mapping ) ) :
                ?>
        }
        ksort( $template_mapping );
        while ( list( $template_sorted_key, list( $style_file, $filedesc ) ) = each( $template_mapping ) ) :
                ?>

-               <li><a href="theme-editor.php?file=<?php echo "$style_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo $filedesc ?></a></li>
+               <li><a href="theme-editor.php?file=<?php echo "$style_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=style"><?php echo $filedesc ?></a></li>

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

-       <?php
-       if (!$error) {
-       ?>
+<?php if (!$error) { ?>

        <form name="template" id="template" action="theme-editor.php" method="post">
        <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
                 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1" class="codepress <?php echo $codepress_lang ?>"><?php echo $content ?></textarea>
                 <input type="hidden" name="action" value="update" />
                 <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
                 <input type="hidden" name="theme" value="<?php echo esc_attr($theme) ?>" />
        <form name="template" id="template" action="theme-editor.php" method="post">
        <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
                 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1" class="codepress <?php echo $codepress_lang ?>"><?php echo $content ?></textarea>
                 <input type="hidden" name="action" value="update" />
                 <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
                 <input type="hidden" name="theme" value="<?php echo esc_attr($theme) ?>" />

+                <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />

                 </div>
        <?php if ( isset($functions ) && count($functions) ) { ?>
                <div id="documentation">
                 </div>
        <?php if ( isset($functions ) && count($functions) ) { ?>
                <div id="documentation">


@@ -212,7 +212,7 @@ if ($allowed_files) :
        <?php } ?>
 
                <div>
        <?php } ?>
 
                <div>

-<?php if ( is_writeable($real_file) ) : ?>
+<?php if ( is_writeable($file) ) : ?>

                        <p class="submit">
 <?php
        echo "<input type='submit' name='submit' class='button-primary' value='" . esc_attr__('Update File') . "' tabindex='2' />";
                        <p class="submit">
 <?php
        echo "<input type='submit' name='submit' class='button-primary' value='" . esc_attr__('Update File') . "' tabindex='2' />";


@@ -223,15 +223,23 @@ if ($allowed_files) :
 <?php endif; ?>
                </div>
        </form>
 <?php endif; ?>
                </div>
        </form>

-       <?php
+<?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>
+?>
+<br class="clear" />

 </div>
 </div>

+<script type="text/javascript">
+/* <![CDATA[ */
+jQuery(document).ready(function($){
+       $('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
+       $('#newcontent').scrollTop( $('#scrollto').val() );
+});
+/* ]]> */
+</script>

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

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