Merge branch 'bogdan01' of https://github.com/mainwp/mainwp-child into thang

This commit is contained in:
thanghv 2020-05-30 01:20:03 +07:00
commit e8a6f71029
3 changed files with 8 additions and 8 deletions

View file

@ -57,7 +57,7 @@ class MainWP_Child_Callable {
'wp_rocket' => 'wp_rocket',
'settings_tools' => 'settings_tools',
'skeleton_key' => 'bulk_settings_manager', // deprecated.
'bulk_settings_manager' => 'bulk_settings_manager',
'bulk_settings_manager' => 'bulk_settings_manager',
'custom_post_type' => 'custom_post_type',
'backup_buddy' => 'backup_buddy',
'get_site_icon' => 'get_site_icon',

View file

@ -137,12 +137,12 @@ class MainWP_Child {
$suppress = $wpdb->suppress_errors();
$options = array(
'mainwp_child_auth',
'mainwp_child_reports_db',
'mainwp_child_reports_db',
'mainwp_child_pluginDir',
'mainwp_updraftplus_hide_plugin',
'mainwp_backwpup_ext_enabled',
'mainwp_backwpup_ext_enabled',
'mainwp_child_server',
'mainwp_pagespeed_hide_plugin',
'mainwp_pagespeed_hide_plugin',
'mainwp_child_clone_permalink',
'mainwp_child_restore_permalink',
'mainwp_ext_snippets_enabled',

View file

@ -238,9 +238,9 @@ class MainWP_Connect {
if ( ( 1 === (int) $nossl ) || $serverNoSsl ) {
$nossl_key = get_option( 'mainwp_child_nossl_key' );
$auth = hash_equals( md5( $func . $nonce . $nossl_key ), base64_decode( $signature ) ); // // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions -- base64_encode function is used for http encode compatible.
} else {
} else {
$auth = openssl_verify( $func . $nonce, base64_decode( $signature ), base64_decode( get_option( 'mainwp_child_pubkey' ) ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions -- base64_encode function is used for http encode compatible.
if ( 1 !== $auth ) {
if ( 1 !== $auth ) {
$auth = false;
}
}
@ -269,7 +269,7 @@ class MainWP_Connect {
}
}
if ( is_user_logged_in() ) {
if ( is_user_logged_in() ) {
if ( 10 !== $current_user->wp_user_level && ( ! isset( $current_user->user_level ) || 10 !== $current_user->user_level ) && ! current_user_can( 'level_10' ) ) {
do_action( 'wp_logout' );
}
@ -342,7 +342,7 @@ class MainWP_Connect {
// support for custom wp-admin slug.
if ( isset( $_REQUEST['open_location'] ) && ! empty( $_REQUEST['open_location'] ) ) {
$open_location = base64_decode( $_REQUEST['open_location'] ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions -- base64_encode function is used for http encode compatible.
$this->open_location_redirect( $open_location );
$this->open_location_redirect( $open_location );
}
$this->where_redirect();
}