Changeset 16242 for trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

Timestamp:

11/08/2010 09:52:54 PM (16 years ago)

Author:

ryan

Message:

site-themes.php cleanup. Props PeteMall. see #14897

File:

• trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (8 diffs)

trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -8 +8 @@
  */
 class WP_MS_Themes_List_Table extends WP_List_Table {
+    
+    var $site_id;
+    var $is_site_themes;
 
     function WP_MS_Themes_List_Table() {
@@ -38 +41 @@
         }
 
-        if ( !current_user_can('manage_network_themes') )
-            wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
+        if ( $this->is_site_themes && !current_user_can('manage_sites') ) 
+            wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) ); 
+        else if ( !$this->is_site_themes && !current_user_can('manage_network_themes') ) 
+            wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
     }
 
@@ -55 +60 @@
         );
 
-        $allowed_themes = get_site_allowed_themes();
+        $site_allowed_themes = get_site_allowed_themes(); 
+        if ( !$this->is_site_themes ) 
+            $allowed_themes = $site_allowed_themes; 
+        else 
+            $allowed_themes = wpmu_get_blog_allowedthemes( $this->site_id );
+        
         $current = get_site_transient( 'update_themes' );
 
         foreach ( (array) $themes['all'] as $key => $theme ) {
             $theme_key = esc_html( $theme['Stylesheet'] );
+
             if ( isset( $allowed_themes [ $theme_key ] ) )  {
                 $themes['all'][$key]['enabled'] = true;
@@ -70 +81 @@
             if ( isset( $current->response[ $theme['Template'] ] ) )
                 $themes['upgrade'][$key] = $themes['all'][$key];
+
+            if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) { 
+                unset( $themes['all'][$key] ); 
+                unset( $themes['enabled'][$key] ); 
+                unset( $themes['disabled'][$key] ); 
+            }
         }
 
@@ -189 +206 @@
             }
 
+            if ( $this->is_site_themes ) 
+                $url = 'site-themes.php?id=' . $this->site_id; 
+            else 
+                $url = 'themes.php';
+
             $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-                add_query_arg('theme_status', $type, 'themes.php'),
+                add_query_arg('theme_status', $type, $url),
                 ( $type == $status ) ? ' class="current"' : '',
                 sprintf( $text, number_format_i18n( $count ) )
@@ -204 +226 @@
         $actions = array();
         if ( 'enabled' != $status )
-            $actions['network-enable-selected'] = __( 'Enable' );
+            $actions['enable-selected'] = __( 'Enable' );
         if ( 'disabled' != $status )
-            $actions['network-disable-selected'] = __( 'Disable' );
+            $actions['disable-selected'] = __( 'Disable' );
         if ( current_user_can( 'update_themes' ) )
             $actions['update-selected'] = __( 'Update' );
@@ -226 +248 @@
 
         $context = $status;
+        
+        if ( $this->is_site_themes )
+            $url = "site-themes.php?id={$this->site_id}&amp;";
+        else
+            $url = 'themes.php?';
 
         foreach ( $this->items as $key => $theme ) {
             // preorder
             $actions = array(
-                'network_enable' => '',
-                'network_disable' => '',
+                'enable' => '',
+                'disable' => '',
                 'edit' => ''
             );
@@ -237 +264 @@
             $theme_key = esc_html( $theme['Stylesheet'] );
 
-            if ( empty( $theme['enabled'] ) ) {
-                if ( current_user_can( 'manage_network_themes' ) )
-                    $actions['network_enable'] = '<a href="' . wp_nonce_url('themes.php?action=network-enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $theme_key) . '" title="' . __('Enable this theme for all sites in this network') . '" class="edit">' . __('Enable') . '</a>';
-            } else {
-                if ( current_user_can( 'manage_network_themes' ) )
-                    $actions['network_disable'] = '<a href="' . wp_nonce_url('themes.php?action=network-disable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'disable-theme_' . $theme_key) . '" title="' . __('Disable this theme') . '">' . __('Disable') . '</a>';
-            }
+            if ( empty( $theme['enabled'] ) )
+                    $actions['enable'] = '<a href="' . wp_nonce_url($url . 'action=enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $theme_key) . '" title="' . __('Enable this theme') . '" class="edit">' . __('Enable') . '</a>';
+            else
+                    $actions['disable'] = '<a href="' . wp_nonce_url($url . 'action=disable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'disable-theme_' . $theme_key) . '" title="' . __('Disable this theme') . '">' . __('Disable') . '</a>';
             
             if ( current_user_can('edit_themes') )