X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..784f914b1e4b1c62d6657e86397c2e83bcee4295:/wp-admin/includes/class-wp-upgrader-skins.php
diff --git a/wp-admin/includes/class-wp-upgrader-skins.php b/wp-admin/includes/class-wp-upgrader-skins.php
index 71a1293e..c9d32ceb 100644
--- a/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/wp-admin/includes/class-wp-upgrader-skins.php
@@ -16,48 +16,93 @@
*/
class WP_Upgrader_Skin {
- var $upgrader;
- var $done_header = false;
- var $result = false;
-
- function __construct($args = array()) {
+ public $upgrader;
+ public $done_header = false;
+ public $done_footer = false;
+ public $result = false;
+ public $options = array();
+
+ /**
+ *
+ * @param array $args
+ */
+ public function __construct($args = array()) {
$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
$this->options = wp_parse_args($args, $defaults);
}
- function set_upgrader(&$upgrader) {
+ /**
+ * @param WP_Upgrader $upgrader
+ */
+ public function set_upgrader(&$upgrader) {
if ( is_object($upgrader) )
$this->upgrader =& $upgrader;
$this->add_strings();
}
- function add_strings() {
+ /**
+ * @access public
+ */
+ public function add_strings() {
}
- function set_result($result) {
+ /**
+ *
+ * @param string|false|WP_Error $result
+ */
+ public function set_result($result) {
$this->result = $result;
}
- function request_filesystem_credentials($error = false) {
+ /**
+ *
+ * @param bool $error
+ * @param string $context
+ * @param bool $allow_relaxed_file_ownership
+ * @return type
+ */
+ public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
$url = $this->options['url'];
- $context = $this->options['context'];
- if ( !empty($this->options['nonce']) )
+ if ( ! $context ) {
+ $context = $this->options['context'];
+ }
+ if ( !empty($this->options['nonce']) ) {
$url = wp_nonce_url($url, $this->options['nonce']);
- return request_filesystem_credentials($url, '', $error, $context); //Possible to bring inline, Leaving as is for now.
+ }
+
+ $extra_fields = array();
+
+ return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
}
- function header() {
- if ( $this->done_header )
+ /**
+ * @access public
+ */
+ public function header() {
+ if ( $this->done_header ) {
return;
+ }
$this->done_header = true;
echo '';
- echo '
' . $this->options['title'] . '
';
+ echo '' . $this->options['title'] . '
';
}
- function footer() {
+
+ /**
+ * @access public
+ */
+ public function footer() {
+ if ( $this->done_footer ) {
+ return;
+ }
+ $this->done_footer = true;
echo '';
}
- function error($errors) {
+ /**
+ *
+ * @param string|WP_Error $errors
+ */
+ public function error($errors) {
if ( ! $this->done_header )
$this->header();
if ( is_string($errors) ) {
@@ -65,14 +110,18 @@ class WP_Upgrader_Skin {
} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
foreach ( $errors->get_error_messages() as $message ) {
if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
- $this->feedback($message . ' ' . esc_html( $errors->get_error_data() ) );
+ $this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
else
$this->feedback($message);
}
}
}
- function feedback($string) {
+ /**
+ *
+ * @param string $string
+ */
+ public function feedback($string) {
if ( isset( $this->upgrader->strings[$string] ) )
$string = $this->upgrader->strings[$string];
@@ -89,9 +138,56 @@ class WP_Upgrader_Skin {
return;
show_message($string);
}
- function before() {}
- function after() {}
+ /**
+ * @access public
+ */
+ public function before() {}
+
+ /**
+ * @access public
+ */
+ public function after() {}
+
+ /**
+ * Output JavaScript that calls function to decrement the update counts.
+ *
+ * @since 3.9.0
+ *
+ * @param string $type Type of update count to decrement. Likely values include 'plugin',
+ * 'theme', 'translation', etc.
+ */
+ protected function decrement_update_count( $type ) {
+ if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
+ return;
+ }
+
+ if ( defined( 'IFRAME_REQUEST' ) ) {
+ echo '';
+ } else {
+ echo '';
+ }
+ }
+
+ /**
+ * @access public
+ */
+ public function bulk_header() {}
+
+ /**
+ * @access public
+ */
+ public function bulk_footer() {}
}
/**
@@ -102,11 +198,15 @@ class WP_Upgrader_Skin {
* @since 2.8.0
*/
class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
- var $plugin = '';
- var $plugin_active = false;
- var $plugin_network_active = false;
-
- function __construct($args = array()) {
+ public $plugin = '';
+ public $plugin_active = false;
+ public $plugin_network_active = false;
+
+ /**
+ *
+ * @param array $args
+ */
+ public function __construct( $args = array() ) {
$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
$args = wp_parse_args($args, $defaults);
@@ -118,20 +218,35 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
parent::__construct($args);
}
- function after() {
+ /**
+ * @access public
+ */
+ public function after() {
$this->plugin = $this->upgrader->plugin_info();
if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
- echo '';
+ // Currently used only when JS is off for a single plugin update?
+ echo '';
}
+ $this->decrement_update_count( 'plugin' );
+
$update_actions = array(
- 'activate_plugin' => '' . __('Activate Plugin') . '',
- 'plugins_page' => '' . __('Return to Plugins page') . ''
+ 'activate_plugin' => '' . __( 'Activate Plugin' ) . '',
+ 'plugins_page' => '' . __( 'Return to Plugins page' ) . ''
);
if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
unset( $update_actions['activate_plugin'] );
- $update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $this->plugin);
+ /**
+ * Filter the list of action links available following a single plugin update.
+ *
+ * @since 2.7.0
+ *
+ * @param array $update_actions Array of plugin action links.
+ * @param string $plugin Path to the plugin file.
+ */
+ $update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
+
if ( ! empty($update_actions) )
$this->feedback(implode(' | ', (array)$update_actions));
}
@@ -145,25 +260,41 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
* @since 3.0.0
*/
class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
- var $in_loop = false;
- var $error = false;
-
- function __construct($args = array()) {
+ public $in_loop = false;
+ /**
+ * @var string|false
+ */
+ public $error = false;
+
+ /**
+ *
+ * @param array $args
+ */
+ public function __construct($args = array()) {
$defaults = array( 'url' => '', 'nonce' => '' );
$args = wp_parse_args($args, $defaults);
parent::__construct($args);
}
- function add_strings() {
+ /**
+ * @access public
+ */
+ public function add_strings() {
$this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
- $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s');
+ /* translators: 1: Title of an update, 2: Error message */
+ $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s');
+ /* translators: 1: Title of an update */
$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
- $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' '.__('Show Details').''.__('Hide Details').'.';
+ /* translators: 1: Title of an update */
+ $this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' ) . ' ' . __( 'Show Details' ) . '' . __( 'Hide Details' ) . '';
$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
}
- function feedback($string) {
+ /**
+ * @param string $string
+ */
+ public function feedback($string) {
if ( isset( $this->upgrader->strings[$string] ) )
$string = $this->upgrader->strings[$string];
@@ -184,21 +315,33 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
echo "$string
\n";
}
- function header() {
+ /**
+ * @access public
+ */
+ public function header() {
// Nothing, This will be displayed within a iframe.
}
- function footer() {
+ /**
+ * @access public
+ */
+ public function footer() {
// Nothing, This will be displayed within a iframe.
}
- function error($error) {
+
+ /**
+ *
+ * @param string|WP_Error $error
+ */
+ public function error($error) {
if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
$this->error = $this->upgrader->strings[$error];
if ( is_wp_error($error) ) {
+ $messages = array();
foreach ( $error->get_error_messages() as $emessage ) {
if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
- $messages[] = $emessage . ' ' . esc_html( $error->get_error_data() );
+ $messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
else
$messages[] = $emessage;
}
@@ -207,29 +350,44 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
echo '';
}
- function bulk_header() {
+ /**
+ * @access public
+ */
+ public function bulk_header() {
$this->feedback('skin_upgrade_start');
}
- function bulk_footer() {
+ /**
+ * @access public
+ */
+ public function bulk_footer() {
$this->feedback('skin_upgrade_end');
}
- function before($title = '') {
+ /**
+ *
+ * @param string $title
+ */
+ public function before($title = '') {
$this->in_loop = true;
- printf( '' . $this->upgrader->strings['skin_before_update_header'] . '
', $title, $this->upgrader->update_current, $this->upgrader->update_count);
+ printf( '' . $this->upgrader->strings['skin_before_update_header'] . '
', $title, $this->upgrader->update_current, $this->upgrader->update_count );
echo '';
echo '';
$this->flush_output();
}
- function after($title = '') {
+ /**
+ *
+ * @param string $title
+ */
+ public function after($title = '') {
echo '
' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '
' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, '' . $this->error . '' ) . '
' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '
';
- printf( '
' . __( 'Updating translations for %1$s (%2$s)…' ) . '
', $name, $this->language_update->language );
+ printf( '
' . __( 'Updating translations for %1$s (%2$s)…' ) . '
', $name, $this->language_update->language );
}
- function error( $error ) {
+ /**
+ *
+ * @param string|WP_Error $error
+ */
+ public function error( $error ) {
echo '
';
parent::error( $error );
echo '
';
}
- function after() {
+ /**
+ * @access public
+ */
+ public function after() {
echo '