← All changes | info.php +6 -24 4.87 → 4.73 View file →

		@@ -9,9 +9,9 @@
9	9	public $brandname = 'WP Remote';
10	10	public $badgeinfo = 'wprbadge';
11	11	public $ip_header_option = 'wpripheader';
12	12	public $brand_option = 'wprbrand';
13		- public $version = '4.87';
	13	+ public $version = '4.73';
14	14	public $webpage = 'https://wpremote.com';
15	15	public $appurl = 'https://app.wpremote.com';
16	16	public $slug = 'wpremote/plugin.php';
17	17	public $plug_redirect = 'wprredirect';
		@@ -17,10 +17,8 @@
17	17	public $plug_redirect = 'wprredirect';
18	18	public $logo = '../img/wprlogo.png';
19	19	public $brand_icon = '/img/icon.png';
20	20	public $services_option_name = 'wprconfig';
21		- public $author = 'WP Remote';
22		- public $title = 'WP Remote';
23	21
24	22	const DB_VERSION = '3';
25	23
26	24	public function __construct($settings) {
		@@ -67,9 +65,9 @@
67	65	}
68	66
69	67	public function getBrandName() {
70	68	$brand = $this->getBrandInfo();
71		- if (is_array($brand) && array_key_exists('menuname', $brand)) {
	69	+ if ($brand && array_key_exists('menuname', $brand)) {
72	70	return $brand['menuname'];
73	71	}
74	72
75	73	return $this->brandname;
		@@ -76,9 +74,9 @@
76	74	}
77	75
78	76	public function getBrandIcon() {
79	77	$brand = $this->getBrandInfo();
80		- if (is_array($brand) && array_key_exists('brand_icon', $brand)) {
	78	+ if ($brand && array_key_exists('brand_icon', $brand)) {
81	79	return $brand['brand_icon'];
82	80	}
83	81	return $this->brand_icon;
84	82	}
		@@ -92,9 +90,9 @@
92	90	if (defined('BV_APP_URL')) {
93	91	return BV_APP_URL;
94	92	} else {
95	93	$brand = $this->getBrandInfo();
96		- if (is_array($brand) && array_key_exists('appurl', $brand)) {
	94	+ if ($brand && array_key_exists('appurl', $brand)) {
97	95	return $brand['appurl'];
98	96	}
99	97	return $this->appurl;
100	98	}
		@@ -104,26 +102,10 @@
104	102	$expiry_time = time() - (3 * 24 * 3600);
105	103	return ($this->getWatchTime() > $expiry_time);
106	104	}
107	105
108		- public function isValidEnvironment(){
109		- $bvsiteinfo = new WPRWPSiteInfo();
110		- $bvconfig = $this->config;
111		-
112		- if (is_multisite()) {
113		- return true;
114		- } elseif ($bvconfig && array_key_exists("siteurl_scheme", $bvconfig)) {
115		- $siteurl = $bvsiteinfo->siteurl('', $bvconfig["siteurl_scheme"]);
116		- if (array_key_exists("abspath", $bvconfig) &&
117		- array_key_exists("siteurl", $bvconfig) && !empty($siteurl)) {
118		- return ($bvconfig["abspath"] == ABSPATH && $bvconfig["siteurl"] == $siteurl);
119		- }
120		- }
121		- return true;
122		- }
123		-
124	106	public function isProtectModuleEnabled() {
125		- return $this->isServiceActive("protect") && $this->isValidEnvironment();
	107	+ return $this->isServiceActive("protect");
126	108	}
127	109
128	110	public function isDynSyncModuleEnabled() {
129	111	if ($this->isServiceActive("dynsync")) {
		@@ -147,9 +129,9 @@
147	129	return ($this->settings->getOption($this->plug_redirect) === 'yes') ? true : false;
148	130	}
149	131
150	132	public function isMalcare() {
151		- return $this->getBrandName() === 'MalCare';
	133	+ return $this->getBrandName() === 'MalCare - Pro';
152	134	}
153	135
154	136	public function isBlogvault() {
155	137	return $this->getBrandName() === 'BlogVault';