| @@ -35,8 +35,13 @@ | ||
| 35 | 35 | $cookieadmin_requires_pro = \CookieAdmin\Admin::is_feature_available(1); |
| 36 | 36 | |
| 37 | 37 | $icons_grid = apply_filters('cookieadmin_reconsent_icons', '', $policy[$view]); |
| 38 | 38 | |
| 39 | + $law_types = apply_filters('cookieadmin_geo_law_options', [ | |
| 40 | + 'cookieadmin_gdpr' => __('GDPR', 'cookieadmin'), | |
| 41 | + 'cookieadmin_us' => __('US State Laws', 'cookieadmin'), | |
| 42 | + ]); | |
| 43 | + | |
| 39 | 44 | //Start UI |
| 40 | 45 | \CookieAdmin\Admin::header_theme(__('Consent Form', 'cookieadmin')); |
| 41 | 46 | |
| 42 | 47 | echo ' |
| @@ -51,12 +56,13 @@ | ||
| 51 | 56 | |
| 52 | 57 | <div class="cookieadmin-setting"> |
| 53 | 58 | <label class="cookieadmin-title" for="cookieadmin_consent_type">'.esc_html__('Consent Type', 'cookieadmin').'</label> |
| 54 | 59 | <div class="cookieadmin-setting-contents"> |
| 55 | - <select name="cookieadmin_consent_type" id="cookieadmin_consent_type"> | |
| 56 | - <option name="cookieadmin_gdpr" id="cookieadmin_gdpr" '.((!empty($view) && $view === 'cookieadmin_gdpr') ? 'selected' : '').' value="cookieadmin_gdpr">'.esc_html__('GDPR', 'cookieadmin').'</option> | |
| 57 | - <option name="cookieadmin_us" id="cookieadmin_us" '.((!empty($view) && $view === 'cookieadmin_us') ? 'selected' : '').' value="cookieadmin_us">'.esc_html__('US State Laws', 'cookieadmin').'</option> | |
| 58 | - </select> | |
| 60 | + <select name="cookieadmin_consent_type" id="cookieadmin_consent_type">'; | |
| 61 | + foreach($law_types as $name => $label){ | |
| 62 | + echo '<option name="'.esc_attr($name).'" id="'.esc_attr($name).'" '.((!empty($view) && $view === $name) ? 'selected' : '').' value="'.esc_attr($name).'">'.esc_html($label).'</option>'; | |
| 63 | + } | |
| 64 | + echo '</select> | |
| 59 | 65 | </div> |
| 60 | 66 | </div> |
| 61 | 67 | |
| 62 | 68 | <div class="cookieadmin-setting cookieadmin_consent-expiry"> |
| @@ -399,9 +405,12 @@ | ||
| 399 | 405 | $cookieadmin_consent_type = isset( $_REQUEST['cookieadmin_consent_type'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['cookieadmin_consent_type'] ) ) : ''; |
| 400 | 406 | |
| 401 | 407 | if(!empty($cookieadmin_consent_type)){ |
| 402 | 408 | |
| 403 | - $laws = array('cookieadmin_gdpr' => '', 'cookieadmin_us' => ''); | |
| 409 | + $laws = apply_filters('cookieadmin_geo_law_options', [ | |
| 410 | + 'cookieadmin_gdpr' => __('GDPR', 'cookieadmin'), | |
| 411 | + 'cookieadmin_us' => __('US State Laws', 'cookieadmin'), | |
| 412 | + ]); | |
| 404 | 413 | |
| 405 | 414 | $law = array_key_exists($cookieadmin_consent_type, $laws) ? $cookieadmin_consent_type : 'cookieadmin_gdpr'; |
| 406 | 415 | |
| 407 | 416 | if(empty($cookieadmin_error)){ |
| @@ -422,12 +431,12 @@ | ||
| 422 | 431 | unset($setting['cookieadmin_position']); |
| 423 | 432 | } |
| 424 | 433 | |
| 425 | 434 | $setting['cookieadmin_notice_title'] = !empty($_REQUEST['cookieadmin_notice_title']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_title'])) : $policy[$law]['cookieadmin_notice_title']; |
| 426 | - $setting['cookieadmin_notice_title_color'] = !empty($_REQUEST['cookieadmin_notice_title_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_title_color'])) : (!empty($policy[$law]['cookieadmin_notice_title_color']) ? $policy[$law]['cookieadmin_notice_title_color'] : '#000000'); | |
| 435 | + $setting['cookieadmin_notice_title_color'] = !empty($_REQUEST['cookieadmin_notice_title_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_title_color'])) : (!empty($policy[$law]['cookieadmin_notice_title_color']) ? $policy[$law]['cookieadmin_notice_title_color'] : '#1f2937'); | |
| 427 | 436 | |
| 428 | 437 | $setting['cookieadmin_notice'] = !empty($_REQUEST['cookieadmin_notice']) ? wp_kses(wp_unslash($_REQUEST['cookieadmin_notice']), cookieadmin_kses_allowed_html()) : $policy[$law]['cookieadmin_notice']; |
| 429 | - $setting['cookieadmin_notice_color'] = !empty($_REQUEST['cookieadmin_notice_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_color'])) : (!empty($policy[$law]['cookieadmin_notice_color']) ? $policy[$law]['cookieadmin_notice_color'] : '#000000'); | |
| 438 | + $setting['cookieadmin_notice_color'] = !empty($_REQUEST['cookieadmin_notice_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_color'])) : (!empty($policy[$law]['cookieadmin_notice_color']) ? $policy[$law]['cookieadmin_notice_color'] : '#1f2937'); | |
| 430 | 439 | |
| 431 | 440 | $setting['cookieadmin_consent_inside_bg_color'] = !empty($_REQUEST['cookieadmin_consent_inside_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_consent_inside_bg_color'])) : (!empty($policy[$law]['cookieadmin_consent_inside_bg_color']) ? $policy[$law]['cookieadmin_consent_inside_bg_color'] : '#ffffff'); |
| 432 | 441 | $setting['cookieadmin_consent_inside_border_color'] = !empty($_REQUEST['cookieadmin_consent_inside_border_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_consent_inside_border_color'])) : (!empty($policy[$law]['cookieadmin_consent_inside_border_color']) ? $policy[$law]['cookieadmin_consent_inside_border_color'] : '#000000'); |
| 433 | 442 | |
| @@ -447,12 +456,12 @@ | ||
| 447 | 456 | $setting['cookieadmin_save_btn_color'] = !empty($_REQUEST['cookieadmin_save_btn_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_save_btn_color'])) : (!empty($policy[$law]['cookieadmin_save_btn_color']) ? $policy[$law]['cookieadmin_save_btn_color'] : '#ffffff'); |
| 448 | 457 | $setting['cookieadmin_save_btn_bg_color'] = !empty($_REQUEST['cookieadmin_save_btn_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_save_btn_bg_color'])) : (!empty($policy[$law]['cookieadmin_save_btn_bg_color']) ? $policy[$law]['cookieadmin_save_btn_bg_color'] : '#183833'); |
| 449 | 458 | |
| 450 | 459 | $setting['cookieadmin_preference_title'] = !empty($_REQUEST['cookieadmin_preference_title']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_preference_title'])) : $policy[$law]['cookieadmin_preference_title']; |
| 451 | - $setting['cookieadmin_preference_title_color'] = !empty($_REQUEST['cookieadmin_preference_title_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_preference_title_color'])) : (!empty($policy[$law]['cookieadmin_preference_title_color']) ? $policy[$law]['cookieadmin_preference_title_color'] : '#000000'); | |
| 460 | + $setting['cookieadmin_preference_title_color'] = !empty($_REQUEST['cookieadmin_preference_title_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_preference_title_color'])) : (!empty($policy[$law]['cookieadmin_preference_title_color']) ? $policy[$law]['cookieadmin_preference_title_color'] : '#1f2937'); | |
| 452 | 461 | |
| 453 | 462 | $setting['cookieadmin_preference'] = !empty($_REQUEST['cookieadmin_preference']) ? wp_kses(wp_unslash($_REQUEST['cookieadmin_preference']), cookieadmin_kses_allowed_html()) : $policy[$law]['cookieadmin_preference']; |
| 454 | - $setting['cookieadmin_details_wrapper_color'] = !empty($_REQUEST['cookieadmin_details_wrapper_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_details_wrapper_color'])) : (!empty($policy[$law]['cookieadmin_details_wrapper_color']) ? $policy[$law]['cookieadmin_details_wrapper_color'] : '#000000'); | |
| 463 | + $setting['cookieadmin_details_wrapper_color'] = !empty($_REQUEST['cookieadmin_details_wrapper_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_details_wrapper_color'])) : (!empty($policy[$law]['cookieadmin_details_wrapper_color']) ? $policy[$law]['cookieadmin_details_wrapper_color'] : '#1f2937'); | |
| 455 | 464 | |
| 456 | 465 | $setting['cookieadmin_cookie_modal_bg_color'] = !empty($_REQUEST['cookieadmin_cookie_modal_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_cookie_modal_bg_color'])) : (!empty($policy[$law]['cookieadmin_cookie_modal_bg_color']) ? $policy[$law]['cookieadmin_cookie_modal_bg_color'] : '#ffffff'); |
| 457 | 466 | $setting['cookieadmin_cookie_modal_border_color'] = !empty($_REQUEST['cookieadmin_cookie_modal_border_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_cookie_modal_border_color'])) : (!empty($policy[$law]['cookieadmin_cookie_modal_border_color']) ? $policy[$law]['cookieadmin_cookie_modal_border_color'] : '#000000'); |
| 458 | 467 | |
| @@ -480,9 +489,9 @@ | ||
| 480 | 489 | $cookieadmin_check_changes = array('cookieadmin_notice_title', 'cookieadmin_notice', 'cookieadmin_preference_title', 'cookieadmin_preference', 'reConsent_title', 'cookieadmin_customize_btn', 'cookieadmin_reject_btn', 'cookieadmin_accept_btn', 'cookieadmin_save_btn'); |
| 481 | 490 | |
| 482 | 491 | foreach($cookieadmin_check_changes as $c_field){ |
| 483 | 492 | foreach($policy as $c_law => $c_val){ |
| 484 | - if(!empty($c_val[$c_field]) && $c_val[$c_field] == $cookieadmin_policies[$c_law][$c_field]){ | |
| 493 | + if(!empty($cookieadmin_policies[$c_law]) && !empty($c_val[$c_field]) && $c_val[$c_field] == $cookieadmin_policies[$c_law][$c_field]){ | |
| 485 | 494 | unset($policy[$c_law][$c_field]); |
| 486 | 495 | } |
| 487 | 496 | } |
| 488 | 497 | } |
| @@ -492,5 +501,5 @@ | ||
| 492 | 501 | if(empty($cookieadmin_error)){ |
| 493 | 502 | $cookieadmin_msg = __('Settings saved successfully', 'cookieadmin'); |
| 494 | 503 | } |
| 495 | 504 | } |
| 496 | -} | |
| 505 | +} | |
