Wordpress 2.8.5-scripts

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

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index f17a48c118549928abddf16dc5896820053a6f17..c7343a7a521d9a4c972fdb7fe6559bd2c608108d 100644 (file)
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -1,4 +1,12 @@
 <?php
 <?php

+/**
+ * Theme editor administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */

 require_once('admin.php');
 
 $title = __("Edit Themes");
 require_once('admin.php');
 
 $title = __("Edit Themes");


@@ -6,10 +14,7 @@ $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'));
 

-add_action( 'admin_head', 'theme_editor_css' );
-function theme_editor_css(){
-       wp_admin_css( 'css/theme-editor' );
-}
+wp_admin_css( 'theme-editor' );

 
 $themes = get_themes();
 
 
 $themes = get_themes();
 


@@ -17,8 +22,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.'));


@@ -46,17 +50,22 @@ case 'update':
        $newcontent = stripslashes($_POST['newcontent']);
        $theme = urlencode($theme);
        if (is_writeable($real_file)) {
        $newcontent = stripslashes($_POST['newcontent']);
        $theme = urlencode($theme);
        if (is_writeable($real_file)) {

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

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

-               fwrite($f, $newcontent);
-               fclose($f);
-               $location = "theme-editor.php?file=$file&theme=$theme&a=te";
+               if ($f !== FALSE) {
+                       fwrite($f, $newcontent);
+                       fclose($f);
+                       $location = "theme-editor.php?file=$file&theme=$theme&a=te";
+               } else {
+                       $location = "theme-editor.php?file=$file&theme=$theme";
+               }

        } else {
                $location = "theme-editor.php?file=$file&theme=$theme";
        }
 
        $location = wp_kses_no_null($location);
        } else {
                $location = "theme-editor.php?file=$file&theme=$theme";
        }
 
        $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();
 


@@ -71,13 +80,26 @@ default:
 
        update_recently_edited($file);
 
 
        update_recently_edited($file);
 

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

                $error = 1;
 
                $error = 1;
 

-       if (!$error && filesize($real_file) > 0) {
+       if ( !$error && filesize($real_file) > 0 ) {

                $f = fopen($real_file, 'r');
                $content = fread($f, filesize($real_file));
                $f = fopen($real_file, 'r');
                $content = fread($f, filesize($real_file));

-               $content = htmlspecialchars($content);
+
+               if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
+                       $functions = wp_doc_link_parse( $content );
+
+                       $docs_select = '<select name="docs-list" id="docs-list">';
+                       $docs_select .= '<option value="">' . esc_attr__( 'Function Name...' ) . '</option>';
+                       foreach ( $functions as $function ) {
+                               $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+                       }
+                       $docs_select .= '</select>';
+               }
+
+               $content = htmlspecialchars( $content );
+               $codepress_lang = codepress_get_lang($real_file);

        }
 
        ?>
        }
 
        ?>


@@ -86,96 +108,126 @@ default:
 <?php endif;
 
 $description = get_file_description($file);
 <?php endif;
 
 $description = get_file_description($file);

-$desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "%s";
+$desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (%s)" : "%s";

 ?>
 <div class="wrap">
 ?>
 <div class="wrap">

-<div class="bordertitle">
-       <h2><?php _e('Theme Editor'); ?></h2>
-       <form id="themeselector" name="theme" action="theme-editor.php" method="post">
-               <strong><?php _e('Select theme to edit:'); ?> </strong>
+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?></h2>
+
+<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
        foreach ($themes as $a_theme) {
        $theme_name = $a_theme['Name'];
        if ($theme_name == $theme) $selected = " selected='selected'";
        else $selected = '';
                <select name="theme" id="theme">
 <?php
        foreach ($themes as $a_theme) {
        $theme_name = $a_theme['Name'];
        if ($theme_name == $theme) $selected = " selected='selected'";
        else $selected = '';

-       $theme_name = attribute_escape($theme_name);
+       $theme_name = esc_attr($theme_name);

        echo "\n\t<option value=\"$theme_name\" $selected>$theme_name</option>";
 }
 ?>
                </select>
        echo "\n\t<option value=\"$theme_name\" $selected>$theme_name</option>";
 }
 ?>
                </select>

-               <input type="submit" name="Submit" value="<?php _e('Select') ?>" class="button" />
+               <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />

        </form>
 </div>
        </form>
 </div>

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

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

-<br class="clear" />
-       <div id="templateside">
-       <h3 id="bordertitle"><?php _e("Theme Files"); ?></h3>
+
+<div id="templateside">
+       <h3><?php _e("Theme Files"); ?></h3>

 
 <?php
 if ($allowed_files) :
 ?>
        <h4><?php _e('Templates'); ?></h4>
        <ul>
 
 <?php
 if ($allowed_files) :
 ?>
        <h4><?php _e('Templates'); ?></h4>
        <ul>

-<?php foreach($themes[$theme]['Template Files'] as $template_file) :
-               $description = get_file_description($template_file);
+<?php
+       $template_mapping = array();
+       $template_dir = $themes[$theme]['Template Dir'];
+       foreach ( $themes[$theme]['Template Files'] as $template_file ) {
+               $description = trim( get_file_description($template_file) );

                $template_show = basename($template_file);
                $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : "$description";
                $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($template_show)</span></span>" : $filedesc;
                $template_show = basename($template_file);
                $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : "$description";
                $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($template_show)</span></span>" : $filedesc;

-               ?>
+
+               // If we have two files of the same name prefer the one in the Template Directory
+               // 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 );
+                       }
+               } else {
+                       $template_mapping[ $description ] = array( $template_file, $filedesc );
+               }
+       }
+       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) ?>"><?php echo $filedesc ?></a></li>

-<?php endforeach; ?>
+<?php endwhile; ?>

        </ul>
        </ul>

-       <h4><?php echo _c('Styles|Theme stylesheets in theme editor'); ?></h4>
+       <h4><?php /* translators: Theme stylesheets in theme editor */ echo _x('Styles', 'Theme stylesheets in theme editor'); ?></h4>

        <ul>
        <ul>

-<?php foreach($themes[$theme]['Stylesheet Files'] as $style_file) :
-               $description = get_file_description($style_file);
+<?php
+       $template_mapping = array();
+       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;
                $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 );
+       }
+       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) ?>"><?php echo $filedesc ?></a></li>

-<?php endforeach; ?>
+<?php endwhile; ?>

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

-       <?php
-       if (!$error) {
-       ?>
-       <form name="template" id="template" action="theme-editor.php" method="post">
+
+<?php if (!$error) { ?>
+<form name="template" id="template" action="theme-editor.php" method="post">

        <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
        <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>

-                <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
+                <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="action" value="update" />

-                <input type="hidden" name="file" value="<?php echo $file ?>" />
-                <input type="hidden" name="theme" value="<?php echo $theme ?>" />
+                <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
+                <input type="hidden" name="theme" value="<?php echo esc_attr($theme) ?>" />

                 </div>
                 </div>

+       <?php if ( isset($functions ) && count($functions) ) { ?>
+               <div id="documentation">
+               <label for="docs-list"><?php _e('Documentation:') ?></label>
+               <?php echo $docs_select; ?>
+               <input type="button" class="button" value=" <?php esc_attr_e( 'Lookup' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" />
+               </div>
+       <?php } ?>

 
                <div>
 <?php if ( is_writeable($real_file) ) : ?>
                        <p class="submit">
 <?php
 
                <div>
 <?php if ( is_writeable($real_file) ) : ?>
                        <p class="submit">
 <?php

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

 ?>
 </p>
 <?php else : ?>
 <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
 <?php endif; ?>
                </div>
 ?>
 </p>
 <?php else : ?>
 <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
 <?php endif; ?>
                </div>

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

 </div>
 <?php
 break;
 }
 
 </div>
 <?php
 break;
 }
 

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