← All changes | wp_admin.php +9 -49 5.24 → 4.79 View file →

		@@ -56,9 +56,9 @@
56	56	}
57	57	}
58	58
59	59	public function wprsecAdminMenu($hook) {
60		- if ($hook === 'toplevel_page_wpremote' || WPRHelper::safePregMatch("/wpr_add_account$/", $hook) || WPRHelper::safePregMatch("/wpr_account_details$/", $hook)) {
	60	+ if ($hook === 'toplevel_page_wpremote' || preg_match("/wpr_add_account$/", $hook) || preg_match("/wpr_account_details$/", $hook)) {
61	61	wp_enqueue_style( 'bootstrap', plugins_url('css/bootstrap.min.css', __FILE__));
62	62	wp_enqueue_style( 'bvplugin', plugins_url('css/bvplugin.min.css', __FILE__));
63	63	}
64	64	}
		@@ -72,19 +72,8 @@
72	72	array($this, 'adminPage'), plugins_url($icon, __FILE__ ));
73	73	}
74	74	}
75	75
76		- public function hidePluginUpdate($plugins) {
77		- $brand = $this->bvinfo->getBrandInfo();
78		- $bvslug = $this->bvinfo->slug;
79		- if (isset($plugins->response[$bvslug]) && is_array($brand)) {
80		- if (array_key_exists('hide_from_menu', $brand) || array_key_exists('hide', $brand)) {
81		- unset($plugins->response[$bvslug]);
82		- }
83		- }
84		- return $plugins;
85		- }
86		-
87	76	public function hidePluginDetails($plugin_metas, $slug) {
88	77	$brand = $this->bvinfo->getBrandInfo();
89	78	$bvslug = $this->bvinfo->slug;
90	79
		@@ -98,37 +87,8 @@
98	87	}
99	88	return $plugin_metas;
100	89	}
101	90
102		- public function handlePluginHealthInfo($plugins) {
103		- $brand = $this->bvinfo->getBrandInfo();
104		- $title = $this->bvinfo->title;
105		- if (!isset($plugins["wp-plugins-active"]) ||
106		- !isset($plugins["wp-plugins-active"]["fields"]) ||
107		- !isset($plugins["wp-plugins-active"]["fields"][$title])) {
108		- return $plugins;
109		- }
110		- if (is_array($brand)) {
111		- if (array_key_exists('hide', $brand)) {
112		- unset($plugins["wp-plugins-active"]["fields"][$title]);
113		- } else {
114		- $plugin = $plugins["wp-plugins-active"]["fields"][$title];
115		- $author = $this->bvinfo->author;
116		- if (array_key_exists('name', $brand)) {
117		- $plugin["label"] = $brand['name'];
118		- }
119		- if (array_key_exists('author', $brand)) {
120		- $plugin["value"] = str_replace($author, $brand['author'], $plugin["value"]);
121		- }
122		- if (array_key_exists('description', $brand)) {
123		- $plugin["debug"] = str_replace($author, $brand['author'], $plugin["debug"]);
124		- }
125		- $plugins["wp-plugins-active"]["fields"][$title] = $plugin;
126		- }
127		- }
128		- return $plugins;
129		- }
130		-
131	91	public function settingsLink($links, $file) {
132	92	#XNOTE: Fix this
133	93	if ( $file == plugin_basename( dirname(__FILE__).'/blogvault.php' ) ) {
134	94	$brand = $this->bvinfo->getBrandInfo();
		@@ -140,9 +100,9 @@
140	100	}
141	101
142	102	public function getPluginLogo() {
143	103	$brand = $this->bvinfo->getBrandInfo();
144		- if (is_array($brand) && array_key_exists('logo', $brand)) {
	104	+ if ($brand && array_key_exists('logo', $brand)) {
145	105	return $brand['logo'];
146	106	}
147	107	return $this->bvinfo->logo;
148	108	}
		@@ -148,9 +108,9 @@
148	108	}
149	109
150	110	public function getWebPage() {
151	111	$brand = $this->bvinfo->getBrandInfo();
152		- if (is_array($brand) && array_key_exists('webpage', $brand)) {
	112	+ if ($brand && array_key_exists('webpage', $brand)) {
153	113	return $brand['webpage'];
154	114	}
155	115	return $this->bvinfo->webpage;
156	116	}
		@@ -162,17 +122,17 @@
162	122	$secret = WPRRecover::defaultSecret($this->settings);
163	123	$tags = "<input type='hidden' name='url' value='".esc_attr($this->siteinfo->wpurl())."'/>\n".
164	124	"<input type='hidden' name='homeurl' value='".esc_attr($this->siteinfo->homeurl())."'/>\n".
165	125	"<input type='hidden' name='siteurl' value='".esc_attr($this->siteinfo->siteurl())."'/>\n".
166		- "<input type='hidden' name='dbsig' value='".esc_attr($this->siteinfo->dbsig(false))."'/>\n".
167		- "<input type='hidden' name='plug' value='".esc_attr($this->bvinfo->plugname)."'/>\n".
	126	+ "<input type='hidden' name='dbsig' value='".$this->siteinfo->dbsig(false)."'/>\n".
	127	+ "<input type='hidden' name='plug' value='".$this->bvinfo->plugname."'/>\n".
168	128	"<input type='hidden' name='adminurl' value='".esc_attr($this->mainUrl())."'/>\n".
169		- "<input type='hidden' name='bvversion' value='".esc_attr($this->bvinfo->version)."'/>\n".
	129	+ "<input type='hidden' name='bvversion' value='".$this->bvinfo->version."'/>\n".
170	130	"<input type='hidden' name='serverip' value='".esc_attr($_SERVER["SERVER_ADDR"])."'/>\n".
171		- "<input type='hidden' name='abspath' value='".esc_attr(ABSPATH)."'/>\n".
	131	+ "<input type='hidden' name='abspath' value='".ABSPATH."'/>\n".
172	132	"<input type='hidden' name='secret' value='".esc_attr($secret)."'/>\n".
173	133	"<input type='hidden' name='public' value='".esc_attr($public)."'/>\n".
174		- "<input type='hidden' name='bvnonce' value='".esc_attr($bvnonce)."'/>\n";
	134	+ "<input type='hidden' name='bvnonce' value='".$bvnonce."'/>\n";
175	135	return $tags;
176	136	}
177	137
178	138	public function activateWarning() {
		@@ -179,9 +139,9 @@
179	139	global $hook_suffix;
180	140	if (!WPRAccount::isConfigured($this->settings) && $hook_suffix == 'index.php' ) {
181	141	?>
182	142	<div id="message" class="updated" style="padding: 8px; font-size: 16px; background-color: #dff0d8">
183		- <a class="button-primary" href="<?php echo esc_url($this->mainUrl()); ?>">Activate WPRemote</a>
	143	+ <a class="button-primary" href="<?php echo $this->mainUrl(); ?>">Activate WPRemote</a>
184	144	&nbsp;&nbsp;&nbsp;<b>Almost Done:</b> Activate your WPRemote account to backup & secure your site.
185	145	</div>
186	146	<?php
187	147	}