diff --git a/includes/admin/class-admin.php b/includes/admin/class-admin.php index dd5382f3..ef8f2544 100644 --- a/includes/admin/class-admin.php +++ b/includes/admin/class-admin.php @@ -1638,9 +1638,9 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { update_option( 'um_last_manual_upgrades_request', time() ); } - $url = add_query_arg( array( 'page' => 'ultimatemember', 'update' => 'got_updates' ), admin_url( 'admin.php' ) ); + $url = add_query_arg( array( 'page' => 'ultimatemember', 'update' => 'um_got_updates' ), admin_url( 'admin.php' ) ); } else { - $url = add_query_arg( array( 'page' => 'ultimatemember', 'update' => 'often_updates' ), admin_url( 'admin.php' ) ); + $url = add_query_arg( array( 'page' => 'ultimatemember', 'update' => 'um_often_updates' ), admin_url( 'admin.php' ) ); } exit( wp_redirect( $url ) ); } @@ -1699,7 +1699,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { $url = add_query_arg( array( 'page' => 'ultimatemember', - 'update' => 'cleared_cache', + 'update' => 'um_cleared_cache', ), admin_url( 'admin.php' ) ); @@ -1737,7 +1737,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { $url = add_query_arg( array( 'page' => 'ultimatemember', - 'update' => 'cleared_status_cache', + 'update' => 'um_cleared_status_cache', ), admin_url( 'admin.php' ) ); @@ -1757,7 +1757,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { UM()->files()->remove_dir( UM()->files()->upload_temp ); - $url = add_query_arg( array( 'page' => 'ultimatemember', 'update' => 'purged_temp' ), admin_url( 'admin.php' ) ); + $url = add_query_arg( array( 'page' => 'ultimatemember', 'update' => 'um_purged_temp' ), admin_url( 'admin.php' ) ); exit( wp_redirect( $url ) ); } @@ -1808,7 +1808,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { $url = add_query_arg( array( 'post_type' => 'um_form', - 'update' => 'form_duplicated', + 'update' => 'um_form_duplicated', ), admin_url( 'edit.php' ) ); @@ -1891,7 +1891,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) { um_reset_user(); - wp_redirect( add_query_arg( 'update', 'user_updated', admin_url( '?page=ultimatemember' ) ) ); + wp_redirect( add_query_arg( 'update', 'um_user_updated', admin_url( '?page=ultimatemember' ) ) ); exit; } diff --git a/includes/admin/core/class-admin-notices.php b/includes/admin/core/class-admin-notices.php index f1ad8a7c..561aba7d 100644 --- a/includes/admin/core/class-admin-notices.php +++ b/includes/admin/core/class-admin-notices.php @@ -438,91 +438,43 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) { } } - /** * Updating users */ - function show_update_messages() { - + public function show_update_messages() { if ( ! isset( $_REQUEST['update'] ) ) { return; } $update = sanitize_key( $_REQUEST['update'] ); - switch( $update ) { - - case 'confirm_delete': - $request_users = array_map( 'absint', (array) $_REQUEST['user'] ); - - $confirm_uri = admin_url( 'users.php?' . http_build_query( array( - 'um_adm_action' => 'delete_users', - 'user' => $request_users, - 'confirm' => 1 - ) ) ); - $users = ''; - - if ( isset( $request_users ) ) { - foreach ( $request_users as $user_id ) { - $user = get_userdata( $user_id ); - $users .= '#' . $user_id . ': ' . $user->user_login . '
'; - } - } - - $ignore = admin_url( 'users.php' ); - - $messages[0]['err_content'] = sprintf( __( 'Are you sure you want to delete the selected user(s)? The following users will be deleted:

%s

This cannot be undone!', 'ultimate-member' ), $users ); - $messages[0]['err_content'] .= '

' . __( 'Remove', 'ultimate-member' ) . '  ' . __( 'Undo', 'ultimate-member' ) . '

'; - - break; - - case 'language_updated': - $messages[0]['content'] = __( 'Your translation files have been updated successfully.', 'ultimate-member' ); - break; - - case 'purged_temp': + switch ( $update ) { + case 'um_purged_temp': $messages[0]['content'] = __( 'Your temp uploads directory is now clean.', 'ultimate-member' ); break; - - case 'cleared_cache': + case 'um_cleared_cache': $messages[0]['content'] = __( 'Your user cache is now removed.', 'ultimate-member' ); break; - - case 'cleared_status_cache': + case 'um_cleared_status_cache': $messages[0]['content'] = __( 'Your user statuses cache is now removed.', 'ultimate-member' ); break; - - case 'got_updates': + case 'um_got_updates': $messages[0]['content'] = __( 'You have the latest updates.', 'ultimate-member' ); break; - - case 'often_updates': + case 'um_often_updates': $messages[0]['err_content'] = __( 'Try again later. You can run this action once daily.', 'ultimate-member' ); break; - - case 'form_duplicated': + case 'um_form_duplicated': $messages[0]['content'] = __( 'The form has been duplicated successfully.', 'ultimate-member' ); break; - - case 'settings_updated': + case 'um_settings_updated': $messages[0]['content'] = __( 'Settings have been saved successfully.', 'ultimate-member' ); break; - - case 'user_updated': + case 'um_user_updated': $messages[0]['content'] = __( 'User has been updated.', 'ultimate-member' ); break; - - case 'users_updated': + case 'um_users_updated': $messages[0]['content'] = __( 'Users have been updated.', 'ultimate-member' ); break; - - case 'users_role_updated': - $messages[0]['content'] = __( 'Changed roles.', 'ultimate-member' ); - break; - - case 'err_users_updated': - $messages[0]['err_content'] = __( 'Super administrators cannot be modified.', 'ultimate-member' ); - $messages[1]['content'] = __( 'Other users have been updated.', 'ultimate-member' ); - break; case 'um_secure_expire_sessions': $messages[0]['content'] = __( 'All users sessions have been successfully destroyed.', 'ultimate-member' ); break; @@ -534,22 +486,28 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) { if ( ! empty( $messages ) ) { foreach ( $messages as $message ) { if ( isset( $message['err_content'] ) ) { - $this->add_notice( 'actions', array( - 'class' => 'error', - 'message' => '

' . $message['err_content'] . '

', - ), 50 ); + $this->add_notice( + 'actions', + array( + 'class' => 'error', + 'message' => '

' . $message['err_content'] . '

', + ), + 50 + ); } else { - $this->add_notice( 'actions', array( - 'class' => 'updated', - 'message' => '

' . $message['content'] . '

', - ), 50 ); + $this->add_notice( + 'actions', + array( + 'class' => 'updated', + 'message' => '

' . $message['content'] . '

', + ), + 50 + ); } } } - } - /** * Check if plugin is installed with correct folder */ diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index 33a9d833..de499fff 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -2287,7 +2287,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { //redirect after save settings $arg = array( 'page' => 'um_options', - 'update' => 'settings_updated', + 'update' => 'um_settings_updated', ); if ( ! empty( $_GET['tab'] ) ) { diff --git a/includes/admin/core/class-admin-users.php b/includes/admin/core/class-admin-users.php index e8c7c296..bcb05c8c 100644 --- a/includes/admin/core/class-admin-users.php +++ b/includes/admin/core/class-admin-users.php @@ -537,20 +537,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) { do_action( "um_admin_user_action_{$bulk_action}_hook" ); } - // Finished. redirect now - //if ( $admin_err == 0 ) { - $uri = $this->set_redirect_uri( admin_url( 'users.php' ) ); - $uri = add_query_arg( 'update', 'users_updated', $uri ); + $uri = add_query_arg( 'update', 'um_users_updated', $uri ); wp_redirect( $uri ); exit; - - /*} else { - wp_redirect( admin_url( 'users.php?update=err_users_updated' ) ); - exit; - }*/ - } elseif ( ! empty( $_REQUEST['um_bulkedit'] ) ) { $uri = $this->set_redirect_uri( admin_url( 'users.php' ) );