X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-admin/network/themes.php

diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index a5196a88..04840ee1 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -13,11 +13,6 @@ require_once( './admin.php' );
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
-$menu_perms = get_site_option( 'menu_items', array() );
-
-if ( empty( $menu_perms['themes'] ) && ! is_super_admin() )
-	wp_die( __( 'Cheatin’ uh?' ) );
-
 if ( !current_user_can('manage_network_themes') )
 	wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
 
@@ -34,46 +29,76 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI']
 $referer = remove_query_arg( $temp_args, wp_get_referer() );
 
 if ( $action ) {
-	$allowed_themes = get_site_option( 'allowedthemes' );	
+	$allowed_themes = get_site_option( 'allowedthemes' );
 	switch ( $action ) {
 		case 'enable':
 			check_admin_referer('enable-theme_' . $_GET['theme']);
 			$allowed_themes[ $_GET['theme'] ] = true;
 			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_redirect( add_query_arg( 'enabled', '1', $referer ) );
+			if ( false === strpos( $referer, '/network/themes.php' ) )
+				wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
+			else
+				wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
 			exit;
 			break;
 		case 'disable':
 			check_admin_referer('disable-theme_' . $_GET['theme']);
 			unset( $allowed_themes[ $_GET['theme'] ] );
 			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_redirect( add_query_arg( 'disabled', '1', $referer ) );
+			wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
 			exit;
 			break;
 		case 'enable-selected':
 			check_admin_referer('bulk-themes');
 			$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
 			if ( empty($themes) ) {
-				wp_redirect( add_query_arg( 'error', 'none', $referer ) );
+				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
 			foreach( (array) $themes as $theme )
 				$allowed_themes[ $theme ] = true;
 			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
+			wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
 			exit;
 			break;
 		case 'disable-selected':
 			check_admin_referer('bulk-themes');
 			$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
 			if ( empty($themes) ) {
-				wp_redirect( add_query_arg( 'error', 'none', $referer ) );
+				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
 			foreach( (array) $themes as $theme )
 				unset( $allowed_themes[ $theme ] );
 			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
+			wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
+			exit;
+			break;
+		case 'update-selected' :
+			check_admin_referer( 'bulk-themes' );
+
+			if ( isset( $_GET['themes'] ) )
+				$themes = explode( ',', $_GET['themes'] );
+			elseif ( isset( $_POST['checked'] ) )
+				$themes = (array) $_POST['checked'];
+			else
+				$themes = array();
+
+			$title = __( 'Update Themes' );
+			$parent_file = 'themes.php';
+
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+			echo '<div class="wrap">';
+			screen_icon();
+			echo '<h2>' . esc_html( $title ) . '</h2>';
+
+			$url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
+			$url = wp_nonce_url($url, 'bulk-update-themes');
+
+			echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
+			echo '</div>';
+			require_once(ABSPATH . 'wp-admin/admin-footer.php');
 			exit;
 			break;
 		case 'delete-selected':
@@ -83,30 +108,21 @@ if ( $action ) {
 
 			$themes = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
 
-			if ( isset( $themes[ get_option( 'template' ) ] ) )
-				unset( $themes[ get_option( 'template' ) ] );
-			if ( isset( $themes[ get_option( 'stylesheet' ) ] ) )
-				unset( $themes[ get_option( 'stylesheet' ) ] );
+			unset( $themes[ get_option( 'stylesheet' ) ], $themes[ get_option( 'template' ) ] );
 
 			if ( empty( $themes ) ) {
-				wp_redirect( add_query_arg( 'error', 'none', $referer ) );
+				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
 
-			$main_theme = get_current_theme();
 			$files_to_delete = $theme_info = array();
 			foreach ( $themes as $key => $theme ) {
-				$data = get_theme_data( WP_CONTENT_DIR . '/themes/' . $theme . '/style.css' );
-				if ( $data['Name'] == $main_theme ) {
-					unset( $themes[$key] );
-				} else {
-					$files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );					
-					$theme_info[ $theme ] = $data;
-				}
+				$theme_info[ $theme ] = wp_get_theme( $theme );
+				$files_to_delete = array_merge( $files_to_delete, list_files( $theme_info[ $theme ]->get_stylesheet_directory() ) );
 			}
-			
+
 			if ( empty( $themes ) ) {
-				wp_redirect( add_query_arg( 'error', 'main', $referer ) );
+				wp_safe_redirect( add_query_arg( 'error', 'main', $referer ) );
 				exit;
 			}
 
@@ -128,7 +144,7 @@ if ( $action ) {
 				<p><?php echo _n( 'You are about to remove the following theme:', 'You are about to remove the following themes:', $themes_to_delete ); ?></p>
 					<ul class="ul-disc">
 						<?php foreach ( $theme_info as $theme )
-							echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), esc_html( $theme['Name'] ), esc_html( $theme['AuthorName'] ) ), '</li>'; /* translators: 1: theme name, 2: theme author */ ?>
+							echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $theme->display('Name'), $theme->display('Author') ), '</li>'; /* translators: 1: theme name, 2: theme author */ ?>
 					</ul>
 				<p><?php _e('Are you sure you wish to delete these themes?'); ?></p>
 				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
@@ -160,10 +176,21 @@ if ( $action ) {
 				exit;
 			} // Endif verify-delete
 
-			foreach ( $themes as $theme )
-				$delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
-			$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1; 
-			wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) );
+			foreach ( $themes as $theme ) {
+				$delete_result = delete_theme( $theme, esc_url( add_query_arg( array(
+					'verify-delete' => 1,
+					'action' => 'delete-selected',
+					'checked' => $_REQUEST['checked'],
+					'_wpnonce' => $_REQUEST['_wpnonce']
+				), network_admin_url( 'themes.php' ) ) ) );
+			}
+			
+			$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
+			wp_redirect( add_query_arg( array(
+				'deleted' => count( $themes ),
+				'paged' => $paged,
+				's' => $s
+			), network_admin_url( 'themes.php' ) ) );
 			exit;
 			break;
 	}
@@ -175,10 +202,16 @@ add_thickbox();
 
 add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
 
-add_contextual_help($current_screen,
-	'<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
-	'<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
-	'<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.') . '</p>' .
+get_current_screen()->add_help_tab( array(
+	'id'      => 'overview',
+	'title'   => __('Overview'),
+	'content' =>
+		'<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
+		'<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
+		'<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.') . '</p>'
+) );
+
+get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __('For more information:') . '</strong></p>' .
 	'<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Themes_Screen" target="_blank">Documentation on Network Themes</a>') . '</p>' .
 	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
@@ -194,8 +227,8 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
 <div class="wrap">
 <?php screen_icon('themes'); ?>
 <h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
-if ( $s ) 
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> 
+if ( $s )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
 </h2>
 
 <?php
@@ -220,7 +253,12 @@ if ( isset( $_GET['enabled'] ) ) {
 <?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
 </form>
 
-<?php $wp_list_table->views(); ?>
+<?php
+$wp_list_table->views();
+
+if ( 'broken' == $status )
+	echo '<p class="clear">' . __('The following themes are installed but incomplete. Themes must have a stylesheet and a template.') . '</p>';
+?>
 
 <form method="post" action="">
 <input type="hidden" name="theme_status" value="<?php echo esc_attr($status) ?>" />