← All changes | info.php +9 -16 5.38 → 4.78 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 = '5.38';
	13	+ public $version = '4.78';
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,12 +17,10 @@
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		- const DB_VERSION = '4';
	22	+ const DB_VERSION = '3';
25	23
26	24	public function __construct($settings) {
27	25	$this->settings = $settings;
28	26	$this->config = $this->settings->getOption($this->services_option_name);
		@@ -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	}
		@@ -106,18 +104,13 @@
106	104	}
107	105
108	106	public function isValidEnvironment(){
109	107	$bvsiteinfo = new WPRWPSiteInfo();
	108	+ $siteurl = $bvsiteinfo->siteurl();
110	109	$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		- }
	110	+ if ($bvconfig && array_key_exists("abspath", $bvconfig) &&
	111	+ array_key_exists("siteurl", $bvconfig) && !empty($siteurl)) {
	112	+ return ($bvconfig["abspath"] == ABSPATH && $bvconfig["siteurl"] == $siteurl);
120	113	}
121	114	return true;
122	115	}
123	116