Changeset 5248

Timestamp:

04/05/2017 04:50:33 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Rename the Admin section to Advanced and enable all users to view it (including logged out anonymous users).

See #2365

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/plugin-directory/class-capabilities.php (modified) (1 diff)
• plugins/plugin-directory/class-plugin-directory.php (modified) (4 diffs)
• plugins/plugin-directory/widgets/class-meta.php (modified) (1 diff)
• themes/pub/wporg-plugins/functions.php (modified) (1 diff)
• themes/pub/wporg-plugins/template-parts/plugin-sidebar-advanced.php (moved) (moved from sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar-admin.php ) (1 diff)
• themes/pub/wporg-plugins/template-parts/plugin-single.php (modified) (3 diffs)
• themes/pub/wporg-plugins/template-parts/section-advanced.php (moved) (moved from sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/section-admin.php )

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php

@@ -30 +30 @@
                                 // Fall through
 
+                        // Although we no longer have a admin view, this capability is still used to determine if the current user is a committer/contributor.
                         case 'plugin_admin_view':
                                 // Committers + Contributors.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -440 +440 @@
 
                 // Handle plugin admin requests
-                add_rewrite_rule( '^([^/]+)/admin/?$', 'index.php?name=$matches[1]&plugin_admin=1', 'top' );
+                add_rewrite_rule( '^([^/]+)/advanced/?$', 'index.php?name=$matches[1]&plugin_advanced=1', 'top' );
 
                 // Handle the old plugin tabs URLs.
@@ -961 +961 @@
                 $vars[] = 'redirect_plugin';
                 $vars[] = 'redirect_plugin_tab';
-                $vars[] = 'plugin_admin';
+                $vars[] = 'plugin_advanced';
 
                 return $vars;
@@ -1050 +1050 @@
                         }
 
+                        // Browse 404's
+                        if ( 'browse' === $path[2] ) {
+                                wp_safe_redirect( home_url( '/browse/featured/' ) );
+                                die();
+                        }
+
                         // Otherwise, handle a plugin redirect.
                         if ( $path[2] && ( $plugin = self::get_plugin_post( $path[2] ) ) ) {
@@ -1072 +1078 @@
                 }
 
-                // Filter access to the plugin administration area. Only certain users are allowed access.
-                if ( get_query_var( 'plugin_admin' )  &&
-                        ! current_user_can(
-                                'plugin_admin_view',
-                                $post = Plugin_Directory::get_plugin_post( get_query_var( 'name' ) )
-                        )
-                ) {
-                        wp_safe_redirect( get_permalink( $post ) );
-                        die();
-                }
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php

@@ -73 +73 @@
                         <?php endif; ?>
 
-                        <?php if ( current_user_can( 'plugin_admin_view', $post ) ) : ?>
+                        <?php if ( ! get_query_var( 'plugin_advanced' ) ) : ?>  
                                 <li class="hide-if-no-js">
                                         <?php
-                                                printf( __( 'Admin access: %s', 'wporg-plugins' ),
-                                                        sprintf( '<strong><a class="plugin-admin" href="%s">%s</a></strong>', esc_url( get_permalink() . 'admin/' ), __( 'View Admin', 'wporg-plugins' ) )
-                                                );
+                                                printf( '<strong><a class="plugin-admin" href="%s">%s</a></strong>', esc_url( get_permalink() . 'advanced/' ), __( 'Advanced View', 'wporg-plugins' ) );
                                         ?>
                                 </li>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php

@@ -74 +74 @@
         ) );
 
-        if ( get_query_var( 'plugin_admin' ) ) {
+        if ( get_query_var( 'plugin_advanced' ) ) {
                 wp_enqueue_script( 'google-jsapi', 'https://www.google.com/jsapi', array(), false, true );
                 wp_enqueue_script( 'wporg-plugins-stats', get_template_directory_uri() . '/js/stats.js', array( 'jquery', 'google-jsapi' ), '20170328', true );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-sidebar-advanced.php

@@ -15 +15 @@
 );
 
-the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Meta',            array(), $widget_args );
-the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Committers',      array(), $widget_args );
-the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Contributors',    array(), array(
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Meta',    array(), $widget_args );
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Ratings',    array(), $widget_args );
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Support',    array(), $widget_args );
+        
+// If the user is not a contributor/committer for the plugin, we'll show the Donate metabox instead of the committer metabox.
+if ( current_user_can( 'plugin_admin_view', $post ) ) {
+        the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Committers', array(), $widget_args );
+} else {
+        the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Donate', array(), $widget_args );
+}
+
+the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Contributors', array(), array(
         'before_title' => '<h4 class="widget-title">',
         'after_title'  => '</h4>',

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php

@@ -120 +120 @@
         <div class="entry-content">
                 <?php
-                if ( get_query_var( 'plugin_admin' ) ) :
-                        get_template_part( 'template-parts/section-admin' );
+                if ( get_query_var( 'plugin_advanced' ) ) :
+                        get_template_part( 'template-parts/section-advanced' );
                 else:
                         $plugin_sections = Template::get_plugin_sections();
@@ -148 +148 @@
                                 get_template_part( 'template-parts/section' );
                         endforeach;
-                endif; // plugin_admin
+                endif; // plugin_advanced
                 ?>
         </div><!-- .entry-content -->
@@ -154 +154 @@
         <div class="entry-meta">
                 <?php
-                get_template_part( 'template-parts/plugin-sidebar', ( get_query_var( 'plugin_admin' ) ? 'admin' : '' ) );
+                get_template_part( 'template-parts/plugin-sidebar', ( get_query_var( 'plugin_avanced' ) ? 'advanced' : '' ) );
                 ?>
         </div><!-- .entry-meta -->