WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewrite theme-editor.php to use the new WP_Theme API. see #20103. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-03-29 03:00:38 +00:00
parent bb4cca4c55
commit 23abe58a59
2 changed files with 88 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/file.php
View File

@ -65,7 +65,7 @@ function get_file_description( $file ) {
return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
}
return basename( $file );
return trim( basename( $file ) );
}
/**

162
wp-admin/theme-editor.php
View File

@ -42,67 +42,60 @@ get_current_screen()->set_help_sidebar(
'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
);
wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme', 'dir'));
wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
$themes = get_themes();
if ( $theme )
$stylesheet = $theme;
else
$stylesheet = get_stylesheet();
if (empty($theme)) {
$theme = get_current_theme();
} else {
$theme = stripslashes($theme);
}
$theme = wp_get_theme( $stylesheet );
if ( ! isset($themes[$theme]) )
if ( ! $theme )
wp_die( __( 'The requested theme does not exist.' ) );
$allowed_files = array_merge( $themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files'] );
$allowed_files = $theme->get_files( 'php', 1 );
$style_files = $theme->get_files( 'css' );
if ( isset( $style_files['style.css'] ) ) {
$allowed_files['style.css'] = $style_files['style.css'];
unset( $style_files['style.css'] );
} else {
$style_files['style.css'] = false;
}
$allowed_files += $style_files;
if ( empty( $file ) ) {
if ( false !== array_search( $themes[$theme]['Stylesheet Dir'] . '/style.css', $allowed_files ) )
$file = $themes[$theme]['Stylesheet Dir'] . '/style.css';
else
$file = $allowed_files[0];
if ( ! empty( $allowed_files['style.css'] ) ) {
$relative_file = 'style.css';
$file = $allowed_files['style.css'];
} 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 ;
$relative_file = key( $allowed_files );
$file = current( $allowed_files );
}
} else {
$relative_file = stripslashes( $file );
$file = $theme->get_stylesheet_directory() . '/' . $relative_file;
}
validate_file_to_edit( $file, $allowed_files );
$scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
$file_show = basename( $file );
switch( $action ) {
case 'update':
check_admin_referer('edit-theme_' . $file . $theme);
check_admin_referer( 'edit-theme_' . $file . $stylesheet );
$newcontent = stripslashes( $_POST['newcontent'] );
$theme = urlencode($theme);
$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
if ( is_writeable( $file ) ) {
//is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
$f = fopen( $file, 'w+' );
if ( $f !== false ) {
fwrite( $f, $newcontent );
fclose( $f );
$location = "theme-editor.php?file=$file&theme=$theme&a=te&scrollto=$scrollto";
} else {
$location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";
$location .= '&updated=true';
}
} else {
$location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";
}
$location = wp_kses_no_null($location);
$strip = array('%0d', '%0a', '%0D', '%0A');
$location = _deep_replace($strip, $location);
header("Location: $location");
exit();
wp_redirect( $location );
exit;
break;
default:
@ -112,7 +105,7 @@ default:
update_recently_edited( $file );
if ( ! is_file( $file ) )
$error = 1;
$error = true;
$content = '';
if ( ! $error && filesize( $file ) > 0 ) {
@ -134,14 +127,14 @@ default:
}
?>
<?php if (isset($_GET['a'])) : ?>
<?php if ( isset( $_GET['updated'] ) ) : ?>
<div id="message" class="updated"><p><?php _e( 'File edited successfully.' ) ?></p></div>
<?php endif;
$description = get_file_description( $file );
$desc_header = ( $description != $file_show ) ? "$description <span>($file_show)</span>" : $file_show;
$is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
$file_show = array_search( $file, $allowed_files );
if ( $description != $file_show )
$description .= ' <span>(' . $file_show . ')</span>';
?>
<div class="wrap">
<?php screen_icon(); ?>
@ -149,19 +142,16 @@ $is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
<div class="fileedit-sub">
<div class="alignleft">
<h3><?php echo $themes[$theme]['Name'] . ': ' . $desc_header; ?></h3>
<h3><?php echo $theme->display('Name') . ': ' . $description; ?></h3>
</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 = '';
$theme_name = esc_attr($theme_name);
echo "\n\t<option value=\"$theme_name\" $selected>$theme_name</option>";
foreach ( wp_get_themes() as $a_stylesheet => $a_theme ) {
$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
}
?>
</select>
@ -175,73 +165,53 @@ $is_child_theme = $themes[$theme]['Template'] != $themes[$theme]['Stylesheet'];
if ( $allowed_files ) :
?>
<h3><?php _e('Templates'); ?></h3>
<?php if ( $is_child_theme ) : ?>
<p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), $themes[$theme]['Parent Theme'] ); ?></p>
<?php if ( $theme->is_child_theme() ) : ?>
<p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . $theme->get_template()) . '">' . $theme->parent()->display('Name') . '</a>' ); ?></p>
<?php endif; ?>
<ul>
<?php
$template_mapping = array();
$template_dir = $themes[$theme]['Template Dir'];
foreach ( $themes[$theme]['Template Files'] as $template_file ) {
// Don't show parent templates.
if ( $is_child_theme && strpos( $template_file, trailingslashit( $template_dir ) ) === 0 )
foreach ( $allowed_files as $filename => $absolute_filename ) :
if ( 'style.css' == $filename ) {
echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
if ( ! $absolute_filename )
continue;
$description = trim( get_file_description($template_file) );
$template_show = basename($template_file);
$filedesc = ( $description != $template_file ) ? "$description<br /><span class='nonessential'>($template_show)</span>" : "$description";
$filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($template_show)</span></span>" : $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 ) ) :
$file_description = get_file_description( $filename );
if ( $file_description != basename( $filename ) )
$file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
if ( $absolute_filename == $file )
$file_description = '<span class="highlight">' . $file_description . '</span>';
?>
<li><a href="theme-editor.php?file=<?php echo urlencode( $template_file ) ?>&amp;theme=<?php echo urlencode( $theme ) ?>&amp;dir=theme"><?php echo $filedesc ?></a></li>
<?php endwhile; ?>
</ul>
<h3><?php /* translators: Theme stylesheets in theme editor */ _ex('Styles', 'Theme stylesheets in theme editor'); ?></h3>
<ul>
<li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
<?php
$template_mapping = array();
$stylesheet_dir = $themes[$theme]['Stylesheet Dir'];
foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) {
// Don't show parent styles.
if ( $is_child_theme && strpos( $style_file, trailingslashit( $template_dir ) ) === 0 )
continue;
$description = trim( get_file_description($style_file) );
$style_show = basename($style_file);
$filedesc = ( $description != $style_file ) ? "$description<br /><span class='nonessential'>($style_show)</span>" : "$description";
$filedesc = ( $style_file == $file ) ? "<span class='highlight'>$description<br /><span class='nonessential'>($style_show)</span></span>" : $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 ) ) :
endforeach;
?>
<li><a href="theme-editor.php?file=<?php echo urlencode( $style_file ) ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=style"><?php echo $filedesc ?></a></li>
<?php endwhile; ?>
</ul>
<?php endif; ?>
</div>
<?php if (!$error) { ?>
<?php if ( $error ) :
echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
else : ?>
<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"><?php echo $content ?></textarea>
<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
<div><textarea cols="70" rows="30" 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 esc_attr($file) ?>" />
<input type="hidden" name="theme" value="<?php echo esc_attr($theme) ?>" />
<input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
<input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />
<input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
</div>
<?php if ( isset($functions ) && count($functions) ) { ?>
<?php if ( ! empty( $functions ) ) : ?>
<div id="documentation" class="hide-if-no-js">
<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() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" />
</div>
<?php } ?>
<?php endif; ?>
<div>
<?php if ( is_child_theme() && ! $is_child_theme && $themes[$theme]['Template'] == get_option('template') ) : ?>
<?php if ( is_child_theme() && ! $theme->is_child_theme() && $theme->get_template() == get_template() ) : ?>
<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
<?php _e( 'This is a file in your current parent theme.' ); ?></p>
<?php endif; ?>
@ -254,9 +224,7 @@ if ($allowed_files) :
</div>
</form>
<?php
} else {
echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
}
endif; // $error
?>
<br class="clear" />
</div>
@ -272,4 +240,4 @@ jQuery(document).ready(function($){
break;
}
include(ABSPATH . "wp-admin/admin-footer.php");
include(ABSPATH . 'wp-admin/admin-footer.php' );