| @@ -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 | |
| @@ -103,8 +108,14 @@ | ||
| 103 | 108 | |
| 104 | 109 | if(defined('COOKIEADMIN_PREMIUM')){ |
| 105 | 110 | add_submenu_page('cookieadmin', __('Consent Logs', 'cookieadmin'), __('Consent Logs', 'cookieadmin'), $capability, 'cookieadmin-consent-logs', '\CookieAdminPro\Admin::show_consent_logs'); |
| 106 | 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 | + | |
| 107 | 118 | if(!defined('SITEPAD')){ |
| 108 | 119 | add_submenu_page('cookieadmin', __('License', 'cookieadmin'), __('License', 'cookieadmin'), $capability, 'cookieadmin-license', '\CookieAdminPro\License::cookieadmin_show_license'); |
| 109 | 120 | } |
| 110 | 121 | }else if(!defined('SITEPAD')){ |
| @@ -117,8 +128,10 @@ | ||
| 117 | 128 | static function header_theme($title = 'Dashboard'){ |
| 118 | 129 | |
| 119 | 130 | global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg; |
| 120 | 131 | |
| 132 | + self::conflict_notice(); | |
| 133 | + | |
| 121 | 134 | echo ' |
| 122 | 135 | <div class="cookieadmin-metabox-holder"> |
| 123 | 136 | <div class="cookieadmin-header"> |
| 124 | 137 | <div class="cookieadmin-header-left"> |
| @@ -299,8 +312,43 @@ | ||
| 299 | 312 | });'); |
| 300 | 313 | |
| 301 | 314 | } |
| 302 | 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 | + | |
| 303 | 351 | static function close_notices(){ |
| 304 | 352 | |
| 305 | 353 | if(empty($_REQUEST['notice'])){ |
| 306 | 354 | return; |
