Changeset 3352505
- Timestamp:
- 08/29/2025 09:37:12 AM (7 months ago)
- Location:
- cookie-optimizer
- Files:
-
- 13 deleted
- 7 edited
- 59 copied
-
tags/1.0.14 (copied) (copied from cookie-optimizer/trunk)
-
tags/1.0.14/app/Includes/CookieOptBanner.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptBanner.php) (6 diffs)
-
tags/1.0.14/app/Includes/CookieOptBannerPreview.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptBannerPreview.php)
-
tags/1.0.14/app/Includes/CookieOptBaseInc.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptBaseInc.php)
-
tags/1.0.14/app/Includes/CookieOptCookiePolicy.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptCookiePolicy.php)
-
tags/1.0.14/app/Includes/CookieOptDashboard.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptDashboard.php)
-
tags/1.0.14/app/Includes/CookieOptLanguages.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptLanguages.php)
-
tags/1.0.14/app/Includes/CookieOptOther.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptOther.php)
-
tags/1.0.14/app/Includes/CookieOptPermission.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptPermission.php)
-
tags/1.0.14/app/Includes/CookieOptPublishSettings.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptPublishSettings.php)
-
tags/1.0.14/app/Includes/CookieOptTagManagement.php (copied) (copied from cookie-optimizer/trunk/app/Includes/CookieOptTagManagement.php)
-
tags/1.0.14/app/Includes/FeatureManager/FeatureUser/CookieIOptPackageBase.php (copied) (copied from cookie-optimizer/trunk/app/Includes/FeatureManager/FeatureUser/CookieIOptPackageBase.php)
-
tags/1.0.14/app/Includes/FeatureManager/FeatureUser/CookieOptBasic.php (copied) (copied from cookie-optimizer/trunk/app/Includes/FeatureManager/FeatureUser/CookieOptBasic.php)
-
tags/1.0.14/app/Includes/FeatureManager/FeatureUser/CookieOptFree.php (copied) (copied from cookie-optimizer/trunk/app/Includes/FeatureManager/FeatureUser/CookieOptFree.php)
-
tags/1.0.14/app/Includes/FeatureManager/FeatureUser/CookieOptManager.php (copied) (copied from cookie-optimizer/trunk/app/Includes/FeatureManager/FeatureUser/CookieOptManager.php)
-
tags/1.0.14/app/Includes/FeatureManager/FeatureUser/CookieOptPro.php (copied) (copied from cookie-optimizer/trunk/app/Includes/FeatureManager/FeatureUser/CookieOptPro.php)
-
tags/1.0.14/app/Services/CookieOptBannerService.php (copied) (copied from cookie-optimizer/trunk/app/Services/CookieOptBannerService.php)
-
tags/1.0.14/app/Services/CookieOptDashboardService.php (copied) (copied from cookie-optimizer/trunk/app/Services/CookieOptDashboardService.php)
-
tags/1.0.14/app/Services/CookieOptPolicyServices.php (copied) (copied from cookie-optimizer/trunk/app/Services/CookieOptPolicyServices.php)
-
tags/1.0.14/app/Services/CookieOptPublishSettingsService.php (copied) (copied from cookie-optimizer/trunk/app/Services/CookieOptPublishSettingsService.php)
-
tags/1.0.14/app/Services/CookiePermissionService.php (copied) (copied from cookie-optimizer/trunk/app/Services/CookiePermissionService.php) (9 diffs)
-
tags/1.0.14/app/Services/ViewHelper/CookieOptBannerView.php (deleted)
-
tags/1.0.14/constants.php (copied) (copied from cookie-optimizer/trunk/constants.php) (1 diff)
-
tags/1.0.14/cookie-opt.php (copied) (copied from cookie-optimizer/trunk/cookie-opt.php) (3 diffs)
-
tags/1.0.14/functions.php (copied) (copied from cookie-optimizer/trunk/functions.php)
-
tags/1.0.14/languages/cookie-opt-ja.mo (copied) (copied from cookie-optimizer/trunk/languages/cookie-opt-ja.mo)
-
tags/1.0.14/languages/cookie-opt-ja.po (copied) (copied from cookie-optimizer/trunk/languages/cookie-opt-ja.po)
-
tags/1.0.14/languages/cookie-opt.pot (copied) (copied from cookie-optimizer/trunk/languages/cookie-opt.pot)
-
tags/1.0.14/languages/cookie-optimizer-ja.mo (deleted)
-
tags/1.0.14/languages/cookie-optimizer-ja.po (deleted)
-
tags/1.0.14/languages/cookie-optimizer.mo (deleted)
-
tags/1.0.14/languages/cookie-optimizer.pot (deleted)
-
tags/1.0.14/package.json (deleted)
-
tags/1.0.14/public/assets/css/banner.css (deleted)
-
tags/1.0.14/public/assets/css/cookie_permission_custom.css (deleted)
-
tags/1.0.14/public/assets/css/dashboard.css (deleted)
-
tags/1.0.14/public/assets/css/page_policy_render.css (copied) (copied from cookie-optimizer/trunk/public/assets/css/page_policy_render.css)
-
tags/1.0.14/public/assets/css/policy.css (deleted)
-
tags/1.0.14/public/assets/css/publish_setting.css (deleted)
-
tags/1.0.14/public/assets/css/tag_management.css (deleted)
-
tags/1.0.14/public/assets/images/CCPA.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/CCPA.png)
-
tags/1.0.14/public/assets/images/GDPR.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/GDPR.png)
-
tags/1.0.14/public/assets/images/TBA.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/TBA.png)
-
tags/1.0.14/public/assets/images/cookie-banner-bottom.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-banner-bottom.png)
-
tags/1.0.14/public/assets/images/cookie-banner-top.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-banner-top.png)
-
tags/1.0.14/public/assets/images/cookie-box-bottom-left.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-box-bottom-left.png)
-
tags/1.0.14/public/assets/images/cookie-box-bottom-right.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-box-bottom-right.png)
-
tags/1.0.14/public/assets/images/cookie-box-top-left.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-box-top-left.png)
-
tags/1.0.14/public/assets/images/cookie-box-top-right.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-box-top-right.png)
-
tags/1.0.14/public/assets/images/cookie-classic-bottom.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-classic-bottom.png)
-
tags/1.0.14/public/assets/images/cookie-classic-top.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-classic-top.png)
-
tags/1.0.14/public/assets/images/cookie-popup.png (copied) (copied from cookie-optimizer/trunk/public/assets/images/cookie-popup.png)
-
tags/1.0.14/public/build/assets/css/app.css (copied) (copied from cookie-optimizer/trunk/public/build/assets/css/app.css)
-
tags/1.0.14/public/build/assets/css/banner.css (copied) (copied from cookie-optimizer/trunk/public/build/assets/css/banner.css)
-
tags/1.0.14/public/build/assets/js/banner.js (copied) (copied from cookie-optimizer/trunk/public/build/assets/js/banner.js) (1 diff)
-
tags/1.0.14/public/build/assets/js/cookie-policy.js (copied) (copied from cookie-optimizer/trunk/public/build/assets/js/cookie-policy.js)
-
tags/1.0.14/public/build/assets/js/cookie-scan.js (copied) (copied from cookie-optimizer/trunk/public/build/assets/js/cookie-scan.js)
-
tags/1.0.14/public/build/assets/js/cookie_startup.js (copied) (copied from cookie-optimizer/trunk/public/build/assets/js/cookie_startup.js)
-
tags/1.0.14/public/build/manifest.json (copied) (copied from cookie-optimizer/trunk/public/build/manifest.json)
-
tags/1.0.14/readme.txt (copied) (copied from cookie-optimizer/trunk/readme.txt) (2 diffs)
-
tags/1.0.14/table/create_table.php (copied) (copied from cookie-optimizer/trunk/table/create_table.php)
-
tags/1.0.14/templates/banner/banner_main.php (copied) (copied from cookie-optimizer/trunk/templates/banner/banner_main.php)
-
tags/1.0.14/templates/banner/banner_preview.php (copied) (copied from cookie-optimizer/trunk/templates/banner/banner_preview.php)
-
tags/1.0.14/templates/cookie_permissions/cookie_permission_banner.php (deleted)
-
tags/1.0.14/templates/cookie_permissions/partials/cookie_opt_setting_data_setup.php (copied) (copied from cookie-optimizer/trunk/templates/cookie_permissions/partials/cookie_opt_setting_data_setup.php)
-
tags/1.0.14/templates/cookie_policy/cookie-policy-page-for-render.php (copied) (copied from cookie-optimizer/trunk/templates/cookie_policy/cookie-policy-page-for-render.php)
-
tags/1.0.14/templates/module/notice.php (copied) (copied from cookie-optimizer/trunk/templates/module/notice.php)
-
tags/1.0.14/templates/module/notice_up_plan.php (copied) (copied from cookie-optimizer/trunk/templates/module/notice_up_plan.php)
-
tags/1.0.14/templates/publish_setting/index.php (copied) (copied from cookie-optimizer/trunk/templates/publish_setting/index.php)
-
tags/1.0.14/uninstall.php (copied) (copied from cookie-optimizer/trunk/uninstall.php) (1 diff)
-
tags/1.0.14/vendor/composer/autoload_classmap.php (copied) (copied from cookie-optimizer/trunk/vendor/composer/autoload_classmap.php)
-
tags/1.0.14/vendor/composer/autoload_static.php (copied) (copied from cookie-optimizer/trunk/vendor/composer/autoload_static.php)
-
trunk/app/Includes/CookieOptBanner.php (modified) (6 diffs)
-
trunk/app/Services/CookiePermissionService.php (modified) (9 diffs)
-
trunk/constants.php (modified) (1 diff)
-
trunk/cookie-opt.php (modified) (3 diffs)
-
trunk/public/build/assets/js/banner.js (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/uninstall.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
cookie-optimizer/tags/1.0.14/app/Includes/CookieOptBanner.php
r3352481 r3352505 173 173 public function register_enqueue_script() 174 174 { 175 $data_events = $this->prepare_data_ for_render_cookie();175 $data_events = $this->prepare_data_localize(); 176 176 wp_register_script( 177 177 'cookie-custom-banner-js', … … 194 194 } 195 195 196 public function handle_render_banner(){ 196 public function handle_render_banner() 197 { 197 198 $html_banner = $this->data_banner_html(); 198 $is_display_banner = $this->handle_display_banner( );199 $is_display_banner = $this->handle_display_banner($_GET['pageId'], $_GET['pageType'], $_GET['postType'], $_GET['userType']); 199 200 200 201 wp_send_json_success([ … … 205 206 } 206 207 207 public function prepare_data_for_render_cookie(){ 208 public function prepare_data_localize() 209 { 210 global $post; 208 211 $setting = $this->CookiePermissionService->getSettingBanner(); 212 $page_id = (is_singular() && isset($post->ID)) ? (int) $post->ID : 0; 213 $page_type = is_front_page() ? 'front' : 'home'; 214 $post_type = is_singular() ? get_post_type() : ''; 215 $user_type = is_user_logged_in() ? 'login' : 'guest'; 209 216 210 217 return [ … … 215 222 'eventOnScroll' => $setting['onScroll'], 216 223 'eventReload' => $setting['reloading'], 224 'pageId' => $page_id, 225 'pageType' => $page_type, 226 'postType' => $post_type, 227 'userType' => $user_type, 217 228 ]; 218 229 } 219 230 220 public function data_banner_html(){ 231 public function data_banner_html() 232 { 221 233 $data = $this->CookiePermissionService->getDataBannerToShow(); 222 234 ob_start(); … … 229 241 * @return bool true is display, false is hide 230 242 */ 231 public function handle_display_banner(){ 243 public function handle_display_banner($page_id, $page_type, $post_type, $user_type) 244 { 232 245 $is_banner_active = get_option('cookie_opt_banner_active'); 233 246 if ($is_banner_active != 1) … … 257 270 $rules_hide = $banner['conditional']['rules']['hide'] ?? []; 258 271 259 $anyMatch = function (array $rules) : bool {272 $anyMatch = function (array $rules) use($page_id, $page_type, $post_type, $user_type): bool { 260 273 foreach ($rules as $rule) { 261 if ($this->CookiePermissionService->checkParam($rule )) {274 if ($this->CookiePermissionService->checkParam($rule, $page_id, $page_type, $post_type, $user_type)) { 262 275 return true; 263 276 } -
cookie-optimizer/tags/1.0.14/app/Services/CookiePermissionService.php
r3352416 r3352505 888 888 * @return bool 889 889 */ 890 public function checkParam($rule )890 public function checkParam($rule, $page_id, $page_type, $post_type, $user_type) 891 891 { 892 892 switch ($rule['type']) { … … 894 894 $check = $this->handlePageValueCondition( 895 895 $rule['operator'], 896 $rule['value'] 896 $rule['value'], 897 $page_id 897 898 ); 898 899 break; … … 900 901 $check = $this->handlePostTypeValueCondition( 901 902 $rule['operator'], 902 $rule['value'] 903 $rule['value'], 904 $post_type 903 905 ); 904 906 break; … … 906 908 $check = $this->handleUserTypeValueCondition( 907 909 $rule['operator'], 908 $rule['value'] 910 $rule['value'], 911 $user_type 909 912 ); 910 913 break; … … 912 915 $check = $this->handlePageTypeValueCondition( 913 916 $rule['operator'], 914 $rule['value'] 917 $rule['value'], 918 $page_type 915 919 ); 916 920 break; … … 925 929 * @return bool 926 930 */ 927 public function handlePostTypeValueCondition($operator, $value )928 { 929 if ($operator == 'equal') {930 return $value == get_post_type();931 } 932 return false;931 public function handlePostTypeValueCondition($operator, $value, $post_type) 932 { 933 if ($operator === 'equal') { 934 return $value === $post_type; 935 } 936 return $value !== $post_type; 933 937 } 934 938 … … 939 943 * @return bool 940 944 */ 941 public function handlePageValueCondition($operator, $value )942 { 943 if ($operator == 'equal') {944 return is_page((int) $value);945 } 946 return !is_page((int) $value);945 public function handlePageValueCondition($operator, $value, $page_id) 946 { 947 if ($operator === 'equal') { 948 return $page_id === $value; 949 } 950 return $page_id !== $value; 947 951 } 948 952 … … 953 957 * @return bool 954 958 */ 955 public function handlePageTypeValueCondition($operator, $value) 956 { 957 if ($operator == 'equal') { 958 if ($value == 'front') { 959 return is_front_page(); 960 } 961 } else { 962 if ($value == 'home') { 963 return is_front_page(); 964 } 965 } 966 return !is_front_page(); 959 public function handlePageTypeValueCondition($operator, $value, $page_type) 960 { 961 if ($operator === 'equal') { 962 return $page_type === $value; 963 } 964 return $page_type !== $value; 967 965 } 968 966 … … 973 971 * @return bool 974 972 */ 975 public function handleUserTypeValueCondition($operator, $value) 976 { 977 if ( 978 ($operator == 'equal' && $value == 'logged_in') || 979 ($operator == 'not-equal' && $value == 'guest') 980 ) { 981 if (is_user_logged_in()) { 982 return true; 983 } 984 } else { 985 if (!is_user_logged_in()) { 986 return true; 987 } 988 } 989 return false; 973 public function handleUserTypeValueCondition($operator, $value, $user_type) 974 { 975 976 if ($operator === 'equal') { 977 return $user_type === $value; 978 } 979 return $user_type !== $value; 990 980 } 991 981 } -
cookie-optimizer/tags/1.0.14/constants.php
r3352481 r3352505 2 2 3 3 // Plugin version and mode 4 define('VERSION', '1.0.1 3');4 define('VERSION', '1.0.14'); 5 5 6 6 // Plugin directory details -
cookie-optimizer/tags/1.0.14/cookie-opt.php
r3352481 r3352505 12 12 * Plugin URI: https://manage.medipartner.jp 13 13 * Description: Cookieをユーザーに見える化し、各法律にする準拠バナー同意ソリューション 14 * Version: 1.0.1 314 * Version: 1.0.14 15 15 * Requires at least: 5.3 16 16 * Requires PHP: 7.3 … … 51 51 * 52 52 * @class CookieOpt 53 * @version 1.0.1 353 * @version 1.0.14 54 54 */ 55 55 class CookieOpt … … 76 76 */ 77 77 public $defaults = [ 78 'version' => '1.0.1 3',78 'version' => '1.0.14', 79 79 ]; 80 80 -
cookie-optimizer/tags/1.0.14/public/build/assets/js/banner.js
r3352481 r3352505 1 jQuery(document).ready(function( n){let e=!1;n.ajax({url:dataEvent.url,type:"GET",data:{action:"handle_render_banner"},success:function(a){let t=a.data.dataBannerRender,o=a.data.isDisplayBanner;t&&o===!0&&(n("body").prepend(t),f(e))}}),d(),u()});function f(n){dataEvent.eventOnScroll.status===1&&jQuery(window).on("scroll",function(){jQuery(document).scrollTop()>=parseInt(dataEvent.eventOnScroll.value)&&n===!1&&(l().action==0&&(c(1),i(1,dataEvent.regulation),n=!0),jQuery(".modal").hide())}),dataEvent.eventOnclick==1&&(jQuery(window).on("click",function(){if(!jQuery(".modal").is(":hidden")){let a=l();dataEvent.regulation!="ja"&&a.action==0&&(c(1),i(1,dataEvent.regulation)),jQuery(".modal").hide()}jQuery(window).off("click")}),jQuery('div[data-banner="banner-main"], div[data-banner="banner-customize"]').on("click",function(e){e.stopPropagation()})),d(),u()}function u(){if(jQuery(".coop-banner").length>0){let e=jQuery("#none_view").val();jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"handle_view_banner",none:e}})}}function i(n,e){let a,t;if(e==="ja")t={url:dataEvent.url,type:"POST",data:{type:n,action:"handle_banner",none:dataEvent.none_handle_banner}};else{let o=document.getElementById("form-banner");a=new FormData(o),a.append("type",n),t={url:dataEvent.url,type:"POST",contentType:!1,cache:!1,processData:!1,data:a}}jQuery.ajax(t)}function d(){jQuery('i[data-icon="banner-customize"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-main"]').show()}),jQuery('i[data-icon="banner-main"]').on("click",function(){jQuery(".coop-banner").hide(),i(1,dataEvent.regulation)}),jQuery('a[data-button="customize_button"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-customize"]').show()}),jQuery(".handle-cookie").on("click",function(){let n=jQuery(this).attr("data-type");if(dataEvent.regulation!="ja"){let e=y(n);c(e)}else c(1);i(n,dataEvent.regulation),jQuery(".coop-banner").hide(),dataEvent.eventReload==1&&location.reload()})}function y(n){let e=jQuery(".cookie-category-type"),t=Array.from(e).filter(function(s){return s.checked}).length,o=parseInt(n),r=o;return o==2&&(t==3?r=1:t==0?r=3:r=2),r}function p(n,e){jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"set_cookie_opt_server",cookie_value:n,type:e},success:function(a){},error:function(a){console.error(a)}})}function l(){let n;return jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"get_parse_cookie_opt"},success:function(e){n=JSON.parse(e.data.cookie)},error:function(e){}}),n||{action:0,type:0,necessary:1,functional:0,socialmedia:0,performance:0}}function c(n){let e=l();e.action=1,e.type=n,e.necessary=1,n==1?(e.functional=1,e.socialmedia=1,e.performance=1):n==3?(e.functional=0,e.socialmedia=0,e.performance=0):(e.functional=jQuery("#banner__functionality-cookie").is(":checked")?1:0,e.socialmedia=jQuery("#banner__social-media-cookie").is(":checked")?1:0,e.performance=jQuery("#banner__performance-cookie").is(":checked")?1:0);let a=JSON.stringify(e);p(a,n)}1 jQuery(document).ready(function(a){let e=!1;a.ajax({url:dataEvent.url,type:"GET",data:{action:"handle_render_banner",pageId:dataEvent.pageId,pageType:dataEvent.pageType,postType:dataEvent.postType,userType:dataEvent.userType},success:function(n){let t=n.data.dataBannerRender,o=n.data.isDisplayBanner;t&&o===!0&&(a("body").prepend(t),y(e))}}),d(),u()});function y(a){dataEvent.eventOnScroll.status===1&&jQuery(window).on("scroll",function(){jQuery(document).scrollTop()>=parseInt(dataEvent.eventOnScroll.value)&&a===!1&&(l().action==0&&(c(1),i(1,dataEvent.regulation),a=!0),jQuery(".modal").hide())}),dataEvent.eventOnclick==1&&(jQuery(window).on("click",function(){if(!jQuery(".modal").is(":hidden")){let n=l();dataEvent.regulation!="ja"&&n.action==0&&(c(1),i(1,dataEvent.regulation)),jQuery(".modal").hide()}jQuery(window).off("click")}),jQuery('div[data-banner="banner-main"], div[data-banner="banner-customize"]').on("click",function(e){e.stopPropagation()})),d(),u()}function u(){if(jQuery(".coop-banner").length>0){let e=jQuery("#none_view").val();jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"handle_view_banner",none:e}})}}function i(a,e){let n,t;if(e==="ja")t={url:dataEvent.url,type:"POST",data:{type:a,action:"handle_banner",none:dataEvent.none_handle_banner}};else{let o=document.getElementById("form-banner");n=new FormData(o),n.append("type",a),t={url:dataEvent.url,type:"POST",contentType:!1,cache:!1,processData:!1,data:n}}jQuery.ajax(t)}function d(){jQuery('i[data-icon="banner-customize"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-main"]').show()}),jQuery('i[data-icon="banner-main"]').on("click",function(){jQuery(".coop-banner").hide(),i(1,dataEvent.regulation)}),jQuery('a[data-button="customize_button"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-customize"]').show()}),jQuery(".handle-cookie").on("click",function(){let a=jQuery(this).attr("data-type");if(dataEvent.regulation!="ja"){let e=f(a);c(e)}else c(1);i(a,dataEvent.regulation),jQuery(".coop-banner").hide(),dataEvent.eventReload==1&&location.reload()})}function f(a){let e=jQuery(".cookie-category-type"),t=Array.from(e).filter(function(s){return s.checked}).length,o=parseInt(a),r=o;return o==2&&(t==3?r=1:t==0?r=3:r=2),r}function p(a,e){jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"set_cookie_opt_server",cookie_value:a,type:e},success:function(n){},error:function(n){console.error(n)}})}function l(){let a;return jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"get_parse_cookie_opt"},success:function(e){a=JSON.parse(e.data.cookie)},error:function(e){}}),a||{action:0,type:0,necessary:1,functional:0,socialmedia:0,performance:0}}function c(a){let e=l();e.action=1,e.type=a,e.necessary=1,a==1?(e.functional=1,e.socialmedia=1,e.performance=1):a==3?(e.functional=0,e.socialmedia=0,e.performance=0):(e.functional=jQuery("#banner__functionality-cookie").is(":checked")?1:0,e.socialmedia=jQuery("#banner__social-media-cookie").is(":checked")?1:0,e.performance=jQuery("#banner__performance-cookie").is(":checked")?1:0);let n=JSON.stringify(e);p(n,a)} -
cookie-optimizer/tags/1.0.14/readme.txt
r3352481 r3352505 5 5 Requires PHP: 7.3 6 6 Tested up to: 6.7 7 Stable tag: 1.0.1 37 Stable tag: 1.0.14 8 8 License: GPLv2 or later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 65 65 == Changelog == 66 66 67 = 1.0.1 3=67 = 1.0.14 = 68 68 Initial release 69 69 -
cookie-optimizer/tags/1.0.14/uninstall.php
r3352481 r3352505 19 19 * 20 20 * @link https://cookieoptimizer.net 21 * @since 1.0.1 321 * @since 1.0.14 22 22 * 23 23 * @package Cookie Optimizer -
cookie-optimizer/trunk/app/Includes/CookieOptBanner.php
r3352481 r3352505 173 173 public function register_enqueue_script() 174 174 { 175 $data_events = $this->prepare_data_ for_render_cookie();175 $data_events = $this->prepare_data_localize(); 176 176 wp_register_script( 177 177 'cookie-custom-banner-js', … … 194 194 } 195 195 196 public function handle_render_banner(){ 196 public function handle_render_banner() 197 { 197 198 $html_banner = $this->data_banner_html(); 198 $is_display_banner = $this->handle_display_banner( );199 $is_display_banner = $this->handle_display_banner($_GET['pageId'], $_GET['pageType'], $_GET['postType'], $_GET['userType']); 199 200 200 201 wp_send_json_success([ … … 205 206 } 206 207 207 public function prepare_data_for_render_cookie(){ 208 public function prepare_data_localize() 209 { 210 global $post; 208 211 $setting = $this->CookiePermissionService->getSettingBanner(); 212 $page_id = (is_singular() && isset($post->ID)) ? (int) $post->ID : 0; 213 $page_type = is_front_page() ? 'front' : 'home'; 214 $post_type = is_singular() ? get_post_type() : ''; 215 $user_type = is_user_logged_in() ? 'login' : 'guest'; 209 216 210 217 return [ … … 215 222 'eventOnScroll' => $setting['onScroll'], 216 223 'eventReload' => $setting['reloading'], 224 'pageId' => $page_id, 225 'pageType' => $page_type, 226 'postType' => $post_type, 227 'userType' => $user_type, 217 228 ]; 218 229 } 219 230 220 public function data_banner_html(){ 231 public function data_banner_html() 232 { 221 233 $data = $this->CookiePermissionService->getDataBannerToShow(); 222 234 ob_start(); … … 229 241 * @return bool true is display, false is hide 230 242 */ 231 public function handle_display_banner(){ 243 public function handle_display_banner($page_id, $page_type, $post_type, $user_type) 244 { 232 245 $is_banner_active = get_option('cookie_opt_banner_active'); 233 246 if ($is_banner_active != 1) … … 257 270 $rules_hide = $banner['conditional']['rules']['hide'] ?? []; 258 271 259 $anyMatch = function (array $rules) : bool {272 $anyMatch = function (array $rules) use($page_id, $page_type, $post_type, $user_type): bool { 260 273 foreach ($rules as $rule) { 261 if ($this->CookiePermissionService->checkParam($rule )) {274 if ($this->CookiePermissionService->checkParam($rule, $page_id, $page_type, $post_type, $user_type)) { 262 275 return true; 263 276 } -
cookie-optimizer/trunk/app/Services/CookiePermissionService.php
r3352416 r3352505 888 888 * @return bool 889 889 */ 890 public function checkParam($rule )890 public function checkParam($rule, $page_id, $page_type, $post_type, $user_type) 891 891 { 892 892 switch ($rule['type']) { … … 894 894 $check = $this->handlePageValueCondition( 895 895 $rule['operator'], 896 $rule['value'] 896 $rule['value'], 897 $page_id 897 898 ); 898 899 break; … … 900 901 $check = $this->handlePostTypeValueCondition( 901 902 $rule['operator'], 902 $rule['value'] 903 $rule['value'], 904 $post_type 903 905 ); 904 906 break; … … 906 908 $check = $this->handleUserTypeValueCondition( 907 909 $rule['operator'], 908 $rule['value'] 910 $rule['value'], 911 $user_type 909 912 ); 910 913 break; … … 912 915 $check = $this->handlePageTypeValueCondition( 913 916 $rule['operator'], 914 $rule['value'] 917 $rule['value'], 918 $page_type 915 919 ); 916 920 break; … … 925 929 * @return bool 926 930 */ 927 public function handlePostTypeValueCondition($operator, $value )928 { 929 if ($operator == 'equal') {930 return $value == get_post_type();931 } 932 return false;931 public function handlePostTypeValueCondition($operator, $value, $post_type) 932 { 933 if ($operator === 'equal') { 934 return $value === $post_type; 935 } 936 return $value !== $post_type; 933 937 } 934 938 … … 939 943 * @return bool 940 944 */ 941 public function handlePageValueCondition($operator, $value )942 { 943 if ($operator == 'equal') {944 return is_page((int) $value);945 } 946 return !is_page((int) $value);945 public function handlePageValueCondition($operator, $value, $page_id) 946 { 947 if ($operator === 'equal') { 948 return $page_id === $value; 949 } 950 return $page_id !== $value; 947 951 } 948 952 … … 953 957 * @return bool 954 958 */ 955 public function handlePageTypeValueCondition($operator, $value) 956 { 957 if ($operator == 'equal') { 958 if ($value == 'front') { 959 return is_front_page(); 960 } 961 } else { 962 if ($value == 'home') { 963 return is_front_page(); 964 } 965 } 966 return !is_front_page(); 959 public function handlePageTypeValueCondition($operator, $value, $page_type) 960 { 961 if ($operator === 'equal') { 962 return $page_type === $value; 963 } 964 return $page_type !== $value; 967 965 } 968 966 … … 973 971 * @return bool 974 972 */ 975 public function handleUserTypeValueCondition($operator, $value) 976 { 977 if ( 978 ($operator == 'equal' && $value == 'logged_in') || 979 ($operator == 'not-equal' && $value == 'guest') 980 ) { 981 if (is_user_logged_in()) { 982 return true; 983 } 984 } else { 985 if (!is_user_logged_in()) { 986 return true; 987 } 988 } 989 return false; 973 public function handleUserTypeValueCondition($operator, $value, $user_type) 974 { 975 976 if ($operator === 'equal') { 977 return $user_type === $value; 978 } 979 return $user_type !== $value; 990 980 } 991 981 } -
cookie-optimizer/trunk/constants.php
r3352481 r3352505 2 2 3 3 // Plugin version and mode 4 define('VERSION', '1.0.1 3');4 define('VERSION', '1.0.14'); 5 5 6 6 // Plugin directory details -
cookie-optimizer/trunk/cookie-opt.php
r3352481 r3352505 12 12 * Plugin URI: https://manage.medipartner.jp 13 13 * Description: Cookieをユーザーに見える化し、各法律にする準拠バナー同意ソリューション 14 * Version: 1.0.1 314 * Version: 1.0.14 15 15 * Requires at least: 5.3 16 16 * Requires PHP: 7.3 … … 51 51 * 52 52 * @class CookieOpt 53 * @version 1.0.1 353 * @version 1.0.14 54 54 */ 55 55 class CookieOpt … … 76 76 */ 77 77 public $defaults = [ 78 'version' => '1.0.1 3',78 'version' => '1.0.14', 79 79 ]; 80 80 -
cookie-optimizer/trunk/public/build/assets/js/banner.js
r3352481 r3352505 1 jQuery(document).ready(function( n){let e=!1;n.ajax({url:dataEvent.url,type:"GET",data:{action:"handle_render_banner"},success:function(a){let t=a.data.dataBannerRender,o=a.data.isDisplayBanner;t&&o===!0&&(n("body").prepend(t),f(e))}}),d(),u()});function f(n){dataEvent.eventOnScroll.status===1&&jQuery(window).on("scroll",function(){jQuery(document).scrollTop()>=parseInt(dataEvent.eventOnScroll.value)&&n===!1&&(l().action==0&&(c(1),i(1,dataEvent.regulation),n=!0),jQuery(".modal").hide())}),dataEvent.eventOnclick==1&&(jQuery(window).on("click",function(){if(!jQuery(".modal").is(":hidden")){let a=l();dataEvent.regulation!="ja"&&a.action==0&&(c(1),i(1,dataEvent.regulation)),jQuery(".modal").hide()}jQuery(window).off("click")}),jQuery('div[data-banner="banner-main"], div[data-banner="banner-customize"]').on("click",function(e){e.stopPropagation()})),d(),u()}function u(){if(jQuery(".coop-banner").length>0){let e=jQuery("#none_view").val();jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"handle_view_banner",none:e}})}}function i(n,e){let a,t;if(e==="ja")t={url:dataEvent.url,type:"POST",data:{type:n,action:"handle_banner",none:dataEvent.none_handle_banner}};else{let o=document.getElementById("form-banner");a=new FormData(o),a.append("type",n),t={url:dataEvent.url,type:"POST",contentType:!1,cache:!1,processData:!1,data:a}}jQuery.ajax(t)}function d(){jQuery('i[data-icon="banner-customize"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-main"]').show()}),jQuery('i[data-icon="banner-main"]').on("click",function(){jQuery(".coop-banner").hide(),i(1,dataEvent.regulation)}),jQuery('a[data-button="customize_button"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-customize"]').show()}),jQuery(".handle-cookie").on("click",function(){let n=jQuery(this).attr("data-type");if(dataEvent.regulation!="ja"){let e=y(n);c(e)}else c(1);i(n,dataEvent.regulation),jQuery(".coop-banner").hide(),dataEvent.eventReload==1&&location.reload()})}function y(n){let e=jQuery(".cookie-category-type"),t=Array.from(e).filter(function(s){return s.checked}).length,o=parseInt(n),r=o;return o==2&&(t==3?r=1:t==0?r=3:r=2),r}function p(n,e){jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"set_cookie_opt_server",cookie_value:n,type:e},success:function(a){},error:function(a){console.error(a)}})}function l(){let n;return jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"get_parse_cookie_opt"},success:function(e){n=JSON.parse(e.data.cookie)},error:function(e){}}),n||{action:0,type:0,necessary:1,functional:0,socialmedia:0,performance:0}}function c(n){let e=l();e.action=1,e.type=n,e.necessary=1,n==1?(e.functional=1,e.socialmedia=1,e.performance=1):n==3?(e.functional=0,e.socialmedia=0,e.performance=0):(e.functional=jQuery("#banner__functionality-cookie").is(":checked")?1:0,e.socialmedia=jQuery("#banner__social-media-cookie").is(":checked")?1:0,e.performance=jQuery("#banner__performance-cookie").is(":checked")?1:0);let a=JSON.stringify(e);p(a,n)}1 jQuery(document).ready(function(a){let e=!1;a.ajax({url:dataEvent.url,type:"GET",data:{action:"handle_render_banner",pageId:dataEvent.pageId,pageType:dataEvent.pageType,postType:dataEvent.postType,userType:dataEvent.userType},success:function(n){let t=n.data.dataBannerRender,o=n.data.isDisplayBanner;t&&o===!0&&(a("body").prepend(t),y(e))}}),d(),u()});function y(a){dataEvent.eventOnScroll.status===1&&jQuery(window).on("scroll",function(){jQuery(document).scrollTop()>=parseInt(dataEvent.eventOnScroll.value)&&a===!1&&(l().action==0&&(c(1),i(1,dataEvent.regulation),a=!0),jQuery(".modal").hide())}),dataEvent.eventOnclick==1&&(jQuery(window).on("click",function(){if(!jQuery(".modal").is(":hidden")){let n=l();dataEvent.regulation!="ja"&&n.action==0&&(c(1),i(1,dataEvent.regulation)),jQuery(".modal").hide()}jQuery(window).off("click")}),jQuery('div[data-banner="banner-main"], div[data-banner="banner-customize"]').on("click",function(e){e.stopPropagation()})),d(),u()}function u(){if(jQuery(".coop-banner").length>0){let e=jQuery("#none_view").val();jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"handle_view_banner",none:e}})}}function i(a,e){let n,t;if(e==="ja")t={url:dataEvent.url,type:"POST",data:{type:a,action:"handle_banner",none:dataEvent.none_handle_banner}};else{let o=document.getElementById("form-banner");n=new FormData(o),n.append("type",a),t={url:dataEvent.url,type:"POST",contentType:!1,cache:!1,processData:!1,data:n}}jQuery.ajax(t)}function d(){jQuery('i[data-icon="banner-customize"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-main"]').show()}),jQuery('i[data-icon="banner-main"]').on("click",function(){jQuery(".coop-banner").hide(),i(1,dataEvent.regulation)}),jQuery('a[data-button="customize_button"]').on("click",function(){jQuery(".coop-banner").hide(),jQuery('.coop-banner[data-banner="banner-customize"]').show()}),jQuery(".handle-cookie").on("click",function(){let a=jQuery(this).attr("data-type");if(dataEvent.regulation!="ja"){let e=f(a);c(e)}else c(1);i(a,dataEvent.regulation),jQuery(".coop-banner").hide(),dataEvent.eventReload==1&&location.reload()})}function f(a){let e=jQuery(".cookie-category-type"),t=Array.from(e).filter(function(s){return s.checked}).length,o=parseInt(a),r=o;return o==2&&(t==3?r=1:t==0?r=3:r=2),r}function p(a,e){jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"set_cookie_opt_server",cookie_value:a,type:e},success:function(n){},error:function(n){console.error(n)}})}function l(){let a;return jQuery.ajax({url:dataEvent.url,type:"POST",data:{action:"get_parse_cookie_opt"},success:function(e){a=JSON.parse(e.data.cookie)},error:function(e){}}),a||{action:0,type:0,necessary:1,functional:0,socialmedia:0,performance:0}}function c(a){let e=l();e.action=1,e.type=a,e.necessary=1,a==1?(e.functional=1,e.socialmedia=1,e.performance=1):a==3?(e.functional=0,e.socialmedia=0,e.performance=0):(e.functional=jQuery("#banner__functionality-cookie").is(":checked")?1:0,e.socialmedia=jQuery("#banner__social-media-cookie").is(":checked")?1:0,e.performance=jQuery("#banner__performance-cookie").is(":checked")?1:0);let n=JSON.stringify(e);p(n,a)} -
cookie-optimizer/trunk/readme.txt
r3352481 r3352505 5 5 Requires PHP: 7.3 6 6 Tested up to: 6.7 7 Stable tag: 1.0.1 37 Stable tag: 1.0.14 8 8 License: GPLv2 or later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 65 65 == Changelog == 66 66 67 = 1.0.1 3=67 = 1.0.14 = 68 68 Initial release 69 69 -
cookie-optimizer/trunk/uninstall.php
r3352481 r3352505 19 19 * 20 20 * @link https://cookieoptimizer.net 21 * @since 1.0.1 321 * @since 1.0.14 22 22 * 23 23 * @package Cookie Optimizer
Note: See TracChangeset
for help on using the changeset viewer.