Changeset 8600 for trunk/wp-admin/includes/plugin-install.php

Timestamp:

08/09/2008 05:36:14 AM (17 years ago)

Author:

ryan

Message:

Trailing whitespace cleanup

File:

• trunk/wp-admin/includes/plugin-install.php (modified) (19 diffs)

trunk/wp-admin/includes/plugin-install.php

@@ -9 +9 @@
     $args = apply_filters('plugins_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter.
     $res = apply_filters('plugins_api', false, $action, $args); //NOTE: Allows a plugin to completely override the builtin WordPress.org API.
-    
+
     if ( ! $res ) {
         $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array(), array(), array('action' => $action, 'request' => serialize($args)) );
@@ -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>
-    
+
     <h4><?php _e('Search') ?></h4>
     <?php install_search_form() ?>
@@ -77 +77 @@
         <?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>
-    
+
     <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>
@@ -143 +143 @@
 function display_plugins_table($plugins, $page = 1, $totalpages = 1){
     global $tab;
-    
+
     $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : '';
     $term = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
@@ -167 +167 @@
                 'current' => $page
             ));
-            
+
             if ( $page_links )
-                echo "\t\t<div class='tablenav-pages'>$page_links</div>";   
+                echo "\t\t<div class='tablenav-pages'>$page_links</div>";
 ?>
     </div>
@@ -187 +187 @@
             if( empty($plugins) )
                 echo '<tr><td colspan="5">', __('No plugins match your request.'), '</td></tr>';
-            
+
             foreach( (array) $plugins as $plugin ){
                 if ( is_object($plugin) )
@@ -195 +195 @@
                 $description = wp_kses($plugin['description'], $plugins_allowedtags);
                 $version = wp_kses($plugin['version'], $plugins_allowedtags);
-                
+
                 $name = strip_tags($title . ' ' . $version);
-                
+
                 $author = $plugin['author'];
                 if( ! empty($plugin['author']) )
@@ -203 +203 @@
 
                 $author = wp_kses($author, $plugins_allowedtags);
-                
+
                 if( isset($plugin['homepage']) )
                     $title = '<a target="_blank" href="' . $plugin['homepage'] . '">' . $title . '</a>';
-                
+
                 $action_links = array();
                 $action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
                                     '&TB_iframe=true&width=600&height=800') . '" class="thickbox onclick" title="' .
                                     attribute_escape($name) . '">' . __('Install') . '</a>';
-                
+
                 $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
             ?>
@@ -279 +279 @@
 function install_plugin_information() {
     global $tab;
-    
+
     $api = plugins_api('plugin_information', array('slug' => $_REQUEST['plugin']));
 
@@ -285 +285 @@
     if( empty($section) || ! isset($api->sections[ $section ]) )
         $section = array_shift( $section_titles = array_keys((array)$api->sections) );
-    
+
     install_iframe_header();
     echo "<div id='$tab-header'>\n";
     echo "<ul id='sidemenu'>\n";
     foreach ( (array)$api->sections as $section_name => $content ) {
-    
+
         $title = $section_name;
         $title[0] = strtoupper($title[0]); //Capitalize first character.
@@ -303 +303 @@
     echo "</ul>\n";
     echo "</div>\n";
-    
+
     ?>
     <div class="alignright fyi">
@@ -350 +350 @@
             <li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li>
 <?php endif; if ( ! empty($api->last_updated) ) : ?>
-            <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php 
+            <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php
                             printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li>
 <?php endif; if ( ! empty($api->requires) ) : ?>
@@ -381 +381 @@
             $title[0] = strtoupper($title[0]);
             $title = str_replace('_', ' ', $title);
-            
+
             $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
             $content = links_add_target($content, '_blank');
-            
+
             $san_title = attribute_escape(sanitize_title_with_dashes($title));
-            
+
             $display = ( $section_name == $section ) ? 'block' : 'none';
-            
+
             echo "\t<div id='section-{$san_title}' style='display: {$display};'>\n";
             echo "\t\t<h2 class='long-header'>$title</h2>";
@@ -407 +407 @@
 
     install_iframe_header();
-    
+
     $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
-    
+
     echo '<div class="wrap">';
     echo '<h2>', sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ), '</h2>';
@@ -420 +420 @@
 function do_plugin_install($download_url = '', $plugin_information = NULL) {
     global $wp_filesystem;
-    
+
     if ( empty($download_url) ) {
         show_message( __('No plugin Specified') );
         return;
     }
-    
+
     $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
-    
+
     $url = 'plugin-install.php?tab=install';
     $url = add_query_arg(array('plugin' => $plugin, 'plugin_name' => $_REQUEST['plugin_name'], 'download_url' => $_REQUEST['download_url']), $url);
@@ -447 +447 @@
 
     $result = wp_install_plugin( $download_url, 'show_message' );
-    
+
     if ( is_wp_error($result) ) {
         show_message($result);
@@ -490 +490 @@
     if( empty($content_dir) )
         return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-    
+
     $plugins_dir = trailingslashit( $plugins_dir );
     $content_dir = trailingslashit( $content_dir );
@@ -513 +513 @@
     // Unzip package to working directory
     $result = unzip_file($download_file, $working_dir);
-    
+
     // Once extracted, delete the package
     unlink($download_file);
-    
+
     if ( is_wp_error($result) ) {
         $wp_filesystem->delete($working_dir, true);
         return $result;
     }
-    
+
     //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
     $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-    
+
     if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
         $wp_filesystem->delete($working_dir, true);
         return new WP_Error('install_folder_exists', __('Folder allready exists.'), $filelist[0] );
     }
-    
+
     apply_filters('install_feedback', __('Installing the plugin'));
     // Copy new version of plugin into place.
@@ -543 +543 @@
     // Remove working directory
     $wp_filesystem->delete($working_dir, true);
-    
+
     if( empty($filelist) )
         return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-    
+
     $folder = $filelist[0];
     $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash