Ticket #6015: 6015.4.diff

wp-admin/includes/plugin-install.php

@@ -68 +68 @@
         }
         ?>
         
-        <p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> via this page.') ?></p>
+        <p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via this page.') ?></p>
         
         <h4><?php _e('Search') ?></h4>
-        <?php install_search_form() ?>
+        <?php install_search_form(
+                '<a href="' . add_query_arg('show-help', !isset($_REQUEST['show-help'])) .'" onclick="jQuery(\'#search-help\').toggle(); return false;">' .
+                        __('[need help?]') . '</a>') ?>
+        <div id="search-help" style="display: <?php echo isset($_REQUEST['show-help']) ? 'block' : 'none'; ?>;">
         <p>     <?php _e('You may search based on 3 criteria:') ?><br />
                 <?php _e('<strong>Term:</strong> Searches plugins names and descriptions for the specified term') ?><br />
                 <?php _e('<strong>Tag:</strong> Searches for plugins tagged as such') ?><br />
                 <?php _e('<strong>Author:</strong> Searches for plugins created by the Author, or which the Author contributed to.') ?></p>
+        </div>
         
+        <h4><?php _e('Install a plugin in .zip format') ?></h4>
+        <p><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
+        <form>
+                <input type="file" name="pluginzip" />
+                <input type="submit" value="<?php _e('Install Now') ?>" />(Not working yet)
+        </form>
+        
         <h4><?php _e('Popular tags') ?></h4>
-        <p><?php _e('You may also search based on these popular tags, These are tags which are most popular on WordPress.org') ?></p>
+        <p><?php _e('You may also browse based on the most popular tags on wordpress.org') ?></p>
         <?php
 
                 $api_tags = install_popular_tags();
@@ -93 +104 @@
                 echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );
 }
 
-function install_search_form(){
+function install_search_form($after_submit = '') {
         $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : '';
         $term = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
 
@@ -105 +116 @@
                 </select>
                 <input type="text" name="s" id="search-field" value="<?php echo attribute_escape($term) ?>" />
                 <input type="submit" name="search" value="<?php echo attribute_escape(__('Search')) ?>" clas="button" />
+                <?php if ( ! empty($after_submit) ) echo $after_submit ?>
         </form><?php
 }
 
@@ -132 +144 @@
         $api = plugins_api('query_plugins', $args);
         display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }
-add_action('install_plugins_upload', 'install_upload_custom', 10, 1);
-function install_upload_custom($page){
-        //$args = array('browse' => 'updated', 'page' => $page);
-        //$api = plugins_api('query_plugins', $args);
-        //display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
-        echo '<h1>Not Implemented</h1> <p>Will utilise SwfUpload(if available) & unzip .zip plugin packages</p>';
-}
 
 function display_plugins_table($plugins, $page = 1, $totalpages = 1){
         global $tab;

wp-admin/plugin-install.php

@@ -14 +14 @@
 wp_enqueue_script( 'plugin-install' );
 add_thickbox();
 
-//These are the tabs which are shown on the page, Note that 'install' and 'plugin-information' are valid hooks, but not shown here due to not requiring the header
+//These are the tabs which are shown on the page,
 $tabs = array(
                         'search'        => __('Search Plugins'),
-                        'upload'        => __('Upload a Plugin'),
                         'featured'      => __('Featured Plugins'),
                         'popular'       => __('Popular Plugins'),
                         'new'           => __('Newest Plugins'),
                         'updated'       => __('Recently Updated Plugins')
                 );
+$nonmenu_tags = array('install', 'plugin-information', 'upload'); //Valid actions to perform which do not have a Menu item.
 
 $tabs = apply_filters('install_plugins_tabs', $tabs );
 
-if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, array('install', 'plugin-information')) ) ){
+if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_tabs) ) ){
         $tab_actions = array_keys($tabs);
         $tab = $tab_actions[0];
 }