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

		@@ -30,8 +30,10 @@
30	30	'cookieadmin-scan-cookies',
31	31	'cookieadmin-consent',
32	32	'cookieadmin-consent-logs',
33	33	'cookieadmin-license',
	34	+ 'cookieadmin-do-not-sell',
	35	+ 'cookieadmin-dpdp'
34	36	];
35	37
36	38	if(empty($current_page) || !in_array($current_page, $plugin_pages)){
37	39	return true;
		@@ -61,8 +63,12 @@
61	63	$policy['lang']['show_less'] = __('Show less', 'cookieadmin');
62	64	$policy['lang']['days'] = __('Day(s)', 'cookieadmin');
63	65	$policy['lang']['session'] = __('Session', 'cookieadmin');
64	66	$policy['lang']['scan_completed'] = __('Scan completed', 'cookieadmin');
	67	+ $policy['lang']['processing'] = __('Processing...', 'cookieadmin');
	68	+ $policy['lang']['active'] = __('Active', 'cookieadmin');
	69	+ $policy['lang']['install_failed'] = __('Installation failed. Please try again.', 'cookieadmin');
	70	+ $policy['lang']['error_occurred'] = __('An error occurred. Please try again.', 'cookieadmin');
65	71
66	72	wp_localize_script('cookieadmin_js', 'cookieadmin_policy', $policy);
67	73	}
68	74
		@@ -67,8 +73,14 @@
67	73	}
68	74
69	75	wp_enqueue_script('cookieadmin_js_footer', COOKIEADMIN_PLUGIN_URL . 'assets/js/footer.js', [], COOKIEADMIN_VERSION);
70	76	wp_localize_script('cookieadmin_js_footer', 'cookieadmin_data', array('is_pro' => cookieadmin_is_pro()));
	77	+
	78	+ // We only need to upload icon on consent form page
	79	+ if(!empty($_GET['page']) && $_GET['page'] == 'cookieadmin-consent'){
	80	+ //to upload icons
	81	+ wp_enqueue_media();
	82	+ }
71	83	}
72	84
73	85	//Add Main Menu
74	86	static function cookieadmin_plugin_menu(){
		@@ -97,8 +109,17 @@
97	109
98	110	if(defined('COOKIEADMIN_PREMIUM')){
99	111	add_submenu_page('cookieadmin', __('Consent Logs', 'cookieadmin'), __('Consent Logs', 'cookieadmin'), $capability, 'cookieadmin-consent-logs', '\CookieAdminPro\Admin::show_consent_logs');
100	112
	113	+ // GEO Targeting
	114	+ add_submenu_page('cookieadmin', __('Geo Targeting', 'cookieadmin'), __('Geo Targeting', 'cookieadmin'), $capability, 'cookieadmin-geo-targeting', '\CookieAdminPro\Admin\Geo::geo_admin_page');
	115	+
	116	+ // Do Not Sell menu
	117	+ 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');
	118	+
	119	+ // DPDP (India) Data Principal Requests menu
	120	+ add_submenu_page('cookieadmin', __('DPDP Requests', 'cookieadmin'), __('DPDP Requests', 'cookieadmin'), $capability, 'cookieadmin-dpdp', '\CookieAdminPro\Admin\DPDP::dpdp_requests');
	121	+
101	122	if(!defined('SITEPAD')){
102	123	add_submenu_page('cookieadmin', __('License', 'cookieadmin'), __('License', 'cookieadmin'), $capability, 'cookieadmin-license', '\CookieAdminPro\License::cookieadmin_show_license');
103	124	}
104	125	}else if(!defined('SITEPAD')){
		@@ -110,60 +131,57 @@
110	131	// cookieadmin header
111	132	static function header_theme($title = 'Dashboard'){
112	133
113	134	global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg;
114		-
	135	+
	136	+ self::conflict_notice();
	137	+
115	138	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">
	139	+ <div class="cookieadmin-metabox-holder">
	140	+ <div class="cookieadmin-header">
	141	+ <div class="cookieadmin-header-left">
119	142	<div class="cookieadmin-icon">
120	143	<img class="cookieadmin-logo" src="'.esc_attr(COOKIEADMIN_PLUGIN_URL).'assets/images/cookieadmin-logo.png" alt="CookieAdmin Logo">
121	144	</div>
	145	+ <span class="cookieadmin-header-version">v'.esc_html(COOKIEADMIN_VERSION).'</span>
122	146	</div>
123		- <h2>'.esc_html($title).'</h2>';
124		-
	147	+ <div class="cookieadmin-header-right">
	148	+ <a href="https://cookieadmin.net/docs" class="cookieadmin-header-link" target="_blank"><span class="dashicons dashicons-book-alt"></span> ' . esc_html__('Documentation', 'cookieadmin') . '</a>
	149	+ <span class="cookieadmin-header-separator"></span>
	150	+ <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>
	151	+ </div>
	152	+ </div>
	153	+ <h1 class="cookieadmin-page-title">'.esc_html($title).'</h1>';
	154	+
125	155	if(!empty($cookieadmin_error)){
126		- echo '<div id="cookieadmin_message" class="error"><p>'.esc_html($cookieadmin_error).'</p></div>';
	156	+ echo '<div class="cookieadmin-notice"><div id="cookieadmin_message" class="error"><p>'.esc_html($cookieadmin_error).'</p></div></div>';
127	157	}
128	158
129	159	if(!empty($cookieadmin_msg)){
130		- echo '<div id="cookieadmin_message" class="updated"><p>'.esc_html($cookieadmin_msg).'</p></div>';
	160	+ echo '<div class="cookieadmin-notice"><div id="cookieadmin_message" class="updated"><p>'.esc_html($cookieadmin_msg).'</p></div></div>';
131	161	}
	162	+
	163	+ echo '<div class="cookieadmin-postbox-container">';
132	164	}
133	165
134	166	// cookieadmin footer
135	167	static function footer_theme($no_twitter = 0){
136	168	global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg;
137		-
	169	+
	170	+ echo '</div>';
	171	+
138	172	if(!defined('SITEPAD')){
139		- echo '</div>
140		- <div class="cookieadmin-footer">';
	173	+ echo '<div class="cookieadmin-footer">
	174	+ <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	175
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	176	if(defined('COOKIEADMIN_PREMIUM')){
160		- echo 'Or email us at <a href="mailto:[email protected]">[email protected]</a>';
	177	+ echo ' &middot; <a href="mailto:[email protected]">'.esc_html__('Email support', 'cookieadmin').'</a>';
161	178	}
162		-
163		- echo '</div>
164		- </div>';
	179	+
	180	+ echo '</div>';
165	181	}
	182	+
	183	+ echo '</div>';
166	184	}
167	185
168	186	static function cookieadmin_table_exists($table_name) {
169	187	global $wpdb;
		@@ -298,8 +316,43 @@
298	316	});');
299	317
300	318	}
301	319
	320	+ static function conflict_notice(){
	321	+
	322	+ $conflicting = [
	323	+ 'complianz-gdpr/complianz-gdpr.php' => 'Complianz',
	324	+ 'cookie-law-info/cookie-law-info.php' => 'CookieYes',
	325	+ 'cookiebot/cookiebot.php' => 'Cookiebot',
	326	+ 'cookie-notice/cookie-notice.php' => 'Cookie Notice',
	327	+ 'gdpr-cookie-compliance/gdpr-cookie-compliance.php' => 'GDPR Cookie Compliance',
	328	+ 'borlabs-cookie/borlabs-cookie.php' => 'Borlabs Cookie',
	329	+ 'wp-gdpr-compliance/wp-gdpr-compliance.php' => 'Cookie Information',
	330	+ ];
	331	+
	332	+ if(!function_exists('is_plugin_active')){
	333	+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
	334	+ }
	335	+
	336	+ $active = [];
	337	+ foreach($conflicting as $slug => $name){
	338	+ if(is_plugin_active($slug)){
	339	+ $active[] = $name;
	340	+ }
	341	+ }
	342	+
	343	+ if(empty($active)){
	344	+ return;
	345	+ }
	346	+
	347	+ $names = implode(', ', $active);
	348	+
	349	+ echo '<div class="cookieadmin-conflict-notice">
	350	+ <span class="dashicons dashicons-warning"></span>
	351	+ <span>'.sprintf(__('Conflicting plugin(s) detected: <b>%s</b>. Please deactivate them to avoid issues with CookieAdmin.', 'cookieadmin'), esc_html($names)).'</span>
	352	+ </div>';
	353	+ }
	354	+
302	355	static function close_notices(){
303	356
304	357	if(empty($_REQUEST['notice'])){
305	358	return;
		@@ -380,9 +433,9 @@
380	433	if(cookieadmin_is_pro()){
381	434	return '';
382	435	}
383	436
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>';
	437	+ $msg = ' <a href="'.esc_url(COOKIEADMIN_PRO_URL).'" target="_blank" class="cookieadmin-pro-badge">'.esc_html__('Pro', 'cookieadmin').'</a>';
385	438
386	439	if(!empty($return)){
387	440	return $msg;
388	441	}else{