10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-13 19:56:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix manage users action and redirection

Browse Source
This commit is contained in:
champsupertramp
2016-09-15 10:24:07 +08:00
parent 92bc4ba3e2
commit a299c24bf7
2 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/core/um-admin-notices.php
+4
View File
@@ -200,6 +200,10 @@ class UM_Admin_Notices {
$messages[0]['content'] = __('Users have been updated.','ultimatemember');
break;
case 'users_role_updated':
$messages[0]['content'] = __('Changed roles.','ultimatemember');
break;
case 'err_users_updated':
$messages[0]['err_content'] = __('Super administrators cannot be modified.','ultimatemember');
$messages[1]['content'] = __('Other users have been updated.','ultimatemember');
admin/core/um-admin-users.php
+68 -5
View File
@@ -193,16 +193,38 @@ class UM_Admin_Users {
}
if ( $admin_err == 0 ){
wp_redirect( admin_url('users.php?update=promote') );
$uri = admin_url('users.php');
$uri = $this->set_redirect_uri( $uri );
$uri = add_query_arg( 'update', 'users_role_updated', $uri );
wp_redirect( $uri );
exit;
} else {
wp_redirect( admin_url('users.php?update=err_admin_role') );
$uri = admin_url('users.php');
$uri = $this->set_redirect_uri( $uri );
$uri = add_query_arg( 'update', 'err_admin_role', $uri );
wp_redirect( $uri );
exit;
}
} else if ( isset($_REQUEST['um_changeit']) && $_REQUEST['um_changeit'] != '' ) {
wp_redirect( admin_url('users.php') );
$uri = admin_url('users.php');
$uri = $this->set_redirect_uri( $uri );
wp_redirect( $uri );
exit;
}
@@ -233,7 +255,15 @@ class UM_Admin_Users {
// Finished. redirect now
if ( $admin_err == 0 ){
wp_redirect( admin_url('users.php?update=users_updated') );
$uri = admin_url('users.php');
$uri = $this->set_redirect_uri( $uri );
$uri = add_query_arg( 'update', 'users_updated', $uri );
wp_redirect( $uri );
exit;
} else {
wp_redirect( admin_url('users.php?update=err_users_updated') );
@@ -242,7 +272,12 @@ class UM_Admin_Users {
} else if ( isset($_REQUEST['um_bulkedit']) && $_REQUEST['um_bulkedit'] != '' ) {
wp_redirect( admin_url('users.php') );
$uri = admin_url('users.php');
$uri = $this->set_redirect_uri( $uri );
wp_redirect( $uri );
exit;
}
@@ -309,6 +344,10 @@ class UM_Admin_Users {
</div>
<?php if( isset( $_REQUEST['status'] ) && ! empty( $_REQUEST['status'] ) ){ ?>
<input type="hidden" name="status" id="um_status" value="<?php echo esc_attr( $_REQUEST['status'] );?>"/>
<?php } ?>
<?php
}
@@ -344,4 +383,28 @@ class UM_Admin_Users {
return $value;
}
/**
* Sets redirect URI
* @param string $uri
*/
function set_redirect_uri( $uri ){
if( isset( $_REQUEST['s'] ) && ! empty( $_REQUEST['s'] ) ){
$uri = add_query_arg( 's', $_REQUEST['s'], $uri );
}
if( isset( $_REQUEST['status'] ) && ! empty( $_REQUEST['status'] ) ){
$uri = add_query_arg( 'status', $_REQUEST['status'], $uri );
}
if( isset( $_REQUEST['um_filter_role'] ) && ! empty( $_REQUEST['um_filter_role'] ) ){
foreach ( $_REQUEST['um_filter_role'] as $key => $value) {
$uri = add_query_arg( 'um_filter_role', $value, $uri );
}
}
return $uri;
}
}