Skip to content

Feature/lean load better errors #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GaryJones merged 5 commits into from
Jun 3, 2015
Merged

Feature/lean load better errors #427

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b43dbbc
Leaner loading: don't run on ajax calls
jrfnl May 21, 2015
1de22e2
Leaner loading: only add the plugin action link filters if on the plu…
jrfnl May 21, 2015
4ab6c79
(C)Leaner loading: don't accidentally run the bulk process twice.
jrfnl May 21, 2015
3e4830b
Better error messages for when no plugins were received to take actio…
jrfnl May 21, 2015
b4447db
Typo
jrfnl Jun 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 45 additions & 28 deletions class-tgm-plugin-activation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,15 @@ protected function __construct() {
public function init() {

/**
* By default TGMPA only loads on the WP back-end. Using this filter you can overrule that behaviour.
* By default TGMPA only loads on the WP back-end and not in an Ajax call. Using this filter
* you can overrule that behaviour.
*
* @since 2.5.0
*
* @param bool $load Whether or not TGMPA should load. Defaults to the return of `is_admin()`.
* @param bool $load Whether or not TGMPA should load.
* Defaults to the return of `is_admin() && ! defined( 'DOING_AJAX' )`.
*/
if ( true !== apply_filters( 'tgmpa_load', is_admin() ) ) {
if ( true !== apply_filters( 'tgmpa_load', ( is_admin() && ! defined( 'DOING_AJAX' ) ) ) ) {
return;
}

Expand Down Expand Up @@ -393,7 +395,7 @@ public function init() {
add_action( 'admin_menu', array( $this, 'admin_menu' ) );
add_action( 'admin_head', array( $this, 'dismiss' ) );

// Prevent the normal links from showing underneath an single install/update page.
// Prevent the normal links from showing underneath a single install/update page.
add_filter( 'install_plugin_complete_actions', array( $this, 'actions' ) );
add_filter( 'update_plugin_complete_actions', array( $this, 'actions' ) );

Expand All @@ -403,7 +405,7 @@ public function init() {
add_action( 'admin_enqueue_scripts', array( $this, 'thickbox' ) );
}

$this->add_plugin_action_link_filters();
add_action( 'load-plugins.php', array( $this, 'add_plugin_action_link_filters' ), 1 );

}

Expand Down Expand Up @@ -2694,33 +2696,42 @@ public function process_bulk_actions() {
}

$plugins_to_install = array();

// Did user actually select any plugins to install/update ?
if ( empty( $_POST['plugin'] ) ) {
if ( 'install' === $install_type ) {
$message = __( 'No plugins were selected to be installed. No action taken.', 'tgmpa' );
} else {
$message = __( 'No plugins were selected to be updated. No action taken.', 'tgmpa' );
}

if ( ! empty( $_POST['plugin'] ) ) {
echo '<div id="message" class="error"><p>', esc_html( $message ), '</p></div>';
return false;
}

if ( is_array( $_POST['plugin'] ) ) {
$plugins_to_install = (array) $_POST['plugin'];
if ( is_array( $_POST['plugin'] ) ) {
$plugins_to_install = (array) $_POST['plugin'];

} elseif ( is_string( $_POST['plugin'] ) ) {
// Received via Filesystem page - un-flatten array (WP bug #19643).
$plugins_to_install = explode( ',', $_POST['plugin'] );
}
} elseif ( is_string( $_POST['plugin'] ) ) {
// Received via Filesystem page - un-flatten array (WP bug #19643).
$plugins_to_install = explode( ',', $_POST['plugin'] );
}

// Sanitize the received input.
$plugins_to_install = array_map( 'urldecode', $plugins_to_install );
$plugins_to_install = array_map( array( $this->tgmpa, 'sanitize_key' ), $plugins_to_install );
// Sanitize the received input.
$plugins_to_install = array_map( 'urldecode', $plugins_to_install );
$plugins_to_install = array_map( array( $this->tgmpa, 'sanitize_key' ), $plugins_to_install );

// 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 ] );
continue;
}
// 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 ] );
continue;
}

// For updates: make sure this is a plugin we *can* update (update available and WP version ok).
if ( 'update' === $install_type && ( $this->tgmpa->is_plugin_installed( $slug ) && ( false === $this->tgmpa->does_plugin_have_update( $slug ) || ! $this->tgmpa->can_plugin_update( $slug ) ) ) ) {
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 && ( $this->tgmpa->is_plugin_installed( $slug ) && ( false === $this->tgmpa->does_plugin_have_update( $slug ) || ! $this->tgmpa->can_plugin_update( $slug ) ) ) ) {
unset( $plugins_to_install[ $key ] );
}
}

Expand Down Expand Up @@ -2831,6 +2842,12 @@ public function process_bulk_actions() {

check_admin_referer( 'bulk-' . $this->_args['plural'] );

// Did user actually select any plugins to activate ?
if ( empty( $_POST['plugin'] ) ) {
echo '<div id="message" class="error"><p>', esc_html__( 'No plugins were selected to be activated. No action taken.', 'tgmpa' ), '</p></div>';
return false;
}

// Grab plugin data from $_POST.
$plugins = array();
if ( isset( $_POST['plugin'] ) ) {
Expand Down Expand Up @@ -2905,8 +2922,8 @@ public function prepare_items() {
$sortable = array(); // No reason to make sortable columns.
$this->_column_headers = array( $columns, $hidden, $sortable ); // Get all necessary column headers.

// Process our bulk actions here.
if ( false !== $this->current_action() ) {
// Process our bulk activations here.
if ( 'tgmpa-bulk-activate' === $this->current_action() ) {
$this->process_bulk_actions();
}

Expand Down
⚡