TGMPA / TGM-Plugin-Activation

classes/TGM_Plugin_Activation.php

Doc Comments +1 added lines, -1 removed lines

@@ -2107,7 +2107,7 @@
 		 *
 		 * @since 2.4.0
 		 *
-		 * @return \TGM_Plugin_Activation The TGM_Plugin_Activation object.
+		 * @return TGM_Plugin_Activation The TGM_Plugin_Activation object.
 		 */
 		public static function get_instance() {
 			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof self ) ) {

Spacing +78 added lines, -78 removed lines

@@ -667,11 +667,11 @@ 
 			$args = apply_filters(
 				'tgmpa_admin_menu_args',
 				array(
-					'parent_slug' => $this->parent_slug,                     // Parent Menu slug.
-					'page_title'  => $this->strings['page_title'],           // Page title.
-					'menu_title'  => $this->strings['menu_title'],           // Menu title.
-					'capability'  => $this->capability,                      // Capability.
-					'menu_slug'   => $this->menu,                            // Menu slug.
+					'parent_slug' => $this->parent_slug, // Parent Menu slug.
+					'page_title'  => $this->strings['page_title'], // Page title.
+					'menu_title'  => $this->strings['menu_title'], // Menu title.
+					'capability'  => $this->capability, // Capability.
+					'menu_slug'   => $this->menu, // Menu slug.
 					'function'    => array( $this, 'install_plugins_page' ), // Callback.
 				)
 			);
@@ -784,7 +784,7 @@ 
 			// All plugin information will be stored in an array for processing.
 			$slug = $this->sanitize_key( urldecode( $_GET['plugin'] ) );
 
-			if ( ! isset( $this->plugins[ $slug ] ) ) {
+			if ( ! isset( $this->plugins[$slug] ) ) {
 				return false;
 			}
 
@@ -829,7 +829,7 @@ 
 				$extra         = array();
 				$extra['slug'] = $slug; // Needed for potentially renaming of directory name.
 				$source        = $this->get_download_url( $slug );
-				$api           = ( 'repo' === $this->plugins[ $slug ]['source_type'] ) ? $this->get_plugins_api( $slug ) : null;
+				$api           = ( 'repo' === $this->plugins[$slug]['source_type'] ) ? $this->get_plugins_api( $slug ) : null;
 				$api           = ( false !== $api ) ? $api : null;
 
 				$url = add_query_arg(
@@ -846,8 +846,8 @@ 
 
 				$title     = ( 'update' === $install_type ) ? $this->strings['updating'] : $this->strings['installing'];
 				$skin_args = array(
-					'type'   => ( 'bundled' !== $this->plugins[ $slug ]['source_type'] ) ? 'web' : 'upload',
-					'title'  => sprintf( $title, $this->plugins[ $slug ]['name'] ),
+					'type'   => ( 'bundled' !== $this->plugins[$slug]['source_type'] ) ? 'web' : 'upload',
+					'title'  => sprintf( $title, $this->plugins[$slug]['name'] ),
 					'url'    => esc_url_raw( $url ),
 					'nonce'  => $install_type . '-plugin_' . $slug,
 					'plugin' => '',
@@ -857,7 +857,7 @@ 
 				unset( $title );
 
 				if ( 'update' === $install_type ) {
-					$skin_args['plugin'] = $this->plugins[ $slug ]['file_path'];
+					$skin_args['plugin'] = $this->plugins[$slug]['file_path'];
 					$skin                = new Plugin_Upgrader_Skin( $skin_args );
 				} else {
 					$skin = new Plugin_Installer_Skin( $skin_args );
@@ -872,12 +872,12 @@ 
 				if ( 'update' === $install_type ) {
 					// Inject our info into the update transient.
 					$to_inject                    = array(
-						$slug => $this->plugins[ $slug ],
+						$slug => $this->plugins[$slug],
 					);
-					$to_inject[ $slug ]['source'] = $source;
+					$to_inject[$slug]['source'] = $source;
 					$this->inject_update_info( $to_inject );
 
-					$upgrader->upgrade( $this->plugins[ $slug ]['file_path'] );
+					$upgrader->upgrade( $this->plugins[$slug]['file_path'] );
 				} else {
 					$upgrader->install( $source );
 				}
@@ -907,11 +907,11 @@ 
 				}
 
 				return true;
-			} elseif ( isset( $this->plugins[ $slug ]['file_path'], $_GET['tgmpa-activate'] ) && 'activate-plugin' === $_GET['tgmpa-activate'] ) {
+			} elseif ( isset( $this->plugins[$slug]['file_path'], $_GET['tgmpa-activate'] ) && 'activate-plugin' === $_GET['tgmpa-activate'] ) {
 				// Activate action link was clicked.
 				check_admin_referer( 'tgmpa-activate', 'tgmpa-nonce' );
 
-				if ( false === $this->activate_single_plugin( $this->plugins[ $slug ]['file_path'], $slug ) ) {
+				if ( false === $this->activate_single_plugin( $this->plugins[$slug]['file_path'], $slug ) ) {
 					return true; // Finish execution of the function early as we encountered an error.
 				}
 			}
@@ -936,17 +936,17 @@ 
 			foreach ( $plugins as $slug => $plugin ) {
 				$file_path = $plugin['file_path'];
 
-				if ( empty( $repo_updates->response[ $file_path ] ) ) {
-					$repo_updates->response[ $file_path ] = new stdClass();
+				if ( empty( $repo_updates->response[$file_path] ) ) {
+					$repo_updates->response[$file_path] = new stdClass();
 				}
 
 				// We only really need to set package, but let's do all we can in case WP changes something.
-				$repo_updates->response[ $file_path ]->slug        = $slug;
-				$repo_updates->response[ $file_path ]->plugin      = $file_path;
-				$repo_updates->response[ $file_path ]->new_version = $plugin['version'];
-				$repo_updates->response[ $file_path ]->package     = $plugin['source'];
-				if ( empty( $repo_updates->response[ $file_path ]->url ) && ! empty( $plugin['external_url'] ) ) {
-					$repo_updates->response[ $file_path ]->url = $plugin['external_url'];
+				$repo_updates->response[$file_path]->slug        = $slug;
+				$repo_updates->response[$file_path]->plugin      = $file_path;
+				$repo_updates->response[$file_path]->new_version = $plugin['version'];
+				$repo_updates->response[$file_path]->package     = $plugin['source'];
+				if ( empty( $repo_updates->response[$file_path]->url ) && ! empty( $plugin['external_url'] ) ) {
+					$repo_updates->response[$file_path]->url = $plugin['external_url'];
 				}
 			}
 
@@ -989,7 +989,7 @@ 
 			} else {
 				// Bulk installer contains less info, so fall back on the info registered here.
 				foreach ( $this->plugins as $slug => $plugin ) {
-					if ( ! empty( $upgrader->skin->plugin_names[ $upgrader->skin->i ] ) && $plugin['name'] === $upgrader->skin->plugin_names[ $upgrader->skin->i ] ) {
+					if ( ! empty( $upgrader->skin->plugin_names[$upgrader->skin->i] ) && $plugin['name'] === $upgrader->skin->plugin_names[$upgrader->skin->i] ) {
 						$desired_slug = $slug;
 						break;
 					}
@@ -1056,7 +1056,7 @@ 
 						// Make sure message doesn't display again if bulk activation is performed
 						// immediately after a single activation.
 						if ( ! isset( $_POST['action'] ) ) { // WPCS: CSRF OK.
-							echo '<div id="message" class="updated"><p>', esc_html( $this->strings['activated_successfully'] ), ' <strong>', esc_html( $this->plugins[ $slug ]['name'] ), '.</strong></p></div>';
+							echo '<div id="message" class="updated"><p>', esc_html( $this->strings['activated_successfully'] ), ' <strong>', esc_html( $this->plugins[$slug]['name'] ), '.</strong></p></div>';
 						}
 					} else {
 						// Simpler message layout for use on the plugin install page.
@@ -1069,7 +1069,7 @@ 
 				echo '<div id="message" class="error"><p>',
 					sprintf(
 						esc_html( $this->strings['plugin_already_active'] ),
-						'<strong>' . esc_html( $this->plugins[ $slug ]['name'] ) . '</strong>'
+						'<strong>' . esc_html( $this->plugins[$slug]['name'] ) . '</strong>'
 					),
 					'</p></div>';
 			} elseif ( $this->does_plugin_require_update( $slug ) ) {
@@ -1080,13 +1080,13 @@ 
 						echo '<div id="message" class="error"><p>',
 							sprintf(
 								esc_html( $this->strings['plugin_needs_higher_version'] ),
-								'<strong>' . esc_html( $this->plugins[ $slug ]['name'] ) . '</strong>'
+								'<strong>' . esc_html( $this->plugins[$slug]['name'] ) . '</strong>'
 							),
 							'</p></div>';
 					}
 				} else {
 					// Simpler message layout for use on the plugin install page.
-					echo '<p>', sprintf( esc_html( $this->strings['plugin_needs_higher_version'] ), esc_html( $this->plugins[ $slug ]['name'] ) ), '</p>';
+					echo '<p>', sprintf( esc_html( $this->strings['plugin_needs_higher_version'] ), esc_html( $this->plugins[$slug]['name'] ) ), '</p>';
 				}
 			}
 
@@ -1213,7 +1213,7 @@ 
 						$rendered .= sprintf(
 							$line_template,
 							sprintf(
-								translate_nooped_plural( $this->strings[ $type ], $count, 'tgmpa' ),
+								translate_nooped_plural( $this->strings[$type], $count, 'tgmpa' ),
 								$imploded,
 								$count
 							)
@@ -1330,7 +1330,7 @@ 
 
 			foreach ( (array) $wp_settings_errors as $key => $details ) {
 				if ( 'tgmpa' === $details['setting'] ) {
-					unset( $wp_settings_errors[ $key ] );
+					unset( $wp_settings_errors[$key] );
 					break;
 				}
 			}
@@ -1366,20 +1366,20 @@ 
 				return;
 			}
 
-			if ( empty( $plugin['slug'] ) || ! is_string( $plugin['slug'] ) || isset( $this->plugins[ $plugin['slug'] ] ) ) {
+			if ( empty( $plugin['slug'] ) || ! is_string( $plugin['slug'] ) || isset( $this->plugins[$plugin['slug']] ) ) {
 				return;
 			}
 
 			$defaults = array(
-				'name'               => '',      // String
-				'slug'               => '',      // String
-				'source'             => 'repo',  // String
-				'required'           => false,   // Boolean
-				'version'            => '',      // String
-				'force_activation'   => false,   // Boolean
-				'force_deactivation' => false,   // Boolean
-				'external_url'       => '',      // String
-				'is_callable'        => '',      // String|Array.
+				'name'               => '', // String
+				'slug'               => '', // String
+				'source'             => 'repo', // String
+				'required'           => false, // Boolean
+				'version'            => '', // String
+				'force_activation'   => false, // Boolean
+				'force_deactivation' => false, // Boolean
+				'external_url'       => '', // String
+				'is_callable'        => '', // String|Array.
 			);
 
 			// Prepare the received data.
@@ -1400,8 +1400,8 @@ 
 			$plugin['source_type'] = $this->get_plugin_source_type( $plugin['source'] );
 
 			// Set the class properties.
-			$this->plugins[ $plugin['slug'] ]    = $plugin;
-			$this->sort_order[ $plugin['slug'] ] = $plugin['name'];
+			$this->plugins[$plugin['slug']]    = $plugin;
+			$this->sort_order[$plugin['slug']] = $plugin['name'];
 
 			// Should we add the force activation hook ?
 			if ( true === $plugin['force_activation'] ) {
@@ -1485,11 +1485,11 @@ 
 			);
 
 			foreach ( $keys as $key ) {
-				if ( isset( $config[ $key ] ) ) {
-					if ( is_array( $config[ $key ] ) ) {
-						$this->$key = array_merge( $this->$key, $config[ $key ] );
+				if ( isset( $config[$key] ) ) {
+					if ( is_array( $config[$key] ) ) {
+						$this->$key = array_merge( $this->$key, $config[$key] );
 					} else {
-						$this->$key = $config[ $key ];
+						$this->$key = $config[$key];
 					}
 				}
 			}
@@ -1534,12 +1534,12 @@ 
 		 *                            Parameter added in v2.5.0.
 		 */
 		public function populate_file_path( $plugin_slug = '' ) {
-			if ( ! empty( $plugin_slug ) && is_string( $plugin_slug ) && isset( $this->plugins[ $plugin_slug ] ) ) {
-				$this->plugins[ $plugin_slug ]['file_path'] = $this->_get_plugin_basename_from_slug( $plugin_slug );
+			if ( ! empty( $plugin_slug ) && is_string( $plugin_slug ) && isset( $this->plugins[$plugin_slug] ) ) {
+				$this->plugins[$plugin_slug]['file_path'] = $this->_get_plugin_basename_from_slug( $plugin_slug );
 			} else {
 				// Add file_path key for all plugins.
 				foreach ( $this->plugins as $slug => $values ) {
-					$this->plugins[ $slug ]['file_path'] = $this->_get_plugin_basename_from_slug( $slug );
+					$this->plugins[$slug]['file_path'] = $this->_get_plugin_basename_from_slug( $slug );
 				}
 			}
 		}
@@ -1579,8 +1579,8 @@ 
 		 */
 		public function _get_plugin_data_from_name( $name, $data = 'slug' ) {
 			foreach ( $this->plugins as $values ) {
-				if ( $name === $values['name'] && isset( $values[ $data ] ) ) {
-					return $values[ $data ];
+				if ( $name === $values['name'] && isset( $values[$data] ) ) {
+					return $values[$data];
 				}
 			}
 
@@ -1598,13 +1598,13 @@ 
 		public function get_download_url( $slug ) {
 			$dl_source = '';
 
-			switch ( $this->plugins[ $slug ]['source_type'] ) {
+			switch ( $this->plugins[$slug]['source_type'] ) {
 				case 'repo':
 					return $this->get_wp_repo_download_url( $slug );
 				case 'external':
-					return $this->plugins[ $slug ]['source'];
+					return $this->plugins[$slug]['source'];
 				case 'bundled':
-					return $this->default_path . $this->plugins[ $slug ]['source'];
+					return $this->default_path . $this->plugins[$slug]['source'];
 			}
 
 			return $dl_source; // Should never happen.
@@ -1640,7 +1640,7 @@ 
 		protected function get_plugins_api( $slug ) {
 			static $api = array(); // Cache received responses.
 
-			if ( ! isset( $api[ $slug ] ) ) {
+			if ( ! isset( $api[$slug] ) ) {
 				if ( ! function_exists( 'plugins_api' ) ) {
 					require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
 				}
@@ -1655,16 +1655,16 @@ 
 					)
 				);
 
-				$api[ $slug ] = false;
+				$api[$slug] = false;
 
 				if ( is_wp_error( $response ) ) {
 					wp_die( esc_html( $this->strings['oops'] ) );
 				} else {
-					$api[ $slug ] = $response;
+					$api[$slug] = $response;
 				}
 			}
 
-			return $api[ $slug ];
+			return $api[$slug];
 		}
 
 		/**
@@ -1677,13 +1677,13 @@ 
 		 *                or the plugin name if not.
 		 */
 		public function get_info_link( $slug ) {
-			if ( ! empty( $this->plugins[ $slug ]['external_url'] ) && preg_match( self::IS_URL_REGEX, $this->plugins[ $slug ]['external_url'] ) ) {
+			if ( ! empty( $this->plugins[$slug]['external_url'] ) && preg_match( self::IS_URL_REGEX, $this->plugins[$slug]['external_url'] ) ) {
 				$link = sprintf(
 					'<a href="%1$s" target="_blank">%2$s</a>',
-					esc_url( $this->plugins[ $slug ]['external_url'] ),
-					esc_html( $this->plugins[ $slug ]['name'] )
+					esc_url( $this->plugins[$slug]['external_url'] ),
+					esc_html( $this->plugins[$slug]['name'] )
 				);
-			} elseif ( 'repo' === $this->plugins[ $slug ]['source_type'] ) {
+			} elseif ( 'repo' === $this->plugins[$slug]['source_type'] ) {
 				$url = add_query_arg(
 					array(
 						'tab'       => 'plugin-information',
@@ -1698,10 +1698,10 @@ 
 				$link = sprintf(
 					'<a href="%1$s" class="thickbox">%2$s</a>',
 					esc_url( $url ),
-					esc_html( $this->plugins[ $slug ]['name'] )
+					esc_html( $this->plugins[$slug]['name'] )
 				);
 			} else {
-				$link = esc_html( $this->plugins[ $slug ]['name'] ); // No hyperlink.
+				$link = esc_html( $this->plugins[$slug]['name'] ); // No hyperlink.
 			}
 
 			return $link;
@@ -1826,7 +1826,7 @@ 
 		public function is_plugin_installed( $slug ) {
 			$installed_plugins = $this->get_plugins(); // Retrieve a list of all installed plugins (WP cached).
 
-			return ( ! empty( $installed_plugins[ $this->plugins[ $slug ]['file_path'] ] ) );
+			return ( ! empty( $installed_plugins[$this->plugins[$slug]['file_path']] ) );
 		}
 
 		/**
@@ -1838,7 +1838,7 @@ 
 		 * @return bool True if active, false otherwise.
 		 */
 		public function is_plugin_active( $slug ) {
-			return ( ( ! empty( $this->plugins[ $slug ]['is_callable'] ) && is_callable( $this->plugins[ $slug ]['is_callable'] ) ) || is_plugin_active( $this->plugins[ $slug ]['file_path'] ) );
+			return ( ( ! empty( $this->plugins[$slug]['is_callable'] ) && is_callable( $this->plugins[$slug]['is_callable'] ) ) || is_plugin_active( $this->plugins[$slug]['file_path'] ) );
 		}
 
 		/**
@@ -1852,7 +1852,7 @@ 
 		 */
 		public function can_plugin_update( $slug ) {
 			// We currently can't get reliable info on non-WP-repo plugins - issue #380.
-			if ( 'repo' !== $this->plugins[ $slug ]['source_type'] ) {
+			if ( 'repo' !== $this->plugins[$slug]['source_type'] ) {
 				return true;
 			}
 
@@ -1908,8 +1908,8 @@ 
 		public function get_installed_version( $slug ) {
 			$installed_plugins = $this->get_plugins(); // Retrieve a list of all installed plugins (WP cached).
 
-			if ( ! empty( $installed_plugins[ $this->plugins[ $slug ]['file_path'] ]['Version'] ) ) {
-				return $installed_plugins[ $this->plugins[ $slug ]['file_path'] ]['Version'];
+			if ( ! empty( $installed_plugins[$this->plugins[$slug]['file_path']]['Version'] ) ) {
+				return $installed_plugins[$this->plugins[$slug]['file_path']]['Version'];
 			}
 
 			return '';
@@ -1925,7 +1925,7 @@ 
 		 */
 		public function does_plugin_require_update( $slug ) {
 			$installed_version = $this->get_installed_version( $slug );
-			$minimum_version   = $this->plugins[ $slug ]['version'];
+			$minimum_version   = $this->plugins[$slug]['version'];
 
 			return version_compare( $minimum_version, $installed_version, '>' );
 		}
@@ -1940,9 +1940,9 @@ 
 		 */
 		public function does_plugin_have_update( $slug ) {
 			// Presume bundled and external plugins will point to a package which meets the minimum required version.
-			if ( 'repo' !== $this->plugins[ $slug ]['source_type'] ) {
+			if ( 'repo' !== $this->plugins[$slug]['source_type'] ) {
 				if ( $this->does_plugin_require_update( $slug ) ) {
-					return $this->plugins[ $slug ]['version'];
+					return $this->plugins[$slug]['version'];
 				}
 
 				return false;
@@ -1950,8 +1950,8 @@ 
 
 			$repo_updates = get_site_transient( 'update_plugins' );
 
-			if ( isset( $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->new_version ) ) {
-				return $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->new_version;
+			if ( isset( $repo_updates->response[$this->plugins[$slug]['file_path']]->new_version ) ) {
+				return $repo_updates->response[$this->plugins[$slug]['file_path']]->new_version;
 			}
 
 			return false;
@@ -1967,14 +1967,14 @@ 
 		 */
 		public function get_upgrade_notice( $slug ) {
 			// We currently can't get reliable info on non-WP-repo plugins - issue #380.
-			if ( 'repo' !== $this->plugins[ $slug ]['source_type'] ) {
+			if ( 'repo' !== $this->plugins[$slug]['source_type'] ) {
 				return '';
 			}
 
 			$repo_updates = get_site_transient( 'update_plugins' );
 
-			if ( ! empty( $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->upgrade_notice ) ) {
-				return $repo_updates->response[ $this->plugins[ $slug ]['file_path'] ]->upgrade_notice;
+			if ( ! empty( $repo_updates->response[$this->plugins[$slug]['file_path']]->upgrade_notice ) ) {
+				return $repo_updates->response[$this->plugins[$slug]['file_path']]->upgrade_notice;
 			}
 
 			return '';
@@ -2058,7 +2058,7 @@ 
 				 */
 				if ( true === $plugin['force_deactivation'] && is_plugin_active( $plugin['file_path'] ) ) {
 					deactivate_plugins( $plugin['file_path'] );
-					$deactivated[ $plugin['file_path'] ] = time();
+					$deactivated[$plugin['file_path']] = time();
 				}
 			}
 

classes/TGMPA_Utils.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		 */
 		protected static function emulate_filter_bool( $value ) {
 			// @codingStandardsIgnoreStart
-			static $true  = array(
+			static $true = array(
 				'1',
 				'true', 'True', 'TRUE',
 				'y', 'Y',

classes/TGMPA_Bulk_Installer_Skin.php

Indentation +99 added lines, -99 removed lines

@@ -65,23 +65,23 @@ 
 	   * @param array $args Arguments to pass for use within the class.
 	   */
 	  public function __construct( $args = array() ) {
-	    // Get TGMPA class instance.
-	    $this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
-	
-	    // Parse default and new args.
-	    $defaults = array(
-	      'url'          => '',
-	      'nonce'        => '',
-	      'names'        => array(),
-	      'install_type' => 'install',
-	    );
-	    $args     = wp_parse_args( $args, $defaults );
-	
-	    // Set plugin names to $this->plugin_names property.
-	    $this->plugin_names = $args['names'];
-	
-	    // Extract the new args.
-	    parent::__construct( $args );
+		// Get TGMPA class instance.
+		$this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
+	
+		// Parse default and new args.
+		$defaults = array(
+		  'url'          => '',
+		  'nonce'        => '',
+		  'names'        => array(),
+		  'install_type' => 'install',
+		);
+		$args     = wp_parse_args( $args, $defaults );
+	
+		// Set plugin names to $this->plugin_names property.
+		$this->plugin_names = $args['names'];
+	
+		// Extract the new args.
+		parent::__construct( $args );
 	  }
 	
 	  /**
@@ -93,39 +93,39 @@ 
 	   * @since 2.2.0
 	   */
 	  public function add_strings() {
-	    if ( 'update' === $this->options['install_type'] ) {
-	      parent::add_strings();
-	      /* translators: 1: plugin name, 2: action number 3: total number of actions. */
-	      $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
-	    } else {
-	      /* translators: 1: plugin name, 2: error message. */
-	      $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while installing %1$s: <strong>%2$s</strong>.', 'tgmpa' );
-	      /* translators: 1: plugin name. */
-	      $this->upgrader->strings['skin_update_failed'] = __( 'The installation of %1$s failed.', 'tgmpa' );
-	
-	      if ( $this->tgmpa->is_automatic ) {
-	        // Automatic activation strings.
-	        $this->upgrader->strings['skin_upgrade_start'] = __( 'The installation and activation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' );
-	        /* translators: 1: plugin name. */
-	        $this->upgrader->strings['skin_update_successful'] = __( '%1$s installed and activated successfully.', 'tgmpa' );
-	        $this->upgrader->strings['skin_upgrade_end']       = __( 'All installations and activations have been completed.', 'tgmpa' );
-	        /* translators: 1: plugin name, 2: action number 3: total number of actions. */
-	        $this->upgrader->strings['skin_before_update_header'] = __( 'Installing and Activating Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
-	      } else {
-	        // Default installation strings.
-	        $this->upgrader->strings['skin_upgrade_start'] = __( 'The installation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' );
-	        /* translators: 1: plugin name. */
-	        $this->upgrader->strings['skin_update_successful'] = __( '%1$s installed successfully.', 'tgmpa' );
-	        $this->upgrader->strings['skin_upgrade_end']       = __( 'All installations have been completed.', 'tgmpa' );
-	        /* translators: 1: plugin name, 2: action number 3: total number of actions. */
-	        $this->upgrader->strings['skin_before_update_header'] = __( 'Installing Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
-	      }
-	
-	      // Add "read more" link only for WP < 4.8.
-	      if ( version_compare( $this->tgmpa->wp_version, '4.8', '<' ) ) {
-	        $this->upgrader->strings['skin_update_successful'] .= ' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>' . esc_html__( 'Show Details', 'tgmpa' ) . '</span><span class="hidden">' . esc_html__( 'Hide Details', 'tgmpa' ) . '</span>.</a>';
-	      }
-	    }
+		if ( 'update' === $this->options['install_type'] ) {
+		  parent::add_strings();
+		  /* translators: 1: plugin name, 2: action number 3: total number of actions. */
+		  $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
+		} else {
+		  /* translators: 1: plugin name, 2: error message. */
+		  $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while installing %1$s: <strong>%2$s</strong>.', 'tgmpa' );
+		  /* translators: 1: plugin name. */
+		  $this->upgrader->strings['skin_update_failed'] = __( 'The installation of %1$s failed.', 'tgmpa' );
+	
+		  if ( $this->tgmpa->is_automatic ) {
+			// Automatic activation strings.
+			$this->upgrader->strings['skin_upgrade_start'] = __( 'The installation and activation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' );
+			/* translators: 1: plugin name. */
+			$this->upgrader->strings['skin_update_successful'] = __( '%1$s installed and activated successfully.', 'tgmpa' );
+			$this->upgrader->strings['skin_upgrade_end']       = __( 'All installations and activations have been completed.', 'tgmpa' );
+			/* translators: 1: plugin name, 2: action number 3: total number of actions. */
+			$this->upgrader->strings['skin_before_update_header'] = __( 'Installing and Activating Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
+		  } else {
+			// Default installation strings.
+			$this->upgrader->strings['skin_upgrade_start'] = __( 'The installation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' );
+			/* translators: 1: plugin name. */
+			$this->upgrader->strings['skin_update_successful'] = __( '%1$s installed successfully.', 'tgmpa' );
+			$this->upgrader->strings['skin_upgrade_end']       = __( 'All installations have been completed.', 'tgmpa' );
+			/* translators: 1: plugin name, 2: action number 3: total number of actions. */
+			$this->upgrader->strings['skin_before_update_header'] = __( 'Installing Plugin %1$s (%2$d/%3$d)', 'tgmpa' );
+		  }
+	
+		  // Add "read more" link only for WP < 4.8.
+		  if ( version_compare( $this->tgmpa->wp_version, '4.8', '<' ) ) {
+			$this->upgrader->strings['skin_update_successful'] .= ' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>' . esc_html__( 'Show Details', 'tgmpa' ) . '</span><span class="hidden">' . esc_html__( 'Hide Details', 'tgmpa' ) . '</span>.</a>';
+		  }
+		}
 	  }
 	
 	  /**
@@ -136,10 +136,10 @@ 
 	   * @param string $title Unused in this implementation.
 	   */
 	  public function before( $title = '' ) {
-	    if ( empty( $title ) ) {
-	      $title = esc_html( $this->plugin_names[ $this->i ] );
-	    }
-	    parent::before( $title );
+		if ( empty( $title ) ) {
+		  $title = esc_html( $this->plugin_names[ $this->i ] );
+		}
+		parent::before( $title );
 	  }
 	
 	  /**
@@ -153,12 +153,12 @@ 
 	   * @param string $title Unused in this implementation.
 	   */
 	  public function after( $title = '' ) {
-	    if ( empty( $title ) ) {
-	      $title = esc_html( $this->plugin_names[ $this->i ] );
-	    }
-	    parent::after( $title );
+		if ( empty( $title ) ) {
+		  $title = esc_html( $this->plugin_names[ $this->i ] );
+		}
+		parent::after( $title );
 	
-	    $this->i++;
+		$this->i++;
 	  }
 	
 	  /**
@@ -167,41 +167,41 @@ 
 	   * @since 2.2.0
 	   */
 	  public function bulk_footer() {
-	    // Serve up the string to say installations (and possibly activations) are complete.
-	    parent::bulk_footer();
-	
-	    // Flush plugins cache so we can make sure that the installed plugins list is always up to date.
-	    wp_clean_plugins_cache();
-	
-	    $this->tgmpa->show_tgmpa_version();
-	
-	    // Display message based on if all plugins are now active or not.
-	    $update_actions = array();
-	
-	    if ( $this->tgmpa->is_tgmpa_complete() ) {
-	      // All plugins are active, so we display the complete string and hide the menu to protect users.
-	      echo '<style type="text/css">#adminmenu .wp-submenu li.current { display: none !important; }</style>';
-	      $update_actions['dashboard'] = sprintf(
-	        esc_html( $this->tgmpa->strings['complete'] ),
-	        '<a href="' . esc_url( self_admin_url() ) . '">' . esc_html( $this->tgmpa->strings['dashboard'] ) . '</a>'
-	      );
-	    } else {
-	      $update_actions['tgmpa_page'] = '<a href="' . esc_url( $this->tgmpa->get_tgmpa_url() ) . '" target="_parent">' . esc_html( $this->tgmpa->strings['return'] ) . '</a>';
-	    }
-	
-	    /**
-	     * Filter the list of action links available following bulk plugin installs/updates.
-	     *
-	     * @since 2.5.0
-	     *
-	     * @param array $update_actions Array of plugin action links.
-	     * @param array $plugin_info    Array of information for the last-handled plugin.
-	     */
-	    $update_actions = apply_filters( 'tgmpa_update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
-	
-	    if ( ! empty( $update_actions ) ) {
-	      $this->feedback( implode( ' | ', (array) $update_actions ) );
-	    }
+		// Serve up the string to say installations (and possibly activations) are complete.
+		parent::bulk_footer();
+	
+		// Flush plugins cache so we can make sure that the installed plugins list is always up to date.
+		wp_clean_plugins_cache();
+	
+		$this->tgmpa->show_tgmpa_version();
+	
+		// Display message based on if all plugins are now active or not.
+		$update_actions = array();
+	
+		if ( $this->tgmpa->is_tgmpa_complete() ) {
+		  // All plugins are active, so we display the complete string and hide the menu to protect users.
+		  echo '<style type="text/css">#adminmenu .wp-submenu li.current { display: none !important; }</style>';
+		  $update_actions['dashboard'] = sprintf(
+			esc_html( $this->tgmpa->strings['complete'] ),
+			'<a href="' . esc_url( self_admin_url() ) . '">' . esc_html( $this->tgmpa->strings['dashboard'] ) . '</a>'
+		  );
+		} else {
+		  $update_actions['tgmpa_page'] = '<a href="' . esc_url( $this->tgmpa->get_tgmpa_url() ) . '" target="_parent">' . esc_html( $this->tgmpa->strings['return'] ) . '</a>';
+		}
+	
+		/**
+		 * Filter the list of action links available following bulk plugin installs/updates.
+		 *
+		 * @since 2.5.0
+		 *
+		 * @param array $update_actions Array of plugin action links.
+		 * @param array $plugin_info    Array of information for the last-handled plugin.
+		 */
+		$update_actions = apply_filters( 'tgmpa_update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
+	
+		if ( ! empty( $update_actions ) ) {
+		  $this->feedback( implode( ' | ', (array) $update_actions ) );
+		}
 	  }
 	
 	  /* *********** DEPRECATED METHODS *********** */
@@ -214,8 +214,8 @@ 
 	   * @see        Bulk_Upgrader_Skin::flush_output()
 	   */
 	  public function before_flush_output() {
-	    _deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' );
-	    $this->flush_output();
+		_deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' );
+		$this->flush_output();
 	  }
 	
 	  /**
@@ -227,8 +227,8 @@ 
 	   * @see        Bulk_Upgrader_Skin::flush_output()
 	   */
 	  public function after_flush_output() {
-	    _deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' );
-	    $this->flush_output();
-	    $this->i++;
+		_deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' );
+		$this->flush_output();
+		$this->i++;
 	  }
 	}

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 	      'names'        => array(),
 	      'install_type' => 'install',
 	    );
-	    $args     = wp_parse_args( $args, $defaults );
+	    $args = wp_parse_args( $args, $defaults );
 	
 	    // Set plugin names to $this->plugin_names property.
 	    $this->plugin_names = $args['names'];
@@ -137,7 +137,7 @@ 
 	   */
 	  public function before( $title = '' ) {
 	    if ( empty( $title ) ) {
-	      $title = esc_html( $this->plugin_names[ $this->i ] );
+	      $title = esc_html( $this->plugin_names[$this->i] );
 	    }
 	    parent::before( $title );
 	  }
@@ -154,7 +154,7 @@ 
 	   */
 	  public function after( $title = '' ) {
 	    if ( empty( $title ) ) {
-	      $title = esc_html( $this->plugin_names[ $this->i ] );
+	      $title = esc_html( $this->plugin_names[$this->i] );
 	    }
 	    parent::after( $title );
 	

classes/TGMPA_Bulk_Installer.php

Indentation +148 added lines, -148 removed lines

@@ -63,20 +63,20 @@ 
 	   * @param \Bulk_Upgrader_Skin|null $skin Installer skin.
 	   */
 	  public function __construct( $skin = null ) {
-	    // Get TGMPA class instance.
-	    $this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
+		// Get TGMPA class instance.
+		$this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) );
 	
-	    parent::__construct( $skin );
+		parent::__construct( $skin );
 	
-	    if ( isset( $this->skin->options['install_type'] ) && 'update' === $this->skin->options['install_type'] ) {
-	      $this->clear_destination = true;
-	    }
+		if ( isset( $this->skin->options['install_type'] ) && 'update' === $this->skin->options['install_type'] ) {
+		  $this->clear_destination = true;
+		}
 	
-	    if ( $this->tgmpa->is_automatic ) {
-	      $this->activate_strings();
-	    }
+		if ( $this->tgmpa->is_automatic ) {
+		  $this->activate_strings();
+		}
 	
-	    add_action( 'upgrader_process_complete', array( $this->tgmpa, 'populate_file_path' ) );
+		add_action( 'upgrader_process_complete', array( $this->tgmpa, 'populate_file_path' ) );
 	  }
 	
 	  /**
@@ -85,8 +85,8 @@ 
 	   * @since 2.2.0
 	   */
 	  public function activate_strings() {
-	    $this->strings['activation_failed']  = __( 'Plugin activation failed.', 'tgmpa' );
-	    $this->strings['activation_success'] = __( 'Plugin activated successfully.', 'tgmpa' );
+		$this->strings['activation_failed']  = __( 'Plugin activation failed.', 'tgmpa' );
+		$this->strings['activation_success'] = __( 'Plugin activated successfully.', 'tgmpa' );
 	  }
 	
 	  /**
@@ -100,18 +100,18 @@ 
 	   * @return null|array Return early if error, array of installation data on success.
 	   */
 	  public function run( $options ) {
-	    $result = parent::run( $options );
-	
-	    // Reset the strings in case we changed one during automatic activation.
-	    if ( $this->tgmpa->is_automatic ) {
-	      if ( 'update' === $this->skin->options['install_type'] ) {
-	        $this->upgrade_strings();
-	      } else {
-	        $this->install_strings();
-	      }
-	    }
-	
-	    return $result;
+		$result = parent::run( $options );
+	
+		// Reset the strings in case we changed one during automatic activation.
+		if ( $this->tgmpa->is_automatic ) {
+		  if ( 'update' === $this->skin->options['install_type'] ) {
+			$this->upgrade_strings();
+		  } else {
+			$this->install_strings();
+		  }
+		}
+	
+		return $result;
 	  }
 	
 	  /**
@@ -134,59 +134,59 @@ 
 	   * @return array|false   Install confirmation messages on success, false on failure.
 	   */
 	  public function bulk_install( $plugins, $args = array() ) {
-	    // [TGMPA + ] Hook auto-activation in.
-	    add_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+		// [TGMPA + ] Hook auto-activation in.
+		add_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
 	
-	    $defaults    = array(
-	      'clear_update_cache' => true,
-	    );
-	    $parsed_args = wp_parse_args( $args, $defaults );
+		$defaults    = array(
+		  'clear_update_cache' => true,
+		);
+		$parsed_args = wp_parse_args( $args, $defaults );
 	
-	    $this->init();
-	    $this->bulk = true;
+		$this->init();
+		$this->bulk = true;
 	
-	    $this->install_strings(); // [TGMPA + ] adjusted.
+		$this->install_strings(); // [TGMPA + ] adjusted.
 	
-	    /* [TGMPA - ] $current = get_site_transient( 'update_plugins' ); */
+		/* [TGMPA - ] $current = get_site_transient( 'update_plugins' ); */
 	
-	    /* [TGMPA - ] add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4); */
+		/* [TGMPA - ] add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4); */
 	
-	    $this->skin->header();
+		$this->skin->header();
 	
-	    // Connect to the Filesystem first.
-	    $res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
-	    if ( ! $res ) {
-	      $this->skin->footer();
-	      return false;
-	    }
+		// Connect to the Filesystem first.
+		$res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
+		if ( ! $res ) {
+		  $this->skin->footer();
+		  return false;
+		}
 	
-	    $this->skin->bulk_header();
+		$this->skin->bulk_header();
 	
-	    /*
+		/*
 	     * Only start maintenance mode if:
 	     * - running Multisite and there are one or more plugins specified, OR
 	     * - a plugin with an update available is currently active.
 	     * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 	     */
-	    $maintenance = ( is_multisite() && ! empty( $plugins ) );
+		$maintenance = ( is_multisite() && ! empty( $plugins ) );
 	
-	    /*
+		/*
 	    [TGMPA - ]
 	    foreach ( $plugins as $plugin )
 	      $maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
 	    */
-	    if ( $maintenance ) {
-	      $this->maintenance_mode( true );
-	    }
+		if ( $maintenance ) {
+		  $this->maintenance_mode( true );
+		}
 	
-	    $results = array();
+		$results = array();
 	
-	    $this->update_count   = count( $plugins );
-	    $this->update_current = 0;
-	    foreach ( $plugins as $plugin ) {
-	      $this->update_current++;
+		$this->update_count   = count( $plugins );
+		$this->update_current = 0;
+		foreach ( $plugins as $plugin ) {
+		  $this->update_current++;
 	
-	      /*
+		  /*
 	      [TGMPA - ]
 	      $this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true);
 	
@@ -205,70 +205,70 @@ 
 	      $this->skin->plugin_active = is_plugin_active($plugin);
 	      */
 	
-	      $result = $this->run(
-	        array(
-	          'package'           => $plugin, // [TGMPA + ] adjusted.
-	          'destination'       => WP_PLUGIN_DIR,
-	          'clear_destination' => false, // [TGMPA + ] adjusted.
-	          'clear_working'     => true,
-	          'is_multi'          => true,
-	          'hook_extra'        => array(
-	            'plugin' => $plugin,
-	          ),
-	        )
-	      );
-	
-	      $results[ $plugin ] = $this->result;
-	
-	      // Prevent credentials auth screen from displaying multiple times.
-	      if ( false === $result ) {
-	        break;
-	      }
-	    }
-	
-	    $this->maintenance_mode( false );
-	
-	    /**
-	     * Fires when the bulk upgrader process is complete.
-	     *
-	     * @since WP 3.6.0 / TGMPA 2.5.0
-	     *
-	     * @param Plugin_Upgrader $this Plugin_Upgrader instance. In other contexts, $this, might
-	     *                              be a Theme_Upgrader or Core_Upgrade instance.
-	     * @param array           $data {
-	     *     Array of bulk item update data.
-	     *
-	     *     @type string $action   Type of action. Default 'update'.
-	     *     @type string $type     Type of update process. Accepts 'plugin', 'theme', or 'core'.
-	     *     @type bool   $bulk     Whether the update process is a bulk update. Default true.
-	     *     @type array  $packages Array of plugin, theme, or core packages to update.
-	     * }
-	     */
-	    do_action( // WPCS: prefix OK.
-	      'upgrader_process_complete',
-	      $this,
-	      array(
-	        'action'  => 'install', // [TGMPA + ] adjusted.
-	        'type'    => 'plugin',
-	        'bulk'    => true,
-	        'plugins' => $plugins,
-	      )
-	    );
-	
-	    $this->skin->bulk_footer();
-	
-	    $this->skin->footer();
-	
-	    // Cleanup our hooks, in case something else does a upgrade on this connection.
-	    /* [TGMPA - ] remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin')); */
-	
-	    // [TGMPA + ] Remove our auto-activation hook.
-	    remove_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
-	
-	    // Force refresh of plugin update information.
-	    wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
-	
-	    return $results;
+		  $result = $this->run(
+			array(
+			  'package'           => $plugin, // [TGMPA + ] adjusted.
+			  'destination'       => WP_PLUGIN_DIR,
+			  'clear_destination' => false, // [TGMPA + ] adjusted.
+			  'clear_working'     => true,
+			  'is_multi'          => true,
+			  'hook_extra'        => array(
+				'plugin' => $plugin,
+			  ),
+			)
+		  );
+	
+		  $results[ $plugin ] = $this->result;
+	
+		  // Prevent credentials auth screen from displaying multiple times.
+		  if ( false === $result ) {
+			break;
+		  }
+		}
+	
+		$this->maintenance_mode( false );
+	
+		/**
+		 * Fires when the bulk upgrader process is complete.
+		 *
+		 * @since WP 3.6.0 / TGMPA 2.5.0
+		 *
+		 * @param Plugin_Upgrader $this Plugin_Upgrader instance. In other contexts, $this, might
+		 *                              be a Theme_Upgrader or Core_Upgrade instance.
+		 * @param array           $data {
+		 *     Array of bulk item update data.
+		 *
+		 *     @type string $action   Type of action. Default 'update'.
+		 *     @type string $type     Type of update process. Accepts 'plugin', 'theme', or 'core'.
+		 *     @type bool   $bulk     Whether the update process is a bulk update. Default true.
+		 *     @type array  $packages Array of plugin, theme, or core packages to update.
+		 * }
+		 */
+		do_action( // WPCS: prefix OK.
+		  'upgrader_process_complete',
+		  $this,
+		  array(
+			'action'  => 'install', // [TGMPA + ] adjusted.
+			'type'    => 'plugin',
+			'bulk'    => true,
+			'plugins' => $plugins,
+		  )
+		);
+	
+		$this->skin->bulk_footer();
+	
+		$this->skin->footer();
+	
+		// Cleanup our hooks, in case something else does a upgrade on this connection.
+		/* [TGMPA - ] remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin')); */
+	
+		// [TGMPA + ] Remove our auto-activation hook.
+		remove_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+	
+		// Force refresh of plugin update information.
+		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+	
+		return $results;
 	  }
 	
 	  /**
@@ -284,13 +284,13 @@ 
 	   */
 	  public function bulk_upgrade( $plugins, $args = array() ) {
 	
-	    add_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+		add_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
 	
-	    $result = parent::bulk_upgrade( $plugins, $args );
+		$result = parent::bulk_upgrade( $plugins, $args );
 	
-	    remove_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
+		remove_filter( 'upgrader_post_install', array( $this, 'auto_activate' ), 10 );
 	
-	    return $result;
+		return $result;
 	  }
 	
 	  /**
@@ -304,30 +304,30 @@ 
 	   * @return bool
 	   */
 	  public function auto_activate( $bool ) {
-	    // Only process the activation of installed plugins if the automatic flag is set to true.
-	    if ( $this->tgmpa->is_automatic ) {
-	      // Flush plugins cache so the headers of the newly installed plugins will be read correctly.
-	      wp_clean_plugins_cache();
-	
-	      // Get the installed plugin file.
-	      $plugin_info = $this->plugin_info();
-	
-	      // Don't try to activate on upgrade of active plugin as WP will do this already.
-	      if ( ! is_plugin_active( $plugin_info ) ) {
-	        $activate = activate_plugin( $plugin_info );
-	
-	        // Adjust the success string based on the activation result.
-	        $this->strings['process_success'] = $this->strings['process_success'] . "<br />\n";
-	
-	        if ( is_wp_error( $activate ) ) {
-	          $this->skin->error( $activate );
-	          $this->strings['process_success'] .= $this->strings['activation_failed'];
-	        } else {
-	          $this->strings['process_success'] .= $this->strings['activation_success'];
-	        }
-	      }
-	    }
-	
-	    return $bool;
+		// Only process the activation of installed plugins if the automatic flag is set to true.
+		if ( $this->tgmpa->is_automatic ) {
+		  // Flush plugins cache so the headers of the newly installed plugins will be read correctly.
+		  wp_clean_plugins_cache();
+	
+		  // Get the installed plugin file.
+		  $plugin_info = $this->plugin_info();
+	
+		  // Don't try to activate on upgrade of active plugin as WP will do this already.
+		  if ( ! is_plugin_active( $plugin_info ) ) {
+			$activate = activate_plugin( $plugin_info );
+	
+			// Adjust the success string based on the activation result.
+			$this->strings['process_success'] = $this->strings['process_success'] . "<br />\n";
+	
+			if ( is_wp_error( $activate ) ) {
+			  $this->skin->error( $activate );
+			  $this->strings['process_success'] .= $this->strings['activation_failed'];
+			} else {
+			  $this->strings['process_success'] .= $this->strings['activation_success'];
+			}
+		  }
+		}
+	
+		return $bool;
 	  }
 	}

Spacing +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
 	        )
 	      );
 	
-	      $results[ $plugin ] = $this->result;
+	      $results[$plugin] = $this->result;
 	
 	      // Prevent credentials auth screen from displaying multiple times.
 	      if ( false === $result ) {

classes/TGMPA_List_Table.php

Spacing +35 added lines, -35 removed lines

@@ -111,30 +111,30 @@ 
 			$i          = 0;
 
 			// Redirect to the 'all' view if no plugins were found for the selected view context.
-			if ( empty( $plugins[ $this->view_context ] ) ) {
+			if ( empty( $plugins[$this->view_context] ) ) {
 				$this->view_context = 'all';
 			}
 
-			foreach ( $plugins[ $this->view_context ] as $slug => $plugin ) {
-				$table_data[ $i ]['sanitized_plugin']  = $plugin['name'];
-				$table_data[ $i ]['slug']              = $slug;
-				$table_data[ $i ]['plugin']            = '<strong>' . $this->tgmpa->get_info_link( $slug ) . '</strong>';
-				$table_data[ $i ]['source']            = $this->get_plugin_source_type_text( $plugin['source_type'] );
-				$table_data[ $i ]['type']              = $this->get_plugin_advise_type_text( $plugin['required'] );
-				$table_data[ $i ]['status']            = $this->get_plugin_status_text( $slug );
-				$table_data[ $i ]['installed_version'] = $this->tgmpa->get_installed_version( $slug );
-				$table_data[ $i ]['minimum_version']   = $plugin['version'];
-				$table_data[ $i ]['available_version'] = $this->tgmpa->does_plugin_have_update( $slug );
+			foreach ( $plugins[$this->view_context] as $slug => $plugin ) {
+				$table_data[$i]['sanitized_plugin']  = $plugin['name'];
+				$table_data[$i]['slug']              = $slug;
+				$table_data[$i]['plugin']            = '<strong>' . $this->tgmpa->get_info_link( $slug ) . '</strong>';
+				$table_data[$i]['source']            = $this->get_plugin_source_type_text( $plugin['source_type'] );
+				$table_data[$i]['type']              = $this->get_plugin_advise_type_text( $plugin['required'] );
+				$table_data[$i]['status']            = $this->get_plugin_status_text( $slug );
+				$table_data[$i]['installed_version'] = $this->tgmpa->get_installed_version( $slug );
+				$table_data[$i]['minimum_version']   = $plugin['version'];
+				$table_data[$i]['available_version'] = $this->tgmpa->does_plugin_have_update( $slug );
 
 				// Prep the upgrade notice info.
 				$upgrade_notice = $this->tgmpa->get_upgrade_notice( $slug );
 				if ( ! empty( $upgrade_notice ) ) {
-					$table_data[ $i ]['upgrade_notice'] = $upgrade_notice;
+					$table_data[$i]['upgrade_notice'] = $upgrade_notice;
 
 					add_action( "tgmpa_after_plugin_row_{$slug}", array( $this, 'wp_plugin_update_row' ), 10, 2 );
 				}
 
-				$table_data[ $i ] = apply_filters( 'tgmpa_table_data_item', $table_data[ $i ], $plugin );
+				$table_data[$i] = apply_filters( 'tgmpa_table_data_item', $table_data[$i], $plugin );
 
 				$i++;
 			}
@@ -160,17 +160,17 @@ 
 					// No need to display plugins if they are installed, up-to-date and active.
 					continue;
 				} else {
-					$plugins['all'][ $slug ] = $plugin;
+					$plugins['all'][$slug] = $plugin;
 
 					if ( ! $this->tgmpa->is_plugin_installed( $slug ) ) {
-						$plugins['install'][ $slug ] = $plugin;
+						$plugins['install'][$slug] = $plugin;
 					} else {
 						if ( false !== $this->tgmpa->does_plugin_have_update( $slug ) ) {
-							$plugins['update'][ $slug ] = $plugin;
+							$plugins['update'][$slug] = $plugin;
 						}
 
 						if ( $this->tgmpa->can_plugin_activate( $slug ) ) {
-							$plugins['activate'][ $slug ] = $plugin;
+							$plugins['activate'][$slug] = $plugin;
 						}
 					}
 				}
@@ -188,7 +188,7 @@ 
 		 */
 		protected function set_view_totals( $plugins ) {
 			foreach ( $plugins as $type => $list ) {
-				$this->view_totals[ $type ] = count( $list );
+				$this->view_totals[$type] = count( $list );
 			}
 		}
 
@@ -290,8 +290,8 @@ 
 			$name = array();
 
 			foreach ( $items as $i => $plugin ) {
-				$type[ $i ] = $plugin['type']; // Required / recommended.
-				$name[ $i ] = $plugin['sanitized_plugin'];
+				$type[$i] = $plugin['type']; // Required / recommended.
+				$name[$i] = $plugin['sanitized_plugin'];
 			}
 
 			array_multisort( $type, SORT_DESC, $name, SORT_ASC, $items );
@@ -338,7 +338,7 @@ 
 
 				if ( ! empty( $text ) ) {
 
-					$status_links[ $type ] = sprintf(
+					$status_links[$type] = sprintf(
 						'<a href="%s"%s>%s</a>',
 						esc_url( $this->tgmpa->get_tgmpa_status_url( $type ) ),
 						( $type === $this->view_context ) ? ' class="current"' : '',
@@ -361,7 +361,7 @@ 
 		 * @return string
 		 */
 		public function column_default( $item, $column_name ) {
-			return $item[ $column_name ];
+			return $item[$column_name];
 		}
 
 		/**
@@ -561,7 +561,7 @@ 
 					'tgmpa-nonce'
 				);
 
-				$action_links[ $action ] = sprintf(
+				$action_links[$action] = sprintf(
 					'<a href="%1$s">' . esc_html( $text ) . '</a>', // $text contains the second placeholder.
 					esc_url( $nonce_url ),
 					'<span class="screen-reader-text">' . esc_html( $item['sanitized_plugin'] ) . '</span>'
@@ -712,19 +712,19 @@ 
 				// Validate the received input.
 				foreach ( $plugins_to_install as $key => $slug ) {
 					// Check if the plugin was registered with TGMPA and remove if not.
-					if ( ! isset( $this->tgmpa->plugins[ $slug ] ) ) {
-						unset( $plugins_to_install[ $key ] );
+					if ( ! isset( $this->tgmpa->plugins[$slug] ) ) {
+						unset( $plugins_to_install[$key] );
 						continue;
 					}
 
 					// For install: make sure this is a plugin we *can* install and not one already installed.
 					if ( 'install' === $install_type && true === $this->tgmpa->is_plugin_installed( $slug ) ) {
-						unset( $plugins_to_install[ $key ] );
+						unset( $plugins_to_install[$key] );
 					}
 
 					// For updates: make sure this is a plugin we *can* update (update available and WP version ok).
 					if ( 'update' === $install_type && false === $this->tgmpa->is_plugin_updatetable( $slug ) ) {
-						unset( $plugins_to_install[ $key ] );
+						unset( $plugins_to_install[$key] );
 					}
 				}
 
@@ -776,7 +776,7 @@ 
 
 				// Prepare the data for validated plugins for the install/upgrade.
 				foreach ( $plugins_to_install as $slug ) {
-					$name   = $this->tgmpa->plugins[ $slug ]['name'];
+					$name   = $this->tgmpa->plugins[$slug]['name'];
 					$source = $this->tgmpa->get_download_url( $slug );
 
 					if ( ! empty( $name ) && ! empty( $source ) ) {
@@ -789,9 +789,9 @@ 
 								break;
 
 							case 'update':
-								$file_paths[]                 = $this->tgmpa->plugins[ $slug ]['file_path'];
-								$to_inject[ $slug ]           = $this->tgmpa->plugins[ $slug ];
-								$to_inject[ $slug ]['source'] = $source;
+								$file_paths[]                 = $this->tgmpa->plugins[$slug]['file_path'];
+								$to_inject[$slug]           = $this->tgmpa->plugins[$slug];
+								$to_inject[$slug]['source'] = $source;
 								break;
 						}
 					}
@@ -862,8 +862,8 @@ 
 				// Grab the file paths for the selected & inactive plugins from the registration array.
 				foreach ( $plugins as $slug ) {
 					if ( $this->tgmpa->can_plugin_activate( $slug ) ) {
-						$plugins_to_activate[] = $this->tgmpa->plugins[ $slug ]['file_path'];
-						$plugin_names[]        = $this->tgmpa->plugins[ $slug ]['name'];
+						$plugins_to_activate[] = $this->tgmpa->plugins[$slug]['file_path'];
+						$plugin_names[]        = $this->tgmpa->plugins[$slug]['name'];
 					}
 				}
 				unset( $slug );
@@ -895,8 +895,8 @@ 
 					// Update recently activated plugins option.
 					$recent = (array) get_option( 'recently_activated' );
 					foreach ( $plugins_to_activate as $plugin => $time ) {
-						if ( isset( $recent[ $plugin ] ) ) {
-							unset( $recent[ $plugin ] );
+						if ( isset( $recent[$plugin] ) ) {
+							unset( $recent[$plugin] );
 						}
 					}
 					update_option( 'recently_activated', $recent );