← All changes | plugin.php +26 -15 5.38 → 4.86 View file →

		@@ -4,9 +4,9 @@
4	4	Plugin URI: https://wpremote.com
5	5	Description: Manage your WordPress site with <a href="https://wpremote.com/">WP Remote</a>.
6	6	Author: WP Remote
7	7	Author URI: https://wpremote.com
8		-Version: 5.38
	8	+Version: 4.86
9	9	Network: True
10	10	*/
11	11
12	12	/* Copyright 2017 WP Remote (email : support@wpremote.com)
		@@ -36,9 +36,8 @@
36	36	require_once dirname( __FILE__ ) . '/wp_api.php';
37	37	require_once dirname( __FILE__ ) . '/wp_actions.php';
38	38	require_once dirname( __FILE__ ) . '/info.php';
39	39	require_once dirname( __FILE__ ) . '/account.php';
40		-require_once dirname( __FILE__ ) . '/helper.php';
41	40	##WPCACHEMODULE##
42	41
43	42
44	43	$bvsettings = new WPRWPSettings();
		@@ -57,10 +56,8 @@
57	56	add_action('wp_footer', array($wp_action, 'footerHandler'), 100);
58	57	add_action('clear_bv_services_config', array($wp_action, 'clear_bv_services_config'));
59	58	##SOADDUNINSTALLACTION##
60	59
61		-##DISABLE_OTHER_OPTIMIZATION_PLUGINS##
62		-
63	60	##WPCLIMODULE##
64	61	if (is_admin()) {
65	62	require_once dirname( __FILE__ ) . '/wp_admin.php';
66	63	$wpadmin = new WPRWPAdmin($bvsettings, $bvsiteinfo);
		@@ -108,12 +105,12 @@
108	105	} else {
109	106	$account = WPRAccount::find($bvsettings, $pubkey);
110	107	}
111	108
112		- $request = new BVCallbackRequest($account, $_REQUEST, $bvsettings);
	109	+ $request = new BVCallbackRequest($account, $_REQUEST);
113	110	$response = new BVCallbackResponse($request->bvb64cksize);
114	111
115		- if ($request->authenticate() === 1) {
	112	+ if ($account && (1 === $account->authenticate($request))) {
116	113	define('WPRBASEPATH', plugin_dir_path(__FILE__));
117	114
118	115
119	116	require_once dirname( __FILE__ ) . '/callback/handler.php';
		@@ -119,9 +116,15 @@
119	116	require_once dirname( __FILE__ ) . '/callback/handler.php';
120	117
121	118	$params = $request->processParams($_REQUEST);
122	119	if ($params === false) {
123		- $response->terminate($request->corruptedParamsResp());
	120	+ $resp = array(
	121	+ "account_info" => $account->info(),
	122	+ "request_info" => $request->info(),
	123	+ "bvinfo" => $bvinfo->info(),
	124	+ "statusmsg" => "BVPRMS_CORRUPTED"
	125	+ );
	126	+ $response->terminate($resp);
124	127	}
125	128	$request->params = $params;
126	129	$callback_handler = new BVCallbackHandler($bvdb, $bvsettings, $bvsiteinfo, $request, $account, $response);
127	130	if ($request->is_afterload) {
		@@ -132,19 +135,28 @@
132	135	} else {
133	136	$callback_handler->execute();
134	137	}
135	138	} else {
136		- $response->terminate($request->authFailedResp());
	139	+ $resp = array(
	140	+ "account_info" => $account ? $account->info() : array("error" => "ACCOUNT_NOT_FOUND"),
	141	+ "request_info" => $request->info(),
	142	+ "bvinfo" => $bvinfo->info(),
	143	+ "statusmsg" => "FAILED_AUTH",
	144	+ "api_pubkey" => substr(WPRAccount::getApiPublicKey($bvsettings), 0, 8),
	145	+ "def_sigmatch" => substr(WPRAccount::getSigMatch($request, WPRRecover::getDefaultSecret($bvsettings)), 0, 8)
	146	+ );
	147	+ $response->terminate($resp);
137	148	}
138	149	} else {
139	150	if ($bvinfo->hasValidDBVersion()) {
140	151	if ($bvinfo->isProtectModuleEnabled()) {
141		- require_once dirname( __FILE__ ) . '/protect/protect.php';
142		- add_action('clear_pt_config', array('MCProtect', 'uninstall'));
143		- if ($bvinfo->isActivePlugin() && !(defined( 'WP_CLI' ) && WP_CLI)) {
144		- MCProtect::init(MCProtect::MODE_WP);
145		- }
	152	+ require_once dirname( __FILE__ ) . '/protect/wp/protect.php';
	153	+ $bvprotect = new BVProtect($bvdb, $bvsettings);
	154	+ $bvprotect->init();
	155	+ if ($bvinfo->isActivePlugin() && !(defined( 'WP_CLI' ) && WP_CLI)) {
	156	+ $bvprotect->run();
146	157	}
	158	+ }
147	159
148	160	if ($bvinfo->isDynSyncModuleEnabled()) {
149	161	require_once dirname( __FILE__ ) . '/wp_dynsync.php';
150	162	$bvconfig = $bvinfo->config;
		@@ -177,6 +189,5 @@
177	189	if (is_admin()) {
178	190	add_filter('site_transient_update_plugins', array($wpadmin, 'hidePluginUpdate'));
179	191	}
180	192
181		- ##THIRDPARTYCACHINGMODULE##
182		-}
	193	+}