← All changes | info.php +21 -27 5.65 → trunk View file →

		@@ -9,9 +9,10 @@
9	9	public $brandname = 'WP Remote';
10	10	public $badgeinfo = 'wprbadge';
11	11	public $ip_header_option = 'wpripheader';
12	12	public $brand_option = 'bv_whitelabel_infos';
13		- public $version = '5.65';
	13	+ public $wp_lp_whitelabel_option = 'wprLpWhitelabelConf';
	14	+ public $version = '6.72';
14	15	public $webpage = 'https://wpremote.com';
15	16	public $appurl = 'https://app.wpremote.com';
16	17	public $slug = 'wpremote/plugin.php';
17	18	public $plug_redirect = 'wprredirect';
		@@ -20,9 +21,10 @@
20	21	public $services_option_name = 'wprconfig';
21	22	public $author = 'WP Remote';
22	23	public $title = 'WP Remote';
23	24
24		- const DB_VERSION = '4';
	25	+ const DB_VERSION = '5';
	26	+ const AL_CONF_VERSION = '1.1';
25	27
26	28	public function __construct($settings) {
27	29	$this->settings = $settings;
28	30	$this->config = $this->settings->getOption($this->services_option_name);
		@@ -61,16 +63,17 @@
61	63	require_once dirname( __FILE__ ) . '/recover.php';
62	64	$bvsiteinfo = new WPRWPSiteInfo();
63	65	$encoded_url = base64_encode($bvsiteinfo->siteurl());
64	66	$secret = WPRRecover::defaultSecret($this->settings);
	67	+ $tag = WPRRecover::connectionTag($this->settings);
65	68
66		- return base64_encode("v1:".$secret.":".$encoded_url);
67		- }
	69	+ #No tag means this site has no salt material in wp-config.php, and there
	70	+ #is no connection key that would be safe to hand out.
	71	+ if (empty($secret) || empty($tag)) {
	72	+ return null;
	73	+ }
68	74
69		- public function getDefaultSecret() {
70		- require_once dirname( __FILE__ ) . '/recover.php';
71		- $bvsiteinfo = new WPRWPSiteInfo();
72		- return WPRRecover::defaultSecret($this->settings);
	75	+ return base64_encode("v3:".$secret.":".$encoded_url.":".$this->plugname.":".$tag);
73	76	}
74	77
75	78	public function getLatestElementorDBVersion($file) {
76	79	$managerClass = $file === "elementor/elementor.php" ? '\Elementor\Core\Upgrade\Manager' : '\ElementorPro\Core\Upgrade\Manager';
		@@ -83,30 +86,16 @@
83	86	return $manager->get_new_version();
84	87	}
85	88
86	89	public static function getRequestID() {
87		- if (!defined("BV_REQUEST_ID")) {
88		- define("BV_REQUEST_ID", uniqid(mt_rand()));
	90	+ if (!defined("WPR_REQUEST_ID")) {
	91	+ define("WPR_REQUEST_ID", uniqid(mt_rand())); // phpcs:ignore WordPress.WP.AlternativeFunctions.rand_mt_rand
89	92	}
90		- return BV_REQUEST_ID;
	93	+ return WPR_REQUEST_ID;
91	94	}
92	95
93		- public function canSetCWBranding() {
94		- if (WPRWPSiteInfo::isCWServer()) {
95		-
96		- $bot_protect_accounts = WPRAccount::accountsByType($this->settings, 'botprotect');
97		- if (sizeof($bot_protect_accounts) >= 1)
98		- return true;
99		-
100		- $bot_protect_accounts = WPRAccount::accountsByPattern($this->settings, 'email', '/@cw_user\.com$/');
101		- if (sizeof($bot_protect_accounts) >= 1)
102		- return true;
103		- }
104		-
105		- return false;
106		- }
107		-
108	96	public function canWhiteLabel($slug = NULL) {
	97	+ // phpcs:disable WordPress.Security.NonceVerification.Recommended
109	98	if (array_key_exists("bv_override_global_whitelabel", $_REQUEST)) {
110	99	return false;
111	100	}
112	101	if (array_key_exists("bv_override_plugin_whitelabel", $_REQUEST) && isset($slug) &&
		@@ -112,8 +101,9 @@
112	101	if (array_key_exists("bv_override_plugin_whitelabel", $_REQUEST) && isset($slug) &&
113	102	$_REQUEST["bv_override_plugin_whitelabel"] === $slug) {
114	103	return false;
115	104	}
	105	+ // phpcs:enable WordPress.Security.NonceVerification.Recommended
116	106	return true;
117	107	}
118	108
119	109	public function getPluginWhitelabelInfo($slug = null) {
		@@ -135,8 +125,13 @@
135	125	$whitelabel_infos = $this->settings->getOption($this->brand_option);
136	126	return is_array($whitelabel_infos) ? $whitelabel_infos : array();
137	127	}
138	128
	129	+ public function getLPWhitelabelInfo() {
	130	+ $infos = $this->settings->getOption($this->wp_lp_whitelabel_option);
	131	+ return is_array($infos) ? $infos : array();
	132	+ }
	133	+
139	134	public function getPluginsWhitelabelInfoByTitle() {
140	135	$whitelabel_infos = $this->getPluginsWhitelabelInfos();
141	136	$whitelabel_infos_by_title = array();
142	137	foreach ($whitelabel_infos as $slug => $whitelabel_info) {
		@@ -152,9 +147,8 @@
152	147	$brand = $this->getPluginWhitelabelInfo();
153	148	if (is_array($brand) && array_key_exists('menuname', $brand)) {
154	149	return $brand['menuname'];
155	150	}
156		-
157	151	return $this->brandname;
158	152	}
159	153
160	154	public function getBrandIcon() {