← All changes | includes/admin.php +82 -33 1.1.5 → 1.2.2 View file →

		@@ -30,8 +30,9 @@
30	30	'cookieadmin-scan-cookies',
31	31	'cookieadmin-consent',
32	32	'cookieadmin-consent-logs',
33	33	'cookieadmin-license',
	34	+ 'cookieadmin-do-not-sell'
34	35	];
35	36
36	37	if(empty($current_page) || !in_array($current_page, $plugin_pages)){
37	38	return true;
		@@ -61,8 +62,12 @@
61	62	$policy['lang']['show_less'] = __('Show less', 'cookieadmin');
62	63	$policy['lang']['days'] = __('Day(s)', 'cookieadmin');
63	64	$policy['lang']['session'] = __('Session', 'cookieadmin');
64	65	$policy['lang']['scan_completed'] = __('Scan completed', 'cookieadmin');
	66	+ $policy['lang']['processing'] = __('Processing...', 'cookieadmin');
	67	+ $policy['lang']['active'] = __('Active', 'cookieadmin');
	68	+ $policy['lang']['install_failed'] = __('Installation failed. Please try again.', 'cookieadmin');
	69	+ $policy['lang']['error_occurred'] = __('An error occurred. Please try again.', 'cookieadmin');
65	70
66	71	wp_localize_script('cookieadmin_js', 'cookieadmin_policy', $policy);
67	72	}
68	73
		@@ -67,8 +72,14 @@
67	72	}
68	73
69	74	wp_enqueue_script('cookieadmin_js_footer', COOKIEADMIN_PLUGIN_URL . 'assets/js/footer.js', [], COOKIEADMIN_VERSION);
70	75	wp_localize_script('cookieadmin_js_footer', 'cookieadmin_data', array('is_pro' => cookieadmin_is_pro()));
	76	+
	77	+ // We only need to upload icon on consent form page
	78	+ if(!empty($_GET['page']) && $_GET['page'] == 'cookieadmin-consent'){
	79	+ //to upload icons
	80	+ wp_enqueue_media();
	81	+ }
71	82	}
72	83
73	84	//Add Main Menu
74	85	static function cookieadmin_plugin_menu(){
		@@ -97,8 +108,14 @@
97	108
98	109	if(defined('COOKIEADMIN_PREMIUM')){
99	110	add_submenu_page('cookieadmin', __('Consent Logs', 'cookieadmin'), __('Consent Logs', 'cookieadmin'), $capability, 'cookieadmin-consent-logs', '\CookieAdminPro\Admin::show_consent_logs');
100	111
	112	+ // GEO Targeting
	113	+ add_submenu_page('cookieadmin', __('Geo Targeting', 'cookieadmin'), __('Geo Targeting', 'cookieadmin'), $capability, 'cookieadmin-geo-targeting', '\CookieAdminPro\Admin\Geo::geo_admin_page');
	114	+
	115	+ // Do Not Sell menu
	116	+ add_submenu_page('cookieadmin', __('Do Not Sell Requests', 'cookieadmin'), __('Do Not Sell', 'cookieadmin'), $capability, 'cookieadmin-do-not-sell', '\CookieAdminPro\Admin\DoNotSell::do_not_sell_requests');
	117	+
101	118	if(!defined('SITEPAD')){
102	119	add_submenu_page('cookieadmin', __('License', 'cookieadmin'), __('License', 'cookieadmin'), $capability, 'cookieadmin-license', '\CookieAdminPro\License::cookieadmin_show_license');
103	120	}
104	121	}else if(!defined('SITEPAD')){
		@@ -110,60 +127,57 @@
110	127	// cookieadmin header
111	128	static function header_theme($title = 'Dashboard'){
112	129
113	130	global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg;
114		-
	131	+
	132	+ self::conflict_notice();
	133	+
115	134	echo '
116		- <div class="cookieadmin-metabox-holder columns-2">
117		- <div class="cookieadmin-postbox-container">
118		- <div style="margin: 10px 20px 0 2px;" class="wrap">
	135	+ <div class="cookieadmin-metabox-holder">
	136	+ <div class="cookieadmin-header">
	137	+ <div class="cookieadmin-header-left">
119	138	<div class="cookieadmin-icon">
120	139	<img class="cookieadmin-logo" src="'.esc_attr(COOKIEADMIN_PLUGIN_URL).'assets/images/cookieadmin-logo.png" alt="CookieAdmin Logo">
121	140	</div>
	141	+ <span class="cookieadmin-header-version">v'.esc_html(COOKIEADMIN_VERSION).'</span>
122	142	</div>
123		- <h2>'.esc_html($title).'</h2>';
124		-
	143	+ <div class="cookieadmin-header-right">
	144	+ <a href="https://cookieadmin.net/docs" class="cookieadmin-header-link" target="_blank"><span class="dashicons dashicons-book-alt"></span> ' . esc_html__('Documentation', 'cookieadmin') . '</a>
	145	+ <span class="cookieadmin-header-separator"></span>
	146	+ <a href="https://softaculous.deskuss.com/open.php?topicId=26" class="cookieadmin-header-link" target="_blank"><span class="dashicons dashicons-sos"></span> ' . esc_html__('Support', 'cookieadmin') . '</a>
	147	+ </div>
	148	+ </div>
	149	+ <h1 class="cookieadmin-page-title">'.esc_html($title).'</h1>';
	150	+
125	151	if(!empty($cookieadmin_error)){
126		- echo '<div id="cookieadmin_message" class="error"><p>'.esc_html($cookieadmin_error).'</p></div>';
	152	+ echo '<div class="cookieadmin-notice"><div id="cookieadmin_message" class="error"><p>'.esc_html($cookieadmin_error).'</p></div></div>';
127	153	}
128	154
129	155	if(!empty($cookieadmin_msg)){
130		- echo '<div id="cookieadmin_message" class="updated"><p>'.esc_html($cookieadmin_msg).'</p></div>';
	156	+ echo '<div class="cookieadmin-notice"><div id="cookieadmin_message" class="updated"><p>'.esc_html($cookieadmin_msg).'</p></div></div>';
131	157	}
	158	+
	159	+ echo '<div class="cookieadmin-postbox-container">';
132	160	}
133	161
134	162	// cookieadmin footer
135	163	static function footer_theme($no_twitter = 0){
136	164	global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg;
137		-
	165	+
	166	+ echo '</div>';
	167	+
138	168	if(!defined('SITEPAD')){
139		- echo '</div>
140		- <div class="cookieadmin-footer">';
	169	+ echo '<div class="cookieadmin-footer">
	170	+ <a href="'.esc_url(COOKIEADMIN_WWW_URL).'" target="_blank">CookieAdmin</a> v'.esc_html(COOKIEADMIN_VERSION).' &middot; ' . esc_html__('Report bugs', 'cookieadmin') . ' <a href="https://softaculous.deskuss.com/open.php?topicId=26" target="_blank">'.esc_html__('here', 'cookieadmin').'</a>';
141	171
142		- if(empty($no_twitter)){
143		-
144		- echo '<br/><div class="cookieadmin-twitter">
145		- <span>'.esc_html__('Share with your followers', 'cookieadmin').'</span><br /><br />
146		- <form method="get" action="https://twitter.com/intent/tweet" id="tweet" onsubmit="return cookieadmin_dotweet(this);">
147		- <textarea name="text" cols="60" row="4" style="resize:none;">'.esc_html__('I easily manage Cookie Consent Banner on my #WordPress site using @cookieadmin', 'cookieadmin').'</textarea>
148		- <br />
149		- <input type="submit" value="Tweet!" class="cookieadmin-btn cookieadmin-btn-secondary" onsubmit="return false;" id="twitter-btn" style="margin-top:7px;"/>
150		- </form>
151		- </div>
152		- <br/>
153		- <hr>';
154		-
155		- }
156		-
157		- echo '<a href="'.esc_url(COOKIEADMIN_WWW_URL).'" target="_blank">CookieAdmin</a><span> v'.esc_html(COOKIEADMIN_VERSION).esc_html__(' You can report any bugs ', 'cookieadmin').'</span><a href="http://wordpress.org/support/plugin/cookieadmin" target="_blank">'.esc_html__('here', 'cookieadmin').'</a>. ';
158		-
159	172	if(defined('COOKIEADMIN_PREMIUM')){
160		- echo 'Or email us at <a href="mailto:support@cookieadmin.net">support@cookieadmin.net</a>';
	173	+ echo ' &middot; <a href="mailto:support@cookieadmin.net">'.esc_html__('Email support', 'cookieadmin').'</a>';
161	174	}
162		-
163		- echo '</div>
164		- </div>';
	175	+
	176	+ echo '</div>';
165	177	}
	178	+
	179	+ echo '</div>';
166	180	}
167	181
168	182	static function cookieadmin_table_exists($table_name) {
169	183	global $wpdb;
		@@ -298,8 +312,43 @@
298	312	});');
299	313
300	314	}
301	315
	316	+ static function conflict_notice(){
	317	+
	318	+ $conflicting = [
	319	+ 'complianz-gdpr/complianz-gdpr.php' => 'Complianz',
	320	+ 'cookie-law-info/cookie-law-info.php' => 'CookieYes',
	321	+ 'cookiebot/cookiebot.php' => 'Cookiebot',
	322	+ 'cookie-notice/cookie-notice.php' => 'Cookie Notice',
	323	+ 'gdpr-cookie-compliance/gdpr-cookie-compliance.php' => 'GDPR Cookie Compliance',
	324	+ 'borlabs-cookie/borlabs-cookie.php' => 'Borlabs Cookie',
	325	+ 'wp-gdpr-compliance/wp-gdpr-compliance.php' => 'Cookie Information',
	326	+ ];
	327	+
	328	+ if(!function_exists('is_plugin_active')){
	329	+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
	330	+ }
	331	+
	332	+ $active = [];
	333	+ foreach($conflicting as $slug => $name){
	334	+ if(is_plugin_active($slug)){
	335	+ $active[] = $name;
	336	+ }
	337	+ }
	338	+
	339	+ if(empty($active)){
	340	+ return;
	341	+ }
	342	+
	343	+ $names = implode(', ', $active);
	344	+
	345	+ echo '<div class="cookieadmin-conflict-notice">
	346	+ <span class="dashicons dashicons-warning"></span>
	347	+ <span>'.sprintf(__('Conflicting plugin(s) detected: <b>%s</b>. Please deactivate them to avoid issues with CookieAdmin.', 'cookieadmin'), esc_html($names)).'</span>
	348	+ </div>';
	349	+ }
	350	+
302	351	static function close_notices(){
303	352
304	353	if(empty($_REQUEST['notice'])){
305	354	return;
		@@ -380,9 +429,9 @@
380	429	if(cookieadmin_is_pro()){
381	430	return '';
382	431	}
383	432
384		- $msg = ' <sup style="font-size:11px;"><a href="'.COOKIEADMIN_PRO_URL.'" target="_blank" style="text-decoration:none; color:red;"><b>'.esc_html__('Pro', 'cookieadmin').'</b></a></sup>';
	433	+ $msg = ' <a href="'.esc_url(COOKIEADMIN_PRO_URL).'" target="_blank" class="cookieadmin-pro-badge">'.esc_html__('Pro', 'cookieadmin').'</a>';
385	434
386	435	if(!empty($return)){
387	436	return $msg;
388	437	}else{