X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/1c09677af04c9e37714e09b73eb9dbc5b2e3eb13..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-admin/theme-editor.php

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index c85fa0ab..c858c0bb 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -7,86 +7,103 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
+
+if ( is_multisite() && ! is_network_admin() ) {
+	wp_redirect( network_admin_url( 'theme-editor.php' ) );
+	exit();
+}
 
 if ( !current_user_can('edit_themes') )
-	wp_die('<p>'.__('You 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 site.').'</p>');
 
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
 
-wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme', 'dir'));
-
-wp_admin_css( 'theme-editor' );
-
-$themes = get_themes();
-
-if (empty($theme)) {
-	$theme = get_current_theme();
-} else {
-	$theme = stripslashes($theme);
-}
-
-if ( ! isset($themes[$theme]) )
-	wp_die(__('The requested theme does not exist.'));
-
-$allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
-
-if (empty($file)) {
-	$file = $allowed_files[0];
+get_current_screen()->add_help_tab( array(
+'id'		=> 'overview',
+'title'		=> __('Overview'),
+'content'	=>
+	'<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
+	<p>' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '</p>
+	<p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p>
+	<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>
+	<p>' . __('After typing in your edits, click Update File.') . '</p>
+	<p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>
+	<p>' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s" target="_blank">child theme</a> instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '</p>' .
+	( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
+) );
+
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Theme_Development" target="_blank">Documentation on Theme Development</a>') . '</p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>') . '</p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Editing_Files" target="_blank">Documentation on Editing Files</a>') . '</p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Template_Tags" target="_blank">Documentation on Template Tags</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
+
+wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
+
+if ( $theme )
+	$stylesheet = $theme;
+else
+	$stylesheet = get_stylesheet();
+
+$theme = wp_get_theme( $stylesheet );
+
+if ( ! $theme->exists() )
+	wp_die( __( 'The requested theme does not exist.' ) );
+
+if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() )
+	wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
+
+$allowed_files = $theme->get_files( 'php', 1 );
+$has_templates = ! empty( $allowed_files );
+$style_files = $theme->get_files( 'css' );
+$allowed_files['style.css'] = $style_files['style.css'];
+$allowed_files += $style_files;
+
+if ( empty( $file ) ) {
+	$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 = $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) {
+validate_file_to_edit( $file, $allowed_files );
+$scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
 
+switch( $action ) {
 case 'update':
-
-	check_admin_referer('edit-theme_' . $file . $theme);
-
-	$newcontent = stripslashes($_POST['newcontent']);
-	$theme = urlencode($theme);
-	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";
+	check_admin_referer( 'edit-theme_' . $file . $stylesheet );
+	$newcontent = wp_unslash( $_POST['newcontent'] );
+	$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 .= '&updated=true';
+			$theme->cache_delete();
 		}
-	} 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();
-
-break;
+	wp_redirect( $location );
+	exit;
 
 default:
 
-	require_once('admin-header.php');
+	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-	update_recently_edited($file);
+	update_recently_edited( $file );
 
-	if ( !is_file($file) )
-		$error = 1;
+	if ( ! is_file( $file ) )
+		$error = true;
 
-	if ( !$error && filesize($file) > 0 ) {
+	$content = '';
+	if ( ! $error && filesize( $file ) > 0 ) {
 		$f = fopen($file, 'r');
 		$content = fread($f, filesize($file));
 
@@ -94,152 +111,131 @@ default:
 			$functions = wp_doc_link_parse( $content );
 
 			$docs_select = '<select name="docs-list" id="docs-list">';
-			$docs_select .= '<option value="">' . esc_attr__( 'Function Name...' ) . '</option>';
+			$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</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($file);
+		$content = esc_textarea( $content );
 	}
 
-	?>
-<?php if (isset($_GET['a'])) : ?>
- <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
+	if ( isset( $_GET['updated'] ) ) : ?>
+ <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
 <?php endif;
 
-$description = get_file_description($file);
-$desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (%s)" : "%s";
+$description = get_file_description( $file );
+$file_show = array_search( $file, array_filter( $allowed_files ) );
+if ( $description != $file_show )
+	$description .= ' <span>(' . $file_show . ')</span>';
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
-<big><?php echo sprintf($desc_header, $file_show); ?></big>
+<h3><?php echo $theme->display('Name'); if ( $description ) echo ': ' . $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( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
+	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
+		continue;
+
+	$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
+	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
 }
 ?>
 		</select>
-		<input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
+		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
 	</form>
 </div>
 <br class="clear" />
 </div>
-<br class="clear" />
+<?php
+if ( $theme->errors() )
+	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+?>
 	<div id="templateside">
-	<h3><?php _e("Theme Files"); ?></h3>
-
 <?php
-if ($allowed_files) :
+if ( $allowed_files ) :
+	if ( $has_templates || $theme->parent() ) :
 ?>
-	<h4><?php _e('Templates'); ?></h4>
+	<h3><?php _e('Templates'); ?></h3>
+	<?php if ( $theme->parent() ) : ?>
+	<p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . urlencode( $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 ) {
-		$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;
-
-		// 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( _get_template_edit_filename($template_file, $template_dir), $filedesc );
-			}
-		} else {
-			$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 ) ) :
-	?>
-		<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>
+	endif;
+
+	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";
+
+		$file_description = get_file_description( $absolute_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( $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 ) {
-		$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( _get_template_edit_filename($style_file, $stylesheet_dir), $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) ?>&amp;dir=style"><?php echo $filedesc ?></a></li>
-<?php endwhile; ?>
-	</ul>
+	endforeach;
+?>
+</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" 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">
+	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
+		<div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
+		<input type="hidden" name="action" value="update" />
+		<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 ( ! 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() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" />
+		<input type="button" class="button" value=" <?php esc_attr_e( 'Look Up' ); ?> " 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_writeable($file) ) : ?>
-			<p class="submit">
+		<?php if ( is_child_theme() && $theme->get_stylesheet() == 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; ?>
 <?php
-	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>
+	if ( is_writeable( $file ) ) :
+		submit_button( __( 'Update File' ), 'primary', 'submit', true );
+	else : ?>
+<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
 <?php endif; ?>
 		</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>
 <script type="text/javascript">
-/* <![CDATA[ */
 jQuery(document).ready(function($){
 	$('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
 	$('#newcontent').scrollTop( $('#scrollto').val() );
 });
-/* ]]> */
 </script>
 <?php
 break;
 }
 
-include("admin-footer.php");
+include(ABSPATH . 'wp-admin/admin-footer.php' );