Changeset 8540

Timestamp:

08/04/08 21:01:09 (4 months ago)

Author:

westi

Message:

Plugin Install GSOC project first code drop. Props DD32 see #6015.

Files:

• trunk/wp-admin/css/colors-classic.css (modified) (3 diffs)
• trunk/wp-admin/css/colors-fresh.css (modified) (3 diffs)
• trunk/wp-admin/css/plugin-install.css (added)
• trunk/wp-admin/images/star.gif (copied) (copied from trunk/wp-admin/images/toggle-arrow-rtl.gif)
• trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (1 diff)
• trunk/wp-admin/includes/dashboard.php (modified) (1 diff)
• trunk/wp-admin/includes/file.php (modified) (1 diff)
• trunk/wp-admin/includes/misc.php (modified) (1 diff)
• trunk/wp-admin/includes/plugin-install.php (added)
• trunk/wp-admin/includes/schema.php (modified) (2 diffs)
• trunk/wp-admin/includes/update.php (modified) (1 diff)
• trunk/wp-admin/includes/upgrade.php (modified) (2 diffs)
• trunk/wp-admin/index.php (modified) (1 diff)
• trunk/wp-admin/js/plugin-install.js (added)
• trunk/wp-admin/menu.php (modified) (1 diff)
• trunk/wp-admin/plugin-install.php (added)
• trunk/wp-admin/plugins.php (modified) (5 diffs)
• trunk/wp-admin/update.php (modified) (1 diff)
• trunk/wp-includes/category-template.php (modified) (3 diffs)
• trunk/wp-includes/formatting.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/css/colors-classic.css

@@ -34 +34 @@
-#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a,
-#dragHelper li.widget-list-control-item h4.widget-title a,
-
+
+
-    color: #fff;
-}
@@ -322 +323 @@
-}
-
-
+, #plugin-information .action-button
-    background-color: #114973;
-    color: #fff;
@@ -332 +333 @@
-}
-
-
+, div#plugin-information-header
-    background-color: #14568a;
-    border-bottom-color: #07273e;

trunk/wp-admin/css/colors-fresh.css

@@ -38 +38 @@
-#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a,
-#dragHelper li.widget-list-control-item h4.widget-title a,
-
+
+
-    color: #fff;
-}
@@ -296 +297 @@
-}
-
-
+, #plugin-information .action-button
-    background-color: #d54e21;
-    color: #fff;
@@ -305 +306 @@
-}
-
-
+, div#plugin-information-header
-    background-color: #e4f2fd;
-    border-bottom-color: #c6d9e9;

trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -120 +120 @@
-    }
-    function cwd() {
-
+@
-        if( $cwd )
-            $cwd = trailingslashit($cwd);

trunk/wp-admin/includes/dashboard.php

@@ -434 +434 @@
-
-        $link = clean_url($link);
-
+
+
+
+
+
+
+
-
-        echo "<h4>$label</h4>\n";
-dlink'>" . __( 'Download
+ilink' class='thickbox' title='$title'>" . __( 'Install
-        echo "<p>$description</p>\n";
-    }

trunk/wp-admin/includes/file.php

@@ -459 +459 @@
-}
-
+function request_filesystem_credentials($form_post, $type = '', $error = false) {
+    $req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error);
+    if ( '' !== $req_cred )
+        return $req_cred;
+
+    if ( empty($type) )
+        $type = get_filesystem_method();
+
+    if ( 'direct' == $type )
+        return true;
+        
+    if( ! $credentials = get_option('ftp_credentials') )
+        $credentials = array();
+    // If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
+    $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']);
+    $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
+    $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
+    $credentials['ssl']      = defined('FTP_SSL')  ? FTP_SSL  : ( isset($_POST['ssl'])      ? $_POST['ssl']      : $credentials['ssl']);
+
+    if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
+        $stored_credentials = $credentials;
+        unset($stored_credentials['password']);
+        update_option('ftp_credentials', $stored_credentials);
+        return $credentials;
+    }
+    $hostname = '';
+    $username = '';
+    $password = '';
+    $ssl = '';
+    if ( !empty($credentials) )
+        extract($credentials, EXTR_OVERWRITE);
+    if( $error )
+        echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.') . '</p></div>';
-?>
+<form action="<?php echo $form_post ?>" method="post">
+<div class="wrap">
+<h2><?php _e('FTP Connection Information') ?></h2>
+<p><?php _e('To perform the requested action, FTP connection information is required.') ?></p>
+<table class="form-table">
+<tr valign="top">
+<th scope="row"><label for="hostname"><?php _e('Hostname:') ?></label></th>
+<td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname) ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
+</tr>
+<tr valign="top">
+<th scope="row"><label for="username"><?php _e('Username:') ?></label></th>
+<td><input name="username" type="text" id="username" value="<?php echo attribute_escape($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
+</tr>
+<tr valign="top">
+<th scope="row"><label for="password"><?php _e('Password:') ?></label></th>
+<td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td>
+</tr>
+<tr valign="top">
+<th scope="row"><label for="ssl"><?php _e('Use SSL:') ?></label></th>
+<td>
+<select name="ssl" id="ssl"<?php if( defined('FTP_SSL') ) echo ' disabled="disabled"' ?>>
+<?php
+foreach ( array(0 => __('No'), 1 => __('Yes')) as $key => $value ) :
+    $selected = ($ssl == $value) ? 'selected="selected"' : '';
+    echo "\n\t<option value='$key' $selected>" . $value . '</option>';
+endforeach;
+?>
+</select>
+</td>
+</tr>
+</table>
+<p class="submit">
+<input type="submit" name="submit" value="<?php _e('Proceed'); ?>" />
+</p>
+</div>
+</form>
+<?php
+    return false;
+}
+
+?>

trunk/wp-admin/includes/misc.php

@@ -161 +161 @@
-}
-
+function show_message($message) {
+    if( is_wp_error($message) ){
+        if( $message->get_error_data() )
+            $message = $message->get_error_message() . ': ' . $message->get_error_data();
+        else 
+            $message = $message->get_error_message();
+    }
+    echo "<p>$message</p>\n";
+}
+
-?>

trunk/wp-admin/includes/schema.php

@@ -278 +278 @@
-    populate_roles_250();
-    populate_roles_260();
+    populate_roles_270();
-}
-
@@ -442 +443 @@
-}
-
+function populate_roles_270() {
+    $role = get_role( 'administrator' );
+
+    if ( !empty( $role ) ) {
+        $role->add_cap( 'install_plugins' );
+    }
+}
+
-?>

trunk/wp-admin/includes/update.php

@@ -61 +61 @@
-    $r = $current->response[ $file ];
-
+    $details_url = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800');
+
-    echo '<tr><td colspan="5" class="plugin-update">';
-    if ( ! current_user_can('update_plugins') )
->Download version %3$s here</a>.'), $plugin_data['Name'], $r->
+ class="thickbox" title="%1$s">View version %3$s Details</a>.'), $plugin_data['Name'], $details_
-    else if ( empty($r->package) )
->Download version %3$s here</a> <em>automatic upgrade unavailable for this plugin</em>.'), $plugin_data['Name'], $r->
+ class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this plugin</em>.'), $plugin_data['Name'], $details_
-    else
->Download version %3$s here</a> or <a href="%4$s">upgrade automatically</a>.'), $plugin_data['Name'], $r->
+ class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s">upgrade automatically</a>.'), $plugin_data['Name'], $details_
-    
-    echo '</td></tr>';

trunk/wp-admin/includes/upgrade.php

@@ -207 +207 @@
-    if ( $wp_current_db_version < 8201 )
-        upgrade_260();
+
+    if ( $wp_current_db_version < 8539 )
+        upgrade_270();
-
-    maybe_disable_automattic_widgets();
@@ -755 +758 @@
-    }
-}
+
+function upgrade_270() {
+    if ( $wp_current_db_version < 8530 )
+        populate_roles_270();
+}
+
-
-// The functions we use to actually do stuff

trunk/wp-admin/index.php

@@ -28 +28 @@
-
-wp_enqueue_script( 'jquery' );
+wp_enqueue_script( 'plugin-installer' );
-wp_admin_css( 'dashboard' );
+wp_admin_css( 'plugin-installer' );
+add_thickbox();
-
-$title = __('Dashboard');

trunk/wp-admin/menu.php

@@ -71 +71 @@
-$submenu['plugins.php'][5] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
-$submenu['plugins.php'][10] = array(__('Plugin Editor'), 'edit_plugins', 'plugin-editor.php');
+$submenu['plugins.php'][15] = array(__('Install Plugins'), 'install_plugins', 'plugin-install.php');
-
-$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');

trunk/wp-admin/plugins.php

@@ -123 +123 @@
-                    <input type="hidden" name="delete-selected" value="1" />
-                    <?php
-
-
-
-
+
+
-                    ?>
-                    <?php wp_nonce_field('bulk-manage-plugins') ?>
@@ -139 +137 @@
-                    <ul>
-                    <?php
-
-
-
-
+
+
-                    ?>
-                    </ul>
@@ -162 +158 @@
-
-wp_enqueue_script('admin-forms');
+wp_enqueue_script('plugin-install');
+add_thickbox();
-
-$title = __('Manage Plugins');
@@ -206 +204 @@
-$inactive_plugins = array();
-$recent_plugins = array();
-
+ 
-
-//Clean out any plugins which were deactivated over a week ago.
@@ -375 +373 @@
-
-<h2><?php _e('Get More Plugins'); ?></h2>
-
-
+
+
+
-
-</div>

trunk/wp-admin/update.php

@@ -5 +5 @@
-if ( ! current_user_can('update_plugins') )
-    wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
-
-function request_filesystem_credentials($form_post, $type = '', $error = false) {
-    $req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error);
-    if ( '' !== $req_cred )
-        return $req_cred;
-
-    if ( empty($type) )
-        $type = get_filesystem_method();
-
-    if ( 'direct' == $type )
-        return true;
-        
-    if( ! $credentials = get_option('ftp_credentials') )
-        $credentials = array();
-    // If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
-    $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']);
-    $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
-    $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
-    $credentials['ssl']      = defined('FTP_SSL')  ? FTP_SSL  : ( isset($_POST['ssl'])      ? $_POST['ssl']      : $credentials['ssl']);
-
-    if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
-        $stored_credentials = $credentials;
-        unset($stored_credentials['password']);
-        update_option('ftp_credentials', $stored_credentials);
-        return $credentials;
-    }
-    $hostname = '';
-    $username = '';
-    $password = '';
-    $ssl = '';
-    if ( !empty($credentials) )
-        extract($credentials, EXTR_OVERWRITE);
-    if( $error )
-        echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.') . '</p></div>';
-?>
-<form action="<?php echo $form_post ?>" method="post">
-<div class="wrap">
-<h2><?php _e('FTP Connection Information') ?></h2>
-<p><?php _e('To perform the requested update, FTP connection information is required.') ?></p>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="hostname"><?php _e('Hostname:') ?></label></th>
-<td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname) ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="username"><?php _e('Username:') ?></label></th>
-<td><input name="username" type="text" id="username" value="<?php echo attribute_escape($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="password"><?php _e('Password:') ?></label></th>
-<td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="ssl"><?php _e('Use SSL:') ?></label></th>
-<td>
-<select name="ssl" id="ssl"<?php if( defined('FTP_SSL') ) echo ' disabled="disabled"' ?>>
-<?php
-foreach ( array(0 => __('No'), 1 => __('Yes')) as $key => $value ) :
-    $selected = ($ssl == $value) ? 'selected="selected"' : '';
-    echo "\n\t<option value='$key' $selected>" . $value . '</option>';
-endforeach;
-?>
-</select>
-</td>
-</tr>
-</table>
-<p class="submit">
-<input type="submit" name="submit" value="<?php _e('Proceed'); ?>" />
-</p>
-</div>
-</form>
-<?php
-    return false;
-}
-
-function show_message($message) {
-    if( is_wp_error($message) ){
-        if( $message->get_error_data() )
-            $message = $message->get_error_message() . ': ' . $message->get_error_data();
-        else 
-            $message = $message->get_error_message();
-    }
-    echo "<p>$message</p>\n";
-}
-
-function do_plugin_upgrade($plugin) {

trunk/wp-includes/category-template.php

@@ -351 +351 @@
-        return;
-
+    foreach ( $tags as $key => $tag ) {
+        $link = get_tag_link( $tag->term_id );
+        if ( is_wp_error( $link ) )
+            return false;
+
+        $tags[ $key ]->link = $link;
+        $tags[ $key ]->id = $tag->term_id;
+    }
+
-    $return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args
-
-    if ( is_wp_error( $return ) )
-        return false;
-
-    $return = apply_filters( 'wp_tag_cloud', $return, $args );
@@ -364 +370 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-function wp_generate_tag_cloud( $tags, $args = '' ) {
-    global $wp_rewrite;
-    $defaults = array(
-
-
+
+
+
-    );
-    $args = wp_parse_args( $args, $defaults );
-    extract($args);
-
-!$tags
+empty($tags)
-        return;
-
-
-
-
-
-
-
-
+
+
+
+
-
-    $min_count = min($counts);
@@ -417 +428 @@
-
-    foreach ( $counts as $tag => $count ) {
-
-
-
+
+
+
+
-            ( $smallest + ( ( $count - $min_count ) * $font_step ) )
-            . "$unit;'>$tag</a>";

trunk/wp-includes/formatting.php

@@ -1421 +1421 @@
-}
-
+/**
+ * Add a Base url to relative links in passed content.
+ *
+ * By default it supports the 'src' and 'href' attributes,
+ * However this may be changed via the 3rd param.
+ *
+ * @package WordPress
+ * @since 2.7
+ *
+ * @param string $content String to search for links in
+ * @param string $base The base URL to prefix to links
+ * @param array $attrs The attributes which should be processed.
+ * @eaturn string The processed content.
+ */
+function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
+    $attrs = implode('|', (array)$attrs);
+    return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", 
+            create_function('$m', 'return _links_add_base($m, "' . $base . '");'),
+            $content);
+}
+
+/**
+ * Callback to add a base url to relative links in passed content.
+ *
+ *
+ * @package WordPress
+ * @since 2.7
+ *
+ * @internal
+ * @param string $m The matched link
+ * @param string $base The base URL to prefix to links
+ * @eaturn string The processed link
+ */
+function _links_add_base($m, $base) {
+    //1 = attribute name  2 = quotation mark  3 = URL
+    return $m[1] . '=' . $m[2] . 
+        (strpos($m[3], 'http://') === false ?
+            path_join($base, $m[3]) :
+            $m[3])
+        . $m[2];
+}
+
+/**
+ * Adds a Target attribute to all links in passed content.
+ *
+ * This function by default only applies to <a> tags, 
+ * however this can be modified by the 3rd param.
+ * NOTE: Any current target attributed will be striped and replaced.
+ *
+ * @package WordPress
+ * @since 2.7
+ *
+ * @param string $content String to search for links in
+ * @param string $target The Target to add to the links
+ * @param array $tags An array of tags to apply to.
+ * @eaturn string The processed content.
+ */
+function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
+    $tags = implode('|', (array)$tags);
+    return preg_replace_callback("!<($tags)(.+?)>!i", 
+            create_function('$m', 'return _links_add_target($m, "' . $target . '");'),
+            $content);
+}
+/**
+ * Callback to add a target attribute to all links in passed content
+ *
+ *
+ * @package WordPress
+ * @since 2.7
+ *
+ * @internal
+ * @param string $m The matched link
+ * @param string $target The Target to add to the links
+ * @eaturn string The processed link.
+ */
+function _links_add_target( $m, $target ) {
+    $tag = $m[1];
+    $link = preg_replace('|(target=[\'"](.*?)[\'"])|i', '', $m[2]);
+    return '<' . $tag . $link . ' target="' . $target . '">';
+}
+
-?>

trunk/wp-includes/script-loader.php

@@ -202 +202 @@
-        
-        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
+
+        $scripts->add( 'plugin-install', '/wp-admin/js/plugin-install.js', array( 'thickbox', 'jquery' ), '20080803' );
+        $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
+            'plugin_information' => __('Plugin Information:')
+        ) );
+         
-    }
-}
@@ -235 +241 @@
-    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' );
-    $styles->add( 'login', '/wp-admin/css/login.css' );
+    $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css' );
-
-    foreach ( $rtl_styles as $rtl_style )

trunk/wp-includes/version.php

@@ -16 +16 @@
- * @global int $wp_db_version
- */
-370
+539
-
-?>