Changeset 3460841 for cookieadmin

Timestamp:

02/13/2026 02:27:50 PM (6 weeks ago)

Author:

softaculous

Message:

New version 1.1.5

Location:

cookieadmin/trunk

Files:

• assets/cookie/template.json (deleted)
• assets/cookie/template.php (added)
• assets/css/consent.css (modified) (9 diffs)
• assets/css/cookie.css (modified) (15 diffs)
• assets/images/cookieadmin_icon_20-black.svg (added)
• assets/js/consent.js (modified) (13 diffs)
• assets/js/cookie.js (modified) (16 diffs)
• assets/js/footer.js (modified) (1 diff)
• cookieadmin.php (modified) (3 diffs)
• includes/admin (added)
• includes/admin.php (modified) (7 diffs)
• includes/admin/consent.php (added)
• includes/admin/dashboard.php (added)
• includes/admin/scan.php (added)
• includes/admin/settings.php (added)
• includes/cookiecategorizer.php (modified) (5 diffs)
• includes/enduser.php (modified) (3 diffs)
• includes/functions.php (modified) (7 diffs)
• init.php (deleted)
• readme.txt (modified) (2 diffs)

cookieadmin/trunk/assets/css/consent.css

@@ -17 +17 @@
 }
 
-/* Buttons End */
-
 /*  Consent page css */
-
-.cookieadmin-postbox-container { 
-    max-width: 92vw;
-    float: unset;
-    margin: 10px;
-}
 
 .cookieadmin_cookie_modal label, .cookieadmin_cookie_modal input {
@@ -80 +72 @@
 /* Modal animations Ends */
 
-.cookieadmin_consent-header{
-    display: flex;
-    background: #12625f4d;
-    color: black;
-    padding: 12px;
-    box-sizing: border-box;
-    margin: 4px;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.cookieadmin_consent-contents {
-    display: flex;
-    margin: 0px 5px;
-}
-
-.cookieadmin_consent_settings {
-    display: flex;
-    width: 100%;
-    flex-direction: column;
-    background: #ffffff;
-    /*margin-left: -3px;*/
-}
-
-
-
-.cookieadmin-contents {
-    width: 100%;
-}
-
-.cookieadmin-setting {
-    display: flex;
-    padding: 6px 0px;
-    justify-content: flex-start;
-}
-
-.cookieadmin-setting-head {
-    width: 100%;
-    padding: 5px;
-    align-content: center;
-}
-
-.cookieadmin-setting-contents {
-    align-items: baseline;
-    padding: 5px;
-    margin: 5px;
-}
-
-.cookieadmin-setting-results {
-    align-items: baseline;
-    padding: 5px;
-    margin: 5px;
-    width: 80%;
-}
-
-.cookieadmin-button{
-    padding: 5px;
-    row-gap: 5px;
-}
+
 /* Consent page css End*/
 
@@ -274 +208 @@
 
 .cookieadmin_preference{
-    overflow: hidden;
-    height: 83px;
+    overflow: auto;
     font-size: 15px;
-}
-
-.cookieadmin_showmore{
-    background: none;
-    border: none;
-    color: #1863dc;
-    padding: 0px;
-    cursor: pointer;
+    height: auto;
+    padding: 10px 0px;
 }
 
 .cookieadmin_details_wrapper{
-    padding: 15px;
+    padding: 0px 15px;
     height: calc(100% - 6%);
     overflow: auto;
@@ -318 +245 @@
 }
 
-.cookieadmin-nece-cookies{
+.cookieadmin-modal-cookies-list{
     display:none;
     padding:1px;
@@ -375 +302 @@
     bottom: 15px;
     left: 15px;
-    background: linear-gradient(to left, rgb(0, 51, 204) 0%, rgb(102, 102, 255) 100%);
+    background-color: #374FD4;
     height: 50px;
     width: 50px;
@@ -383 +310 @@
     z-index: 99999;
     padding: 5px !important;
+    box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
+    align-items: center;
+    justify-content: center;
 }
 
@@ -441 +371 @@
 /* Checkbox switch Start */
 
-.cookieadmin_toggle, .cookieadmin_toggle_disabled {
+.cookieadmin_toggle {
     position: relative;
     display: inline-block;
@@ -449 +379 @@
 
 /* Hide the checkbox input */
-.cookieadmin_toggle input, .cookieadmin_toggle_disabled input {
+.cookieadmin_toggle input{
     display: none;
 }
@@ -494 +424 @@
 }
 
-input:disabled+.cookieadmin_slider {
-    background-color: #3582c4;
-}
-input:disabled+.cookieadmin_slider:before {
-    transform: translateX(13px);
-}
-
 /* Checkbox switch End */
 

cookieadmin/trunk/assets/css/cookie.css

@@ -53 +53 @@
 
 /* Buttons */
-.cookieadmin-btn{   
+.cookieadmin-btn{
 display: inline-flex;
 outline: 0;
 text-align: center;
 cursor: pointer;
-padding: 5px 10px 6px 10px !important;
+padding: 6px 10px;
 border-radius: 3px;
 border: 1px solid transparent;
@@ -65 +65 @@
 font-size: 13px !important;
 text-decoration: none;
-gap: 8px;
-align-items:center;
-justify-content:center;
 }
 
@@ -234 +231 @@
 }
 
-.cookieadmin_bottom{
-    bottom:20px;
-}
-
-.cookieadmin_top{
-    top: 20px;
-}
-
-.cookieadmin_right{
-    right: 15px;
-}
-
-.cookieadmin_left{
-    left:15px;
-}
-
 .cookieadmin_hide{
     display:none;
@@ -260 +241 @@
     font-size: 20px;
     margin: 2px;
-}
-
-/* Modal animations  */
-@keyframes cookieadmin_slideUp {
-    from {
-        transform: translateY(100%);
-        opacity: 0;
-    }
-    to {
-        transform: translateY(0);
-        opacity: 1;
-    }
-}
-
-@keyframes cookieadmin_slideSide {
-    from {
-        transform: translateX(-100%);
-        opacity: 0;
-    }
-    to {
-        transform: translateX(0);
-        opacity: 1;
-    }
-}
-
-/* Modal animations Ends */
-
-.cookieadmin_consent-header{
-    display: flex;
-    background: #12625f4d;
-    color: black;
-    padding: 12px;
-    box-sizing: border-box;
-    margin: 4px;
-    align-items: center;
-    justify-content: space-between;
 }
 
@@ -368 +313 @@
 }
 
+.cookieadmin-desc {
+    font-size:14px;
+    padding: 0 0 0 10px;
+}
+
 .cookieadmin-color-input{
     border: 1px solid;
@@ -393 +343 @@
 
 .cookieadmin-collapsible-notice{
-    padding: 9px;
-    display: none;
+    padding: 8px;
     background-color: #ffffc6;
     font-size: 14px;
@@ -414 +363 @@
 }
 
+.cookieadmin-cookie-scan{
+    display: flex;
+    flex-direction: row;
+}
+
 .cookieadmin-setting-colors{
     justify-content: space-between;
@@ -440 +394 @@
 /* Website consent box  */
 
-.cookieadmin_law_container{
-    position: fixed;
-    width: 25%;
-    box-sizing: border-box;
-    z-index: 99999;
-    display: none;
-}
-
-.cookieadmin_consent_btns{
-    align-content: center;
-    display: flex;
-    justify-content: space-evenly;
-    flex-wrap: wrap;
-}
-
-.cookieadmin_box{
-    /*position: fixed;*/
-    width: 25%;
-    box-sizing: border-box;
-    display: none;
-}
-
-.cookieadmin_notice_group{
-    display: flex;
-    flex-direction: column;
-    gap: 10px; /* spacing between content and buttons */
-    align-items: flex-start;
-}
-
-.cookieadmin_popup{
-    position: fixed;
-    width: 330px;
-    box-sizing: border-box;
-    z-index: 9999999;
-    display: none;
-}
-
-.cookieadmin_consent_inside{
-    color: black;
-    background-color: #FFFFFF;
-    border: 1px solid #f4f4f4;
-    padding:15px;
-    border-radius: 4px;
-    box-shadow:1px 3px 10px rgba(0, 0, 0, 0.2);
-}
-
-#cookieadmin_notice_title{
-    font-weight: 601;
-    margin: 0px;
-    padding-left: 5px;
-}
-
-.cookieadmin_notice_con{
-    font-size: initial;
-    padding: 0px 6px;
-    flex: 1;
-}
-
-.cookieadmin_cookie_modal{
-    display: none;
-    flex-direction: column;
-    position: fixed;
-    max-height: 80vh;
-    background-color: #FFFFFF;
-    border: 1px solid #F4F4F4;
-    border-radius: 8px;
-    box-shadow: 0 4px 8px rgba(0,0,0,0.2);
-    z-index: 999999;
-}
-
-.cookieadmin_center{
-    top: 10%;
-    left: 22%;
-    max-width: 60vw;
-}
-
-.cookieadmin_side{
-    flex-direction: column;
-    position: fixed;
-    width: 35vw;
-    bottom: 0px;
-    animation: 0.5s ease-out forwards cookieadmin_slideSide;
-    max-height: 100vh;
-    left: 0px;
-    top: 0px;
-    border-radius: 0px;
-}
-
-.cookieadmin_down{
-    position: fixed;
-    max-width: 100%;
-    max-height: 55vh;
-    bottom: 0px;
-    animation: 0.5s ease-out forwards cookieadmin_slideUp;
-}
-
-.cookieadmin_modal_overlay{
-    display: none; 
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.5); 
-    z-index: 1000;
-}
-
-.cookieadmin_mod_head{
-    display: flex;
-    justify-content: space-between;
-}
-
-.cookieadmin_mod_head, .cookieadmin_wrapper{
-    padding: 15px;
-    border-bottom: 1px solid #CCCCCC;
-}
-
-.cookieadmin_close_pref{
-    background: none;
-    border: none;
-    align-self: baseline;
-    color: gray;
-    cursor: pointer;
-    padding: 0px;
-}
-
-.cookieadmin_preference_title{
-    font-size: 20px;
-    font-weight: 801;
-    margin: 9px;
-}
-
-.cookieadmin_preference_details{
-    padding: 0px 10px;
-}
-
-.cookieadmin_preference{
-    overflow: hidden;
-    height: 83px;
-    font-size: 15px;
-}
-
-.cookieadmin_showmore{
-    background: none;
-    border: none;
-    color: #1863dc;
-    padding: 0px;
-    cursor: pointer;
-}
-
-.cookieadmin_details_wrapper{
-    padding: 15px;
-    height: calc(100% - 6%);
-    overflow: auto;
-    scrollbar-width: thin;
-}
-
-.cookieadmin_types{
-    padding: 10px 10px;
-    border-top: 1px solid #CCCCCC;
-}
-
-.cookieadmin_header{
-    display: flex;
-    justify-content: space-between;
-}
-
-.cookieadmin_header > span > label{
-    cursor:pointer;
-}
-
-.cookieadmin_remark{
-    display:none;
-    justify-self:right;
-}
-
-.cookieadmin_act{
-    display: inline;
-    color: #1863dc;
-}
-
-.cookieadmin-nece-cookies{
-    display:none;
-    padding:1px;
-    border-radius: 10px;
-    margin: 0px 20px;
-    margin-right: 4rem;
-    font-size: smaller;
-    font-size: 1rem;
-    text-align: center;
-}
-
-.cookieadmin_desc{
-    padding:5px 20px;
-    font-size: 15px;
-    padding-right: 4rem;
-}
-
-.cookieadmin_footer{
-    left: 0px;
-    padding: 15px;
-    flex-wrap: wrap;
-    width: 100%;
-}
-
-.cookieadmin_modal_footer{
-    left: 0px;
-    padding: 15px;
-    flex-wrap: wrap;
-    border-top: 1px solid #CCCCCC;
-}
-
-.cookieadmin_btn{
-    background-color: transparent;
-    border: 1px solid gray;
-    color: #1863dc;
-    padding: 0.4rem 0.9rem;
-    border-radius: 4px;
-    margin: 2px 5px;
-    cursor: pointer;
-}
+
+
+
+
+
+
+
 
 .cookieadmin_btn-primary {
@@ -674 +414 @@
 }
 
-.cookieadmin_btn:hover{
-    opacity: 0.8;
-}
-
 .cookieadmin_btn_accept{
     color: #ffffff;
@@ -684 +420 @@
 }
 
-.cookieadmin_show_pref_cookies{
-    cursor: pointer;
-    font-size: 18px;
-}
-
 .cookieadmin_pl0{
     padding-left:0px;
 }
 
-.cookieadmin_re_consent{
-    display: none;
-    position: fixed;
-    bottom: 15px;
-    left: 15px;
-    background: linear-gradient(to left, rgb(0, 51, 204) 0%, rgb(102, 102, 255) 100%);
-    height: 50px;
-    width: 50px;
-    border-radius: 50%;
-    cursor: pointer;
-    border: 0px;
-    z-index: 99999;
-    padding: 5px;
-}
 
 .cookieadmin-manager-cookie-scan, .cookieadmin-manager-consent-logs, .cookieadmin-manager-cookie-categorize{
@@ -739 +456 @@
 }
 
-.cookieadmin-cookie-card {
-    background: ghostwhite;
-    border-radius: 10px;
-    padding: 16px;
-    font-family: 'Open Sans', 'Segoe UI', sans-serif;
-    box-shadow: 0 2px 6px rgba(0,0,0,0.1);
-    margin: 10px auto;
-    text-align: left;
-}
-
-.cookieadmin-cookie-header {
-    display: flex;
-    justify-content: space-between;
-    font-size: 1rem;
-    margin-bottom: 6px;
-}
-
-.cookieadmin-cookie-name {
-  font-weight: bold;
-  color: #333;
-}
-
-.cookieadmin-cookie-duration {
-  font-size: 0.85rem;
-}
-
-.cookieadmin-cookie-duration > b {
-  font-weight: bold;
-}
-
-.cookieadmin-cookie-description {
-  font-size: 0.9rem;
-  margin-bottom: 12px;
-}
-
-.cookieadmin-cookie-tags {
-  display: flex;
-  gap: 8px;
-}
-
-.cookieadmin-tag {
-  background: #e0e0e0;
-  padding: 4px 10px;
-  border-radius: 12px;
-  font-size: 0.75rem;
-  color: #333;
-}
 
 .cookieadmin-tag.active {
@@ -811 +481 @@
 
 
-
-/* Checkbox switch Start */
-
-.cookieadmin_toggle, .cookieadmin_toggle_disabled {
-    position: relative;
-    display: inline-block;
-    width: 24px;
-    height: 11px;
-}
-
-/* Hide the checkbox input */
-.cookieadmin_toggle input, .cookieadmin_toggle_disabled input {
-    display: none;
-}
-
-/* Describe slider's look and position. */
-.cookieadmin_slider {
-    position: absolute;
-    cursor: pointer;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    height: 21px;
-    width: 34px;
-    background-color: gray;
-    transition: .4s;
-    border-radius: 34px;
-}
-
-/* Describe the white ball's location 
-  and appearance in the slider. */
-.cookieadmin_slider:before {
-    position: absolute;
-    content: "";
-    height: 15px;
-    width: 15px;
-    left: 3.2px;
-    bottom: 3.2px;
-    background-color: white;
-    transition: .2s;
-    border-radius: 50%;
-}
-
-/* Modify the slider's background color to 
-  green once the checkbox has been selected. */
-input:checked+.cookieadmin_slider {
-    background-color: #3582c4;
-}
-
-/* When the checkbox is checked, shift the 
-  white ball towards the right within the slider. */
-input:checked+.cookieadmin_slider:before {
-    transform: translateX(13px);
-}
-
-.cookieadmin_toggle_disabled .cookieadmin_slider {
-    background-color: #3582c4;
-}
-.cookieadmin_toggle_disabled .cookieadmin_slider:before {
-    transform: translateX(13px);
-}
-
-/* Checkbox switch End */
-
-
  /* --- Modal Styles Start --- */
 
-/* The Modal Overlay/Backdrop */
+/* The Admin Edit/Add Cookie Modal Overlay/Backdrop */
 .cookieadmin_modal-overlay {
     position: fixed;
@@ -972 +576 @@
 .cookieadmin_modal-footer {
     display: flex;
-    justify-content: flex-start;
+    justify-content: flex-end;
     padding: 16px 24px;
     border-top: 1px solid #e0e0e0;
@@ -1105 +709 @@
 }
 
+/* Dialog success/failure messages */
+
+#cookieadmin-message{
+    margin-right: 10px;
+    font-weight: 500;
+    padding: 5px;
+}
+
+.cookieadmin-success-message {
+    color: #22c55e;
+}
+
+.cookieadmin-error-message {
+    color: #dc2626;
+}
+
 /* --- Auto Categorize Cookies End --- */
 
@@ -1115 +735 @@
 /* --- Override Dashicons End --- */
 
-.cookieadmin-poweredby{
-margin-top: 10px;
-}
-
-.cookieadmin-poweredby a img{
-height: 15px;
-}
-
-.cookieadmin-poweredby a{
-color : unset;
-cursor: pointer;
-display: flex;
-justify-content: center;
-align-items: center;
-font-size: 11px;
-gap: 2px;
-text-decoration: none;
-}
-
-.cookieadmin_modal_footer .cookieadmin-poweredby a{
-justify-content: end;
-}
-
-/* CSS for phones only */
-@media (max-width: 767px) {
-
-    .cookieadmin_center{
-        top: 10%;
-        left: 5%;
-        max-width: 90vw;
-    }
-
-    .show_pref_cookies{
-        font-size: 14px;
-    }
-
-    .cookieadmin_law_container, .cookieadmin_box{
-        width: 90%;
-    }
-    
-    .cookieadmin_side{
-        width: 100%;
-    }
-}
-
-/* CSS for tablet */
-@media (min-width: 768px) and (max-width: 991px) {
-
-    .cookieadmin_box{
-        width: 45%;
-    }
-}
-
-/* CSS for small laptop */
-@media (min-width: 992px) and (max-width: 1199px) {
-
-    .cookieadmin_box{
-        width: 35%;
-    }
-    
-}
-/* CSS for HD TV screens */
-@media (min-width: 1200px) and (max-width: 1360px) {
-
-    .cookieadmin_box{
-        width: 30%;
-    }
-}
-
-/* Desktop Layout */
-@media (min-width: 768px) {
-    .cookieadmin_notice_group {
-        flex-direction: row;
-        justify-content: space-between;
-        align-items: center;
-    }
-
-    .cookieadmin_notice_con {
-        flex: 1; /* take remaining space */
-    }
-
-    .cookieadmin_consent_btns {
-        flex-shrink: 0;
-    }
-}
-
-@media (max-width:480px){
-    .cookieadmin_consent_inside .cookieadmin_btn {
-        width: 100%;
-        margin: 5px 0;
-    }
-    
-    .cookieadmin_modal_footer{
-        padding: 8px;
-    }
-}
+
+
+/* CookieAdmin Tooltip Start */
+
+.cookieadmin-tooltip {
+    position: fixed;
+    background: #5d5d5d;
+    color: #fff;
+    padding: 6px 10px;
+    border-radius: 4px;
+    font-size: 12px;
+    white-space: nowrap;
+    pointer-events: none;
+    z-index: 999999;
+    opacity: 0;
+    transition: opacity 0.12s ease;
+}
+
+
+/* CookieAdmin Tooltip End */
+
+
+.cookieadmin-buttons-div {
+    display: flex;
+    flex-direction: row;
+}
+
+.cookieadmin-add-cookie-div {
+    border-right: 1px solid #e0e0e0;
+    padding-right: 10px;
+}
+
+/* Consent Expiry */
+#cookieadmin_consent_logs_expiry_days {
+    width: 50px;
+    text-align: center;
+    margin: 0px 10px;
+    padding: 0px;
+    height: 30px;
+}
+
+.cookieadmin-purge-consent-btn{
+    background-color: #dc3545 !important;
+    color: white !important;
+    border-color: unset !important;
+}
+
+.cookieadmin-setting-logs{
+    display: flex;
+    align-items: center;
+}
+
+.cookieadmin-save-settings{
+    border-top: 1px solid #e0e0e0;
+    margin-bottom: 15vh;
+}

cookieadmin/trunk/assets/js/consent.js

@@ +1 @@
+// This file handle the cookie banner and stuff related to that.
+
 var days = cookieadmin_policy.cookieadmin_days;
 
@@ -8 +10 @@
 
 function cookieadmin_is_obj(consentObj){
-    return (Object.keys(consentObj).length !== 0);
+    try{
+        return (
+            consentObj !== null &&
+            typeof consentObj === 'object' &&
+            !Array.isArray(consentObj) &&
+            Object.keys(consentObj).length > 0
+        );
+    }catch(e){
+        return false;
+    }
 }
 
 
 // function cookieadmin_cookie_interceptor(){
-    
+
     var originalCookieDescriptor =
     Object.getOwnPropertyDescriptor(Document.prototype, 'cookie') ||
@@ -42 +53 @@
                 return;
             }
-
+            
+            // Set cookies which are meant to be deleted
             if(val.includes('expires=Thu, 01 Jan 1970') || cookieValue.startsWith("deleted;")){
                 originalCookieDescriptor.set.call(document, val);
@@ -50 +62 @@
             var cookieInfo = cookieadmin_allcookies[cookieName] || {};
             var category = (cookieInfo.category || 'uncategorized').toLowerCase();
-
+            
+            // Set necessary cookies
             if(category == "necessary"){
                 originalCookieDescriptor.set.call(document, val);
@@ -56 +69 @@
             }
 
-            if(cookieadmin_is_obj(cookieadmin_is_consent)){
+            if(cookieadmin_is_obj(cookieadmin_is_consent) || (Array.isArray(cookieadmin_policy['preload']) && cookieadmin_policy['preload'].length > 0)){
 
                 var consentAction = cookieadmin_is_consent.action;
+                
+                if(!consentAction){
+                    consentAction = cookieadmin_policy['preload'].reduce((a, val) => {a[val] = ''; return a;}, {});
+                }
 
                 if(consentAction.accept || consentAction[category]){
@@ -88 +105 @@
     if(!document.cookie) return false;
     
-    let coki = document.cookie.split(";") ;
+    var coki = document.cookie.split(";") ;
     
     if(name == "all"){
         return coki ? coki : [];
     }
-    let nam = name + "=";
-    
-    for(let i=0; i < coki.length; i++){
+    var nam = name + "=";
+    
+    for(var i=0; i < coki.length; i++){
         if(coki[i].trim().indexOf(nam) == 0){
                 return coki[i].trim();
@@ -105 +122 @@
 
 function cookieadmin_check_consent(){
-    
-    if(cookieadmin_cookie = cookieadmin_is_cookie("cookieadmin_consent")){
+    var cookieadmin_cookie = cookieadmin_is_cookie("cookieadmin_consent")
+    if(!!cookieadmin_cookie){
         cookieadmin_cookie = JSON.parse(cookieadmin_cookie.split("=")[1]);
         if(!!cookieadmin_cookie.consent){
@@ -182 +199 @@
   date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000); // default 1 year
 
-  let cookieString = `${encodeURIComponent(name)}=${JSON.stringify(value)};`;
+  var cookieString = `${encodeURIComponent(name)}=${JSON.stringify(value)};`;
   cookieString += ` expires=${date.toUTCString()};`;
   cookieString += ` path=${cookieadmin_policy.base_path};`;
@@ -199 +216 @@
 }
 
-//Populates modal with consent if selected
+//Populates modal with consent if selected & adds found cookies
 function cookieadmin_populate_preference(){
     
@@ -223 +240 @@
             }
         }
-    }
-    
-    cookieadmin_shown = (typeof cookieadmin_shown !== "undefined") ? cookieadmin_shown : [];
+    //Load as per preloaded categories selected by admin    
+    }else if(cookieadmin_policy['preload'] && cookieadmin_policy['preload'].length > 0){
+        
+        cookieadmin_policy['preload'].forEach(function(val){
+            if(btn_ele = document.querySelector("#cookieadmin-" + val)){
+                btn_ele.checked = true;
+            }
+        });
+    }
+    
+    var cookieadmin_shown = (typeof cookieadmin_shown !== "undefined") ? cookieadmin_shown : [];
     
     if(cookieadmin_allcookies){
         
-        cookieadmin_filtrd = Object.keys(cookieadmin_allcookies).filter(e => !cookieadmin_shown.includes(e));
+        var cookieadmin_filtrd = Object.keys(cookieadmin_allcookies).filter(e => !cookieadmin_shown.includes(e));
         
         for(c_info of cookieadmin_filtrd){
             
-            if(e = document.querySelector(".cookieadmin-" + cookieadmin_allcookies[c_info].category?.toLowerCase())){
-                e.innerHTML = (e.innerHTML == 'None') ?  '' : e.innerHTML;
+            var category_var = cookieadmin_allcookies[c_info].category;
+            
+            if(!category_var){
+                continue;
+            }
+            var card_container = document.querySelector(".cookieadmin-" + category_var.toLowerCase());
+            
+            if(!card_container){
+                continue;
+            }
+            card_container.innerHTML = (card_container.innerHTML == 'None') ?  '' : card_container.innerHTML;
+            
+            var cookieadmin_exp = cookieadmin_policy.lang.session;
                 
-                exp = cookieadmin_policy.lang.session;
-                    
-                if(!!cookieadmin_allcookies[c_info].expires){
-                    exp = Math.round((cookieadmin_allcookies[c_info].expires - Date.now())/86400);
-                    if(exp < 1 && !!res['Max-Age']){
-                        exp = res['Max-Age'];
-                    }else{
-                        exp = cookieadmin_policy.lang.session;
+            if(
+                !!cookieadmin_allcookies[c_info].expires 
+                && cookieadmin_allcookies[c_info].expires !== "0000-00-00 00:00:00"
+            ){
+                
+                var expDate = new Date(cookieadmin_allcookies[c_info].expires.replace(' ', 'T'));
+                
+                if (!isNaN(expDate.getTime())) {
+                    var daysLeft = Math.ceil((expDate.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
+
+                    if (daysLeft > 0) {
+                        cookieadmin_exp = daysLeft +' '+ cookieadmin_policy.lang.days;
                     }
                 }
-                
-                e.innerHTML += '<div class="cookieadmin-cookie-card"> <div class="cookieadmin-cookie-header"> <strong class="cookieadmin-cookie-name">'+ c_info.replace(/_+$/, "") +'</strong> <span class="cookieadmin-cookie-duration"><b>'+ cookieadmin_policy.lang.duration +':</b> '+ exp +'</span> </div> <p class="cookieadmin-cookie-description">'+ cookieadmin_allcookies[c_info].description +'</p> <div class="cookieadmin-cookie-tags"> ' + (cookieadmin_allcookies[c_info].platform ? '<span class="cookieadmin-tag">' + cookieadmin_allcookies[c_info].platform + '</span>' : "") + ' </div> </div>';
-            }
+            }
+            
+            card_container.innerHTML += '<div class="cookieadmin-cookie-card"> <div class="cookieadmin-cookie-header"> <strong class="cookieadmin-cookie-name">'+ c_info.replace(/_+$/, "") +'</strong> <span class="cookieadmin-cookie-duration"><b>'+ cookieadmin_policy.lang.duration +':</b> '+ cookieadmin_exp +'</span> </div> <p class="cookieadmin-cookie-description">'+ cookieadmin_allcookies[c_info].description +'</p> <div class="cookieadmin-cookie-tags"> ' + (cookieadmin_allcookies[c_info].platform ? '<span class="cookieadmin-tag">' + cookieadmin_allcookies[c_info].platform + '</span>' : "") + ' </div> </div>';
             cookieadmin_shown.push(c_info);
         }
@@ -402 +442 @@
 
     //Add layout as class
-    if(!!cookieadmin_policy.cookieadmin_position){
+    if(!!cookieadmin_policy.cookieadmin_position && cookieadmin_policy.cookieadmin_layout !== "popup"){
         cookieadmin_policy.cookieadmin_position.split("_").forEach(function(clas){
             clas = "cookieadmin_" + clas;
@@ -410 +450 @@
 
     // Change consent layout dynamically
-    document.getElementsByClassName("cookieadmin_law_container")[0].classList.add("cookieadmin_" + cookieadmin_policy.cookieadmin_layout);
+  // TODO: There is a operator called optional chaining operator ?. something like this users?.[0]?.name; wont use it now just for reference
+    var  cookieadmin_law_container_var = document.getElementsByClassName("cookieadmin_law_container")[0];
+    if (!!cookieadmin_law_container_var){
+        cookieadmin_law_container_var.classList.add("cookieadmin_" + cookieadmin_policy.cookieadmin_layout);
+    }
 
     // Change Modal layout dynamically
@@ -514 +558 @@
     });
     
-    //showmore modal btn
-    document.getElementsByClassName("cookieadmin_showmore")[0]?.addEventListener("click", function(){
-        
-        var cur_height = document.getElementsByClassName("cookieadmin_preference")[0].style.height;
-        
-        if(!cur_height){
-            document.getElementsByClassName("cookieadmin_preference")[0].style.height = "auto";
-            this.innerHTML = cookieadmin_policy.lang.show_less;
-        }else{
-            document.getElementsByClassName("cookieadmin_preference")[0].style.height = "";
-            this.innerHTML = cookieadmin_policy.lang.show_more;
-        }
-    });
-
-
     document.querySelectorAll(".cookieadmin_show_pref_cookies").forEach(function(e){
         e.addEventListener("click", function(el){

cookieadmin/trunk/assets/js/cookie.js

@@ +1 @@
+// This file is a part of the admin side of CookieAdmin
+
 jQuery(document).ready(function($){
     
     var law = '';
     
-    $(".cookieadmin_showmore").on("click", function(){
-        if($(".cookieadmin_showmore").html().includes(cookieadmin_policy.lang.show_more)){
-            $(".cookieadmin_preference").height("auto");
-            $(this).html(cookieadmin_policy.lang.show_less);
-        }else{
-            $(".cookieadmin_preference").height("");
-            $(this).html(cookieadmin_policy.lang.show_more);
-        }
-    });
-    
-    $("#cookieadmin_layout_footer").on("change", function(){
+    function cookieadminSelectFooterLayout(){
         $("input[name=cookieadmin_position]").prop("checked", false);
         $(".consent-position").slideDown();
@@ -19 +11 @@
         $(".cookieadmin_box_layout").hide();
         $(".consent-modal-layout").show();
-    });
-    
-    $("#cookieadmin_layout_box").on("change", function(){
+    }
+    $("#cookieadmin_layout_footer").on("change", cookieadminSelectFooterLayout);
+    
+    function cookieadminSelectBoxLayout(){
         $("input[name=cookieadmin_position]").prop("checked", false);
         $(".consent-position").slideDown();
@@ -27 +20 @@
         $(".cookieadmin_box_layout").fadeIn(800);
         $(".consent-modal-layout").slideDown();
-    });
-
-    $("#cookieadmin_layout_popup").on("change", function(){
+    }
+    $("#cookieadmin_layout_box").on("change", cookieadminSelectBoxLayout);
+
+    function cookieadminSelectPopLayout(){
         $("input[name=cookieadmin_position]").prop("checked", false);
         $(".consent-position").slideUp();
         $(".consent-modal-layout").slideUp();
-    });
+    }
+    $("#cookieadmin_layout_popup").on("change", cookieadminSelectPopLayout);
     
     setTimeout( function(){
@@ -39 +34 @@
     }, 5000);
 
-    //==== Notice Section Preview
+    //==== Notice Section Preview Live Change
 
     $('#cookieadmin_notice_title_layout').on('input', function () {
@@ -231 +226 @@
         $(".cookieadmin_save_btn").css('color', $("#cookieadmin_save_btn_color").val());
 
-        $(".cookieadmin_showmore").css('color', law.cookieadmin_links_color);
         $(".act").css('color', law.cookieadmin_links_color);
 
         const sliders = $("#cookieadmin_wrapper .cookieadmin_slider");
-        $(sliders[0]).css('background-color', law.cookieadmin_slider_on_bg_color);
+        $(sliders[0]).css('background-color', law.cookieadmin_slider_off_bg_color);
         $(sliders[1]).css('background-color', law.cookieadmin_slider_off_bg_color);
         $(sliders[2]).css('background-color', law.cookieadmin_slider_off_bg_color);
-        $(sliders[3]).css('background-color', law.cookieadmin_slider_off_bg_color);
 
         //Also set layout of consents
@@ -267 +260 @@
     }
     
-    $("#cookieadmin_show_preview").on("click", function(){
+    function cookieadminShowPreview(){
         if($("#cookieadmin_layout_popup").prop("checked")){
             show_modal();
@@ -273 +266 @@
             $(".cookieadmin_law_container").toggle();
         }
-    });
+    }
+    $("#cookieadmin_show_preview").on("click", cookieadminShowPreview);
     
     $(".cookieadmin_customize_btn").on("click", function(){
@@ -283 +277 @@
     });
     
-    $("#cookieadmin_consent_type").on("change", function(){
+    function cookieadminChangeLaw(){
         
         var law = $("#cookieadmin_consent_type").find(":selected").attr("name");
@@ -363 +357 @@
         
         law == 'cookieadmin_gdpr' ? $(".setting-prior").show() : $(".setting-prior").hide();
-    });
-
-    $("consent_page").submit(function(){
+    }
+    $("#cookieadmin_consent_type").on("change", cookieadminChangeLaw);
+
+    function cookieadminSubmitConsent(e){       
         var checked = false;
         
         if (!$("input[name=cookieadmin_position]:checked").length && !$("#cookieadmin_layout_popup").prop("checked")) {
-            alert('Please select one of the radio buttons.');
-            event.preventDefault(); // Prevent form submission
-        }
-    });
-    
-    $("[id$=_preload]").on("click", function(){
-        
-        if(!$(".setting-prior").find("[id$=_preload]:checked").length && $(".cookieadmin-settings").find(".cookieadmin-collapsible-notice").length){
+            alert('Please select a notice position.');
+            e.preventDefault(); // Prevent form submission
+        }
+    }
+    $("#consent_submenu").submit(cookieadminSubmitConsent);
+    
+    function cookieadminPreloadCookies(){
+        
+        if(!($(".setting-prior").find("[id$=_preload]:checked").length - 1) && $(".cookieadmin-settings").find(".cookieadmin-collapsible-notice").length){
             $(".cookieadmin-settings").find(".cookieadmin-collapsible-notice").remove();
             return;
@@ -386 +382 @@
         }
         
-    });
-    
-    $(".cookieadmin-scan").on("click", function(){
+    }
+    $("[id$=_preload]").on("click", cookieadminPreloadCookies);
+    
+    function cookieadminScanCookies(){
         
         let cookieadmin_btn_val = $(this).prop('value');
-        $(this).prop("disabled", true).prop('value', 'Scanning...');
+        var this_btn = $(this);
+        this_btn.prop("disabled", true).prop('value', 'Scanning...');
         
         $.ajax({
@@ -403 +401 @@
             success: function(result){
                 
-                if (result.success) {
-                                
-                    $('.cookieadmin-cookie-categorized tbody').find("tr:gt(1)").remove();
-                    $.each(result.data, function(index, res){
-                        
-                        var row = '';
-                        exp = 'Session';
-                        
-                        if(!!res.expires){
-                            exp = Math.round((res.expires - Date.now())/86400);
-                            if(exp < 1 && !!res['Max-Age']){
-                                exp = res['Max-Age'] + " days";
-                            }else{
-                                exp = 'Session';
-                            }
-                        }
-                        
-                        row = '<tr>';
-                        row += '<td>' + res.cookie_name + '</td>';
-                        row += '<td>' + res.description + '</td>';
-                        row += '<td>' + exp + '</td>';
-                        row += '<td> <span class="dashicons dashicons-edit cookieadmin_edit_icon" id="edit_'+res.id+'"></span> <span class="dashicons dashicons-trash cookieadmin_delete_icon" id="delete_'+res.id+'"></span> </td>';
-                        row += '</tr>';
-                        categorized_cookies[res.id] = res;
-                        categorized_cookies[res.id]['expires'] = exp;
-                        
-                        if(!!res.category){
-                            type = "#" + res.category.toLowerCase() + "_tbody";
-                            $(type).find('.cookieadmin-empty-row').remove();
-                            $(type).append(row);
-                        }else{
-                            $("#unknown_tbody").find('.cookieadmin-empty-row').remove();
-                            $("#unknown_tbody").append(row);
-                        }
-                    });
-                    
-                } else {
-                    alert(result.data.message);
+                if(result.success){
+                    if(typeof cookieadmin_pro_policy === 'object'){
+                        alert(cookieadmin_pro_policy.lang.background_scan);
+                    }else{
+                        alert(cookieadmin_policy.lang.scan_completed);
+                        window.location.reload();
+                    }
+                }else{
+                    alert(result.message);
                 }
                 
             },  
             error: function(xhr, status, error) {
+                console.log('CookieAdmin AJAX Error:', status, error);
+                console.log('CookieAdmin response: ' + xhr.responseText); // Check the error message
                 alert("Request failed: " + error);
             },
             complete: function() {
-                $(".cookieadmin-scan").prop("disabled", false).prop("value", cookieadmin_btn_val);
+                this_btn.prop("disabled", false).prop("value", cookieadmin_btn_val);
             }
         });
-    });
-    
-    $("#cookieadmin_dialog_save_btn").on("click", function(){
-        
+    }
+    $(".cookieadmin-scan").on("click", cookieadminScanCookies);
+    
+    function cookieadminSaveCookie(){
+        
+        $('#cookieadmin-message').removeClass().addClass('spinner is-active').text('').css('height','auto');
         $(this).prop("disabled", true);
+        
+        //set 0 to add real id to delete
+        cookie_id = $(this).attr("cookieadmin_cookie_id");
         
         let cookie_info = {
             name: $("#cookieadmin-dialog-cookie-name").val(),
-            id: $(this).attr("cookieadmin_cookie_id"),
+            id: cookie_id,
             description: $("#cookieadmin-dialog-cookie-desc").val(),
             duration: $("#cookieadmin-dialog-cookie-duration").val(),
             type: $("#cookieadmin-dialog-cookie-category").val()
         };
+        
+        $.each(cookie_info, function (i, val){
+            if(!val){
+                cookie_info = null;
+                return false;
+            }
+        });
+    
+        if(!cookie_info){
+            $(this).prop("disabled", false);
+            $('#cookieadmin-message').removeClass().addClass('cookieadmin-error-message').text('Please fill all the fields');
+            return false;
+        }
+        
+        // Used to call add cookie, in the Pro file.
+        if(cookie_id == 0 && typeof cookieadminProSaveCookie === 'function'){
+            cookieadminProSaveCookie(cookie_info);
+            return;
+        }
         
         $.ajax({
@@ -477 +472 @@
                 
                 if(result.success){
-                        
-                    var row = '';
-                                        
-                    row = '<tr>';
-                    row += '<td>' + cookie_info.name + '</td>';
-                    row += '<td>' + cookie_info.description + '</td>';
-                    row += '<td>' + cookie_info.duration + '</td>';
-                    row += '<td> <span class="dashicons dashicons-edit cookieadmin_edit_icon" id="edit_'+cookie_info.id+'"></span> <span class="dashicons dashicons-trash cookieadmin_delete_icon" id="edit_'+cookie_info.id+'"></span> </td>';
-                    row += '</tr>';
-                    
-                    $("#edit_"+cookie_info.id).parents("tr").remove();
-                    tbody = "#" + cookie_info.type.toLowerCase() + "_tbody";
-                    $(tbody).find('.cookieadmin-empty-row').remove();
-                    $(tbody).append(row);
-
-                    categorized_cookies[cookie_info.id]['cookie_name'] = cookie_info.name;
-                    categorized_cookies[cookie_info.id]['description'] = cookie_info.description;
-                    categorized_cookies[cookie_info.id]['expires'] = cookie_info.duration;
-                    categorized_cookies[cookie_info.id]['category'] = cookie_info.type;
-                    
+                    cookieadminAddCookieToTable(cookie_info);
+                    $('#cookieadmin-message').removeClass().addClass('cookieadmin-success-message').text(result.message);
                 }else{
-                    alert(result.data.message);
+                    alert(result.message);
                 }
+            },
+            error: function(xhr, status, error) {
+                console.log('CookieAdmin AJAX Error:', status, error);
+                console.log('CookieAdmin response: ' + xhr.responseText); // Check the error message
+                alert("Request failed: " + error);
             }
         });
         $(this).prop("disabled", false);        
-    });
-    
-
+    }
+    $("#cookieadmin_dialog_save_btn").on("click", cookieadminSaveCookie);
+    
     $("input[type=color]").on("input", function(){
         elemt = $(this).attr("id").replace("_box", "");
@@ -512 +494 @@
     
     
-    $(document).on("click", ".cookieadmin_delete_icon", function(){
+    function cookieadminDeleteCookie(){
         
         if(confirm("Are you sure you want to delete ?")){
             
             cookie_raw_id = $(this).attr("id").replace("delete_", "");
+            var row = $(this).parents("tr")
             
             $.ajax({
@@ -523 +506 @@
                 data : {
                     action : 'cookieadmin_ajax_handler',
-                    cookieadmin_act : 'cookieadmin-edit-cookie',
+                    cookieadmin_act : 'cookieadmin-delete-cookie',
                     cookie_raw_id : cookie_raw_id,
                     cookieadmin_security : cookieadmin_policy.cookieadmin_nonce,
                 },
                 success: function(result){
-                    
                     if (result.success) {
+                        row.remove();
                         delete categorized_cookies[cookie_raw_id];
                     }else{
-                        alert(result.data.message);
+                        alert(result.message);
                     }
+                },
+                error: function(xhr, status, error) {
+                    console.log('CookieAdmin AJAX Error:', status, error);
+                    console.log('CookieAdmin response: ' + xhr.responseText); // Check the error message
+                    alert("Request failed: " + error);
                 }
             });
-            
-            $(this).parents("tr").remove();
-        }
-    });
-    
-    
-    $(document).on("click", ".cookieadmin_edit_icon, .cookieadmin_dialog_modal_close_btn", function(){
+        }
+    }
+    $('.cookieadmin-metabox-holder').on("click", ".cookieadmin_delete_icon", cookieadminDeleteCookie);
+    
+    function cookieadminOpenCookieDialog(){
         
         const modal = document.getElementById('edit-cookie-modal');
@@ -550 +536 @@
         }else{
             modal.classList.add('active');
-            var cookie_id = $(this).attr("id").replace("edit_", "");
             
-            $("#cookieadmin_dialog_save_btn").attr("cookieadmin_cookie_id", cookie_id);
-            $("#cookieadmin-dialog-cookie-name").val(categorized_cookies[cookie_id]['cookie_name']);
-            $("#cookieadmin-dialog-cookie-desc").val(categorized_cookies[cookie_id]['description']);
-            $("#cookieadmin-dialog-cookie-duration").val(categorized_cookies[cookie_id]['expires']);
-            if(!!categorized_cookies[cookie_id]['category']){
-                $("#cookieadmin-dialog-cookie-category").val(categorized_cookies[cookie_id]['category']);
+            if($(this).hasClass('cookieadmin-add-cookie')){
+                $("#cookieadmin_dialog_save_btn").attr("cookieadmin_cookie_id", 0);
+                $('.cookieadmin_modal-header').children()[0].innerHTML = 'Add Cookie';
+                $('.cookieadmin_modal-container').find('input,textarea,select').val('');
             }else{
-                $("#cookieadmin-dialog-cookie-category").val("unknown");
+                
+                $('.cookieadmin_modal-header').children()[0].innerHTML = 'Edit Cookie';
+                var cookie_id = $(this).attr("id").replace("edit_", "");
+                
+                $("#cookieadmin_dialog_save_btn").attr("cookieadmin_cookie_id", cookie_id);
+                $("#cookieadmin-dialog-cookie-name").val(categorized_cookies[cookie_id]['cookie_name']);
+                $("#cookieadmin-dialog-cookie-desc").val(categorized_cookies[cookie_id]['description']);
+                $("#cookieadmin-dialog-cookie-duration").val(categorized_cookies[cookie_id]['expires']);
+                if(!!categorized_cookies[cookie_id]['category']){
+                    $("#cookieadmin-dialog-cookie-category").val(categorized_cookies[cookie_id]['category']);
+                }else{
+                    $("#cookieadmin-dialog-cookie-category").val("unknown");
+                }
             }
+            
+            $('.cookieadmin-metabox-holder').on('mousedown.cookieadmin-close-dialog2', function(e){
+                if ( !$(".cookieadmin_modal-container").is(e.target) && $(".cookieadmin_modal-container").has(e.target).length === 0 && !$(".cookieadmin_modal-container").is(e.target) && $(".cookieadmin_modal-container").has(e.target).length === 0) {
+                    modal.classList.remove('active');
+                    $('#cookieadmin-message').removeClass().addClass('cookieadmin-success-message').text('');
+                    $('.cookieadmin-metabox-holder').off('mousedown.cookieadmin-close-dialog2');
+                }
+            });
         }       
-    });
-    
-    
-    $(document).on('click', '.cookieadmin-cookie-categorized tbody > tr:first-child', function() {
-      var $tbody = jQuery(this).closest('tbody');
+    }
+    $(document).on("click", ".cookieadmin_edit_icon, .cookieadmin_dialog_modal_close_btn, .cookieadmin-add-cookie", cookieadminOpenCookieDialog);
+    
+    
+    function cookieadminExpandCollapseCookiesList() {
+      var $tbody = $(this).closest('tbody');
       var $rows = $tbody.find('tr:not(:first-child)');
 
@@ -576 +580 @@
         $tbody.removeClass('collapsed');
       }
+    }
+    $('.cookieadmin-metabox-holder').on('click', '.cookieadmin-cookie-categorized tbody > tr:first-child', cookieadminExpandCollapseCookiesList);
+    
+    // Tooltip
+    let cookieadminToolTip;
+    
+    function cookieadminCreateTooltip(){
+        cookieadminToolTip = $('<div>', {
+            class: 'cookieadmin-tooltip'
+        }).appendTo('body');
+    }
+
+    $('.cookieadmin-tooltip-box').on('mouseenter', function(e){
+        
+        if(!cookieadminToolTip){
+            cookieadminCreateTooltip();
+        }
+        
+        var tip = $(this).attr('data-tip') || '';
+        cookieadminToolTip.text(tip).css('opacity', 1);
+        
+    }).on('mousemove', function(e){
+        
+        if(!cookieadminToolTip){
+            return;
+        }
+        
+        var offset = 12;
+        var tooltipRect = cookieadminToolTip[0].getBoundingClientRect();
+        
+        var top = e.clientY - tooltipRect.height - offset;
+        var left = e.clientX + offset;
+        
+        // Flip below if not enough space above
+        if(top < 8){
+            top = e.clientY + offset;
+        }
+        
+        // Prevent right overflow
+        if(left + tooltipRect.width > window.innerWidth - 8){
+            left = e.clientX - tooltipRect.width - offset;
+        }
+        
+        cookieadminToolTip.css({
+            top: top + 'px',
+            left: left + 'px'
+        });
+    })
+    .on('mouseleave', function(){
+
+        if(!cookieadminToolTip){
+            return;
+        }
+        
+        cookieadminToolTip.css('opacity', 0);
     });
     
     
 });
+
+function cookieadminAddCookieToTable(cookie_info){
+
+    var row = '';
+
+    categorized_cookies[cookie_info.id] = !categorized_cookies[cookie_info.id] ? {} : categorized_cookies[cookie_info.id];
+
+    categorized_cookies[cookie_info.id]['id'] = cookie_info.id;
+    categorized_cookies[cookie_info.id]['cookie_name'] = cookie_info.name;
+    categorized_cookies[cookie_info.id]['description'] = cookie_info.description;
+    categorized_cookies[cookie_info.id]['expires'] = cookie_info.duration;
+    categorized_cookies[cookie_info.id]['category'] = cookie_info.type;
+    
+    if(cookie_info.duration > 0){
+        cookie_info.duration += ' ' + cookieadmin_policy.lang.days;
+    }else{
+        cookie_info.duration = cookieadmin_policy.lang.session;
+    }
+    
+    row = '<tr>';
+    row += '<td>' + cookie_info.name + '</td>';
+    row += '<td>' + cookie_info.description + '</td>';
+    row += '<td>' + cookie_info.duration + '</td>';
+    row += '<td> <span class="dashicons dashicons-edit cookieadmin_edit_icon" id="edit_'+cookie_info.id+'"></span> <span class="dashicons dashicons-trash cookieadmin_delete_icon" id="edit_'+cookie_info.id+'"></span> </td>';
+    row += '</tr>';
+    
+    jQuery("#edit_"+cookie_info.id).parents("tr").remove();
+    tbody = "#" + cookie_info.type.toLowerCase() + "_tbody";
+    jQuery(tbody).find('.cookieadmin-empty-row').remove();
+    jQuery(tbody).append(row);
+    
+    if(!categorized_cookies[cookie_id]){
+        jQuery('.cookieadmin_modal-container').find('input,textarea,select').val('');
+    }
+}

cookieadmin/trunk/assets/js/footer.js

@@ -5 +5 @@
 
 document.addEventListener("DOMContentLoaded", function() {
-    if(!cookieadmin_is_pro){
+    if(!cookieadmin_data['is_pro']){
         jQuery("[cookieadmin-pro-only]").each(function(index) {
-            jQuery(this).find( "input, textarea, select" ).attr("disabled", true);
+            jQuery(this).filter("input, textarea, select").attr("disabled", true).css('cursor', 'not-allowed');
+            jQuery(this).find( "input, textarea, select, span" ).attr("disabled", true).css('cursor', 'not-allowed');
             jQuery(this).find( "input.cookieadmin-color-input" ).css("margin-left", "0px");
+            jQuery(this).find( "label span" ).not('.cookieadmin-tooltip-box').css("background-color", "#e8e8e8").css("color", "#9f9f9f");
         });
     }

cookieadmin/trunk/cookieadmin.php

@@ -4 +4 @@
 Plugin URI: https://cookieadmin.net
 Description: CookieAdmin provides easy to configure cookie consent banner with GDPR and CCPA law support.
-Version: 1.1.4
+Version: 1.1.5
 Author: Softaculous
 Author URI: https://www.softaculous.com
@@ -38 +38 @@
 define('COOKIEADMIN_BASE', plugin_basename(COOKIEADMIN_FILE));
 define('COOKIEADMIN_DIR', plugin_dir_path(__FILE__));
-define('COOKIEADMIN_VERSION', '1.1.4');
+define('COOKIEADMIN_VERSION', '1.1.5');
 define('COOKIEADMIN_URL', plugins_url('', COOKIEADMIN_FILE));
 define('COOKIEADMIN_PLUGIN_URL', plugin_dir_url(__FILE__));
@@ -52 +52 @@
 add_action( 'plugins_loaded', 'cookieadmin_load_textdomain', 9 );
 
-include_once(dirname(__FILE__).'/init.php');
+//Auto-loader
+function cookieadmin_autoloader($class){
+    
+    if(!preg_match('/^CookieAdmin\\\(.*)/is', $class, $m)){
+        return;
+    }
+
+    $m[1] = str_replace('\\', '/', $m[1]);
+    
+    if(file_exists(COOKIEADMIN_DIR.'includes/'.strtolower($m[1]).'.php')){
+        include_once(COOKIEADMIN_DIR.'includes/'.strtolower($m[1]).'.php');
+    }
+}
+
+spl_autoload_register(__NAMESPACE__.'\cookieadmin_autoloader');
+
+
+if(!class_exists('CookieAdmin')){
+#[\AllowDynamicProperties]
+class CookieAdmin{
+}
+}
+
+add_action('plugins_loaded', 'cookieadmin_load_plugin');
 
 // Activation & Deactivation Hooks

cookieadmin/trunk/includes/admin.php

@@ -40 +40 @@
         //Consent Page CSS
         wp_enqueue_style('cookieadmin-style', COOKIEADMIN_PLUGIN_URL . 'assets/css/cookie.css', [], COOKIEADMIN_VERSION);
+        wp_enqueue_style('cookieadmin-user-style', COOKIEADMIN_PLUGIN_URL . 'assets/css/consent.css', [], COOKIEADMIN_VERSION);
         
         //WP Color picker
@@ -50 +51 @@
             
             wp_enqueue_script('cookieadmin_js', COOKIEADMIN_PLUGIN_URL . 'assets/js/cookie.js', [], COOKIEADMIN_VERSION);
+            // wp_enqueue_script('cookieadmin_js', COOKIEADMIN_PLUGIN_URL . 'assets/js/consent.js', [], COOKIEADMIN_VERSION);
         
             $policy['set'] = $view;
@@ -58 +60 @@
             $policy['lang']['show_more'] = __('Show more', 'cookieadmin');
             $policy['lang']['show_less'] = __('Show less', 'cookieadmin');
+            $policy['lang']['days'] = __('Day(s)', 'cookieadmin');
+            $policy['lang']['session'] = __('Session', 'cookieadmin');
+            $policy['lang']['scan_completed'] = __('Scan completed', 'cookieadmin');
             
             wp_localize_script('cookieadmin_js', 'cookieadmin_policy', $policy);
@@ -63 +68 @@
         
         wp_enqueue_script('cookieadmin_js_footer', COOKIEADMIN_PLUGIN_URL . 'assets/js/footer.js', [], COOKIEADMIN_VERSION);
-        wp_localize_script('cookieadmin_js_footer', 'cookieadmin_is_pro', (int) cookieadmin_is_pro());
+        wp_localize_script('cookieadmin_js_footer', 'cookieadmin_data', array('is_pro' => cookieadmin_is_pro()));
     }
     
@@ -69 +74 @@
     static function cookieadmin_plugin_menu(){
         
+        if(!empty($_REQUEST['cookieadmin_save_settings'])){
+        
+            if(!empty($_REQUEST['cookieadmin_consent_type'])){
+                \CookieAdmin\Admin\Consent::save_consent_form();
+            }else{
+                \CookieAdmin\Admin\Settings::save_settings();
+            }
+        }
+        
         $capability = 'activate_plugins';
-        
-        add_menu_page(__('CookieAdmin', 'cookieadmin'), __('CookieAdmin', 'cookieadmin'), $capability, 'cookieadmin', '\CookieAdmin\Admin::dashboard_page', COOKIEADMIN_PLUGIN_URL .'assets/images/cookieadmin_icon_20.svg');
-        
-        if (isset($_POST['cookieadmin_save_settings'])) {
-            \CookieAdmin\Admin::cookieadmin_save_settings();
-        }
-        
-        add_submenu_page('cookieadmin', __('Dashboard', 'cookieadmin'), __('Dashboard', 'cookieadmin'), $capability, 'cookieadmin', '\CookieAdmin\Admin::dashboard_page');
-        
-        add_submenu_page('cookieadmin', __('Consent Form', 'cookieadmin'), __('Consent Form', 'cookieadmin'), $capability, 'cookieadmin-consent', '\CookieAdmin\Admin::consent_form_page');
-        
-        add_submenu_page('cookieadmin', __('Settings', 'cookieadmin'), __('Settings', 'cookieadmin'), $capability, 'cookieadmin-settings', '\CookieAdmin\Admin::settings_page');
-        
-        add_submenu_page('cookieadmin', __('Scan Cookies', 'cookieadmin'), __('Scan Cookies', 'cookieadmin'), $capability, 'cookieadmin-scan-cookies', '\CookieAdmin\Admin::scan_cookies_page');
+        $logo = defined('SITEPAD') ? 'cookieadmin_icon_20-black.svg' : 'cookieadmin_icon_20.svg';
+        
+        add_menu_page(__('CookieAdmin', 'cookieadmin'), __('CookieAdmin', 'cookieadmin'), $capability, 'cookieadmin', '\CookieAdmin\Admin\Dashboard::dashboard', COOKIEADMIN_PLUGIN_URL .'assets/images/'.$logo);
+        
+        add_submenu_page('cookieadmin', __('Dashboard', 'cookieadmin'), __('Dashboard', 'cookieadmin'), $capability, 'cookieadmin', '\CookieAdmin\Admin\Dashboard::dashboard');
+        
+        add_submenu_page('cookieadmin', __('Consent Form', 'cookieadmin'), __('Consent Form', 'cookieadmin'), $capability, 'cookieadmin-consent', '\CookieAdmin\Admin\Consent::consent_form');
+        
+        add_submenu_page('cookieadmin', __('Settings', 'cookieadmin'), __('Settings', 'cookieadmin'), $capability, 'cookieadmin-settings', '\CookieAdmin\Admin\Settings::settings');
+        
+        add_submenu_page('cookieadmin', __('Scan Cookies', 'cookieadmin'), __('Scan Cookies', 'cookieadmin'), $capability, 'cookieadmin-scan-cookies', '\CookieAdmin\Admin\Scan::show_cookies');
         
         if(defined('COOKIEADMIN_PREMIUM')){
@@ -154 +165 @@
         }
     }
-    
-    static function dashboard_page(){
-        
-        global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg, $cookieadmin_settings;
-        
-        self::header_theme(__('Dashboard', 'cookieadmin'));
-        
-        $view = get_option('cookieadmin_law', 'cookieadmin_gdpr');
-        
-        echo '
-        <div class="cookieadmin_consent-wrap">
-            <div class="cookieadmin-admin-row">
-                <div class="cookieadmin-stats-block cookieadmin-is-block-25">
-                    <div class="cookieadmin-stats-name">'.esc_html__('Consent Banner', 'cookieadmin').'</div>
-                    <div class="cookieadmin-stats-number cookieadmin-green">'.esc_html__('Enabled', 'cookieadmin').'</div>
-                </div>
+
+    static function cookieadmin_table_exists($table_name) {
+        global $wpdb;
+        
+        $query = $wpdb->prepare("SHOW TABLES LIKE %s", $table_name);
+        
+        return $wpdb->get_var($query) === $table_name;
+    }
+    
+    static function scan_notice(){
+        
+        $cookieadmin_auto_scan = get_option('cookieadmin_scan');
+        $current_page = isset($_GET['page']) ? sanitize_text_field(wp_unslash($_GET['page'])) : '';
+        
+        if(empty($cookieadmin_auto_scan['status']) || (strpos($current_page, 'cookieadmin') !== 0)){
+            return false;
+        }
+            
+        $msg = '';
+        
+        if($cookieadmin_auto_scan['status'] === 2){
+            
+            $count = !empty($cookieadmin_auto_scan['count']) ? $cookieadmin_auto_scan['count'] : 0;
+            /* translators: %1$s is replaced with a "string" of name of plugins, and %2$s is replaced with "string" which can be "is" or "are" based on the count of the plugin */
+            $msg = sprintf(__('<br><strong>Cookie Scan is running:</strong> %1$d Cookies found. Please wait for cookies to appear on <a href="%2$s">Scan Cookies Page</a>', 'cookieadmin'), $count, esc_url(admin_url('admin.php?page=cookieadmin-scan-cookies')));
+        }
+        
+        if($cookieadmin_auto_scan['status'] === 3 && isset($cookieadmin_auto_scan['success'])){
                 
-                <div class="cookieadmin-stats-block cookieadmin-is-block-25">
-                    <div class="cookieadmin-stats-name">'.esc_html__('Consent Type', 'cookieadmin').'&nbsp;
-                        <div class="cookieadmin-block-link"><a href="'.esc_url(admin_url('admin.php?page=cookieadmin-consent')).'">['.esc_html__('Edit', 'cookieadmin').']</a></div>
-                    </div>
-                    <div class="cookieadmin-stats-number cookieadmin-uppercase">'.(!empty($view) && $view == 'cookieadmin_us' ? esc_html__('US State Laws', 'cookieadmin') : esc_html__('GDPR', 'cookieadmin')).'</div>
-                </div>
+            if($cookieadmin_auto_scan['success'] === true){
+                /* translators: %1$s is replaced with a "string" of name of plugins, and %2$s is replaced with "string" which can be "is" or "are" based on the count of the plugin */
+                $msg = sprintf(__('<br><strong>Cookie Scan completed successfully:</strong> Please visit <a href="%1$s">Scan Cookies</a> to review scan results.', 'cookieadmin'), esc_url(admin_url('admin.php?page=cookieadmin-scan-cookies')));
+            }
+            
+            if($cookieadmin_auto_scan['success'] === false){
+                /* translators: %1$s is replaced with a "string" of name of plugins, and %2$s is replaced with "string" which can be "is" or "are" based on the count of the plugin */
+                $msg = sprintf(__('<br><strong>Cookie Scan failed:</strong> Please <a href="%1$s">Scan Cookies</a> again for compliance. %2$s', 'cookieadmin'), esc_url(admin_url('admin.php?page=cookieadmin-scan-cookies')), esc_html(!empty($cookieadmin_auto_scan['message']) ? $cookieadmin_auto_scan['message'] : ''));
+            }
+        }
+        
+        if(empty($msg)){
+            return;
+        }
+        
+        // cookieadmin_logo_svg fn is Internal static SVG. if allowing user input or filters, escape it.
+        echo '          
+        <div class="notice notice-info is-dismissible" id="cookieadmin-auto-scan-notice">
+            <p>'.cookieadmin_logo_svg().wp_kses_post($msg). '</p>
+        </div>';
+        
+        wp_register_script('cookieadmin-scan-notice', '', ['jquery'], '', true);
+        wp_enqueue_script('cookieadmin-scan-notice');
+        wp_add_inline_script('cookieadmin-scan-notice', 'jQuery("#cookieadmin-auto-scan-notice").on("click",
+        function(e){
+            
+            let target = jQuery(e.target);
+            if(!target.hasClass("notice-dismiss")){
+                return;
+            }
+            
+            var data;
+
+            // Hide it
+            jQuery("#cookieadmin-auto-scan-notice").remove();
+
+            // Save this preference
+            jQuery.post("'.admin_url('admin-ajax.php?action=cookieadmin_ajax_handler&cookieadmin_act=close-notice&notice=cookieadmin-scan-notice').'&cookieadmin_security='.wp_create_nonce('cookieadmin_admin_js_nonce').'", data, function(response) {
+            });
+            
+        });');
+        
+    }
+    static function consent_log_purge_notice(){
+        
+        $cookieadmin_consent_purge = get_option('cookieadmin_consent_purge', ['status' => 0, 'count' => 0]);
                 
-                <div class="cookieadmin-stats-block cookieadmin-is-block-25">
-                    <div class="cookieadmin-stats-name">'.esc_html__('Google Consent Mode v2', 'cookieadmin').'&nbsp;
-                        <div class="cookieadmin-block-link"><a href="'.esc_url(admin_url('admin.php?page=cookieadmin-settings')).'">['.esc_html__('Edit', 'cookieadmin').']</a></div>
-                    </div>
-                    '.(!empty($cookieadmin_settings['google_consent_mode_v2']) ? '<div class="cookieadmin-stats-number cookieadmin-green">'.esc_html__('Enabled', 'cookieadmin').'</div>' : '<div class="cookieadmin-stats-number">'.esc_html__('Disabled', 'cookieadmin').'</div>').'
-                </div>
-                
-                <div style="width:25%">
-                    
-                </div>
-            </div>
-        </div>';
-        
-        self::footer_theme();
-    }
-
-    static function settings_page(){
-
-        global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg, $cookieadmin_settings;
-        
-        self::header_theme(__('Settings', 'cookieadmin'));
-        
-        $view = get_option('cookieadmin_law', 'cookieadmin_gdpr');  
-        $policy = cookieadmin_load_policy();
-        $policy['set'] = $view;
-        $policy['admin_url'] = admin_url('admin-ajax.php');
-        $policy['cookieadmin_nonce'] = wp_create_nonce('cookieadmin_admin_js_nonce');
-
-        $cookieadmin_requires_pro = self::is_feature_available(1);
-        
-        echo '
-        <div class="cookieadmin_consent-wrap">
-            <form action="" method="post" id="setting_submenu">
-
-            <div class="cookieadmin_consent-contents">
-                <div class="cookieadmin_consent_settings">
-                    <div class="cookieadmin-contents cookieadmin-settings">
-                        <div class="cookieadmin-setting setting-prior">
-                            <label class="cookieadmin-title">'.esc_html__('Load Cookies prior to consent', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents">
-                            
-                                <input name="cookieadmin_preload[]" type="checkbox" id="necessary_preload" value="necessary" checked disabled>
-                                <label class="cookieadmin-input" for="necessary_preload">'.esc_html__('Necessary', 'cookieadmin').'</label>
-                                
-                                <input name="cookieadmin_preload[]" type="checkbox" id="functional_preload" value="functional" '.(!empty($policy[$view]['preload']) && in_array("functional", $policy[$view]['preload']) ? 'checked' : '').'>
-                                <label class="cookieadmin-input" for="functional_preload">'.esc_html__('Functional', 'cookieadmin').'</label>
-                                
-                                <input name="cookieadmin_preload[]" type="checkbox" id="analytics_preload" value="analytics" '.(!empty($policy[$view]['preload']) && in_array("analytics", $policy[$view]['preload']) ? 'checked' : '').'>
-                                <label class="cookieadmin-input" for="analytics_preload">'.esc_html__('Analytical', 'cookieadmin').'</label>
-                                
-                                <input name="cookieadmin_preload[]" type="checkbox" id="marketing_preload" value="marketing" '.(!empty($policy[$view]['preload']) && in_array("marketing", $policy[$view]['preload']) ? 'checked' : '').'>
-                                <label for="marketing_preload">'.esc_html__('Advertisement', 'cookieadmin').'</label>
-                            </div>
-                        </div>
-                        
-                        <div class="cookieadmin-setting setting-reload">
-                            <label class="cookieadmin-title" for="cookieadmin_reload_on_consent">'.esc_html__('Reload page on consent', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents">
-                                <label class="cookieadmin_toggle">
-                                    <input name="cookieadmin_reload_on_consent" type="checkbox" id="cookieadmin_reload_on_consent" '.(!empty($policy[$view]['reload_on_consent']) ? 'checked' : '').'>
-                                    <span class="cookieadmin_slider"></span>
-                                </label>
-                            </div>
-                        </div>
-
-                        <div class="coookieadmin-contents cookieadmin-settings" cookieadmin-pro-only="1">
-                            <div class="cookieadmin-setting">
-                                <label class="cookieadmin-title" for="cookieadmin_google_consent_mode_v2">'.esc_html__('Google Consent Mode v2', 'cookieadmin').wp_kses_post($cookieadmin_requires_pro).'</label>
-                                <div class="cookieadmin-setting-contents">
-                                    <label class="cookieadmin_toggle">
-                                        <input name="cookieadmin_google_consent_mode_v2" type="checkbox" id="cookieadmin_google_consent_mode_v2" '.(!empty($cookieadmin_settings['google_consent_mode_v2']) && cookieadmin_is_pro() ? 'checked' : '').'>
-                                        <span class="cookieadmin_slider"></span>
-                                    </label>
-                                </div>
-                            </div>
-
-                            <div class="cookieadmin-setting setting-poweredby">
-                                <label class="cookieadmin-title" for="cookieadmin_hide_powered_by">'.esc_html__('Hide Powered by Link', 'cookieadmin').wp_kses_post($cookieadmin_requires_pro).'</label>
-                                <div class="cookieadmin-setting-contents">
-                                    <label class="cookieadmin_toggle">
-                                        <input name="cookieadmin_hide_powered_by" type="checkbox" id="cookieadmin_hide_powered_by" '.(!empty($cookieadmin_settings['hide_powered_by']) && cookieadmin_is_pro() ? 'checked' : '').'>
-                                        <span class="cookieadmin_slider"></span>
-                                    </label>
-                                </div>
-                            </div>
-
-                            <div class="cookieadmin-setting setting-reconsent">
-                                <label class="cookieadmin-title" for="cookieadmin_hide_reconsent">'.esc_html__('Hide Re-consent Icon', 'cookieadmin').wp_kses_post($cookieadmin_requires_pro).'</label>
-                                <div class="cookieadmin-setting-contents">
-                                    <label class="cookieadmin_toggle">
-                                        <input name="cookieadmin_hide_reconsent" type="checkbox" id="cookieadmin_hide_reconsent" '.(!empty($cookieadmin_settings['hide_reconsent']) && cookieadmin_is_pro() ? 'checked' : '').'>
-                                        <span class="cookieadmin_slider"></span>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="cookieadmin-setting">
-                            <div class="cookieadmin-setting-contents">
-                                <span><input type="submit" name="cookieadmin_save_settings" class="cookieadmin-btn cookieadmin-btn-primary action" value="'.esc_html__('Save Settings', 'cookieadmin').'"></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>';
-
-                wp_nonce_field('cookieadmin_admin_nonce', 'cookieadmin_security');
-                echo '
-                <br/>
-                <br/>
-            </div>
-            </form>
-        </div>';
-        
-        self::footer_theme();
-    }
-
-    static function scan_cookies_page(){
-        global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg, $wpdb;
-        
-        self::header_theme(__('Scan Cookies', 'cookieadmin'));
-        
-        $table_name = esc_sql($wpdb->prefix . 'cookieadmin_cookies');
-        $scanned = $wpdb->get_results("SELECT * FROM {$table_name} limit 1");
-        
-        $cookies_scanned = '';
-        $categorized = [];
-        $categorized_cookies = [];
-        
-        if(!empty($scanned)){
-            
-            $is_categorized = $wpdb->get_var("SELECT * FROM {$table_name} WHERE category IS NOT NULL LIMIT 1");
-            
-            $scanned_cookies = $wpdb->get_results("SELECT * FROM {$table_name}");
-            
-            if(empty($is_categorized)){
-                
-                foreach($scanned_cookies as $row => $data){ 
-                    $exp = 'Session';
-                    $data->expires = strtotime($data->expires);
-                    if(!empty($data->expires) && ($data->expires > 0)){
-                        $exp = round(($data->expires - time()) / 86400);
-                        if($exp < 1 && !empty($data->max_age)){
-                            $exp = $data->max_age . ' '.__('days', 'cookieadmin');
-                        }
-                    }
-                    
-                    $cookies_scanned .= '<tr><td>'.esc_html($data->cookie_name).'</td><td>'.esc_html($exp).'</td><td>'.esc_html($data->path).'</td><td>'.esc_html($data->domain).'</td><td>'.( $data->secure ? 'Yes' : 'No').'</td></tr>';
-                
-                }
-            }
-            else{
-
-                foreach($scanned_cookies as $row => $data){ 
-                
-                    $exp = 'Session';
-                    if (!empty($data->expires) && is_string($data->expires)) {
-                        $timestamp = strtotime($data->expires);
-                        if ($timestamp && $timestamp > 0) {
-                            $exp = round(($timestamp - time()) / 86400);
-                            if ($exp < 1 && !empty($data->max_age)) {
-                                $exp = $data->max_age;
-                            }
-                            $exp .= ' '.__('days', 'cookieadmin');
-                        }
-                    }
-                        
-                    if(empty($data->category)){
-                        $data->category = 'Unknown';
-                    }
-                    
-                    if(!isset($categorized[$data->category])){
-                        $categorized[$data->category] = '';
-                    }
-                    
-                    if(empty($data->description)){
-                        $data->description = 'Not Available';
-                    }
-                    
-                    $categorized[$data->category] .= '<tr><td>'.esc_html($data->cookie_name).'</td><td>'.esc_html($data->description).'</td><td>'.esc_html($exp).'</td><td> <span class="dashicons dashicons-edit cookieadmin_edit_icon" id="edit_'.esc_attr($data->id).'"></span> <span class="dashicons dashicons-trash cookieadmin_delete_icon" id="delete_'.esc_attr($data->id).'"></span> </td></tr>';
-
-                    $categorized_cookies[$data->id]['id'] = $data->id;
-                    $categorized_cookies[$data->id]['cookie_name'] = $data->cookie_name;
-                    $categorized_cookies[$data->id]['description'] = $data->description;
-                    $categorized_cookies[$data->id]['category'] = $data->category;
-                    $categorized_cookies[$data->id]['expires'] = $exp;
-
+        if(empty($cookieadmin_consent_purge['status'])){
+            return false;
+        }
+            
+        $msg = '';
+        $count = empty($cookieadmin_consent_purge['count']) ? 0 : $cookieadmin_consent_purge['count'];
+        
+        if($cookieadmin_consent_purge['status'] === 2){
+            /* translators: %1$d: number of consent logs deleted */
+            $msg =  sprintf(__('<br><strong>Consent logs are being deleted :</strong> %1$d logs deleted. Please wait for deletion process to complete.', 'cookieadmin'), $count);
+        }
+        
+        if($cookieadmin_consent_purge['status'] === 3){
+            if(isset($cookieadmin_consent_purge['success'])){
+                if($cookieadmin_consent_purge['success'] === true){
+                    /* translators: %1$d: number of consent logs deleted */
+                    $msg = sprintf(__('<br><strong>Consent logs deleted successfully:</strong> %1$d logs deleted.', 'cookieadmin'), $count);
                 }
                 
-                $cookies_scanned .= '<tr><td colspan="5">'.esc_html__('No uncategorized cookies yet. Click on Scan Cookies button to scan for new cookies!', 'cookieadmin').'</td></tr>';
-            }
-        }else{
-            
-            $cookies_scanned .= '<tr><td colspan="5">'.esc_html__('No scanned cookies yet. Click on Scan Cookies button to scan for new cookies!', 'cookieadmin').'</td></tr>';
-            
-        }
-        
-        wp_register_script('cookieadmin_categorized_cookies', '', array('jquery'), COOKIEADMIN_VERSION, true);
-        wp_enqueue_script('cookieadmin_categorized_cookies');
-        wp_localize_script('cookieadmin_categorized_cookies', 'categorized_cookies', $categorized_cookies);
-        
-        echo '
-        <div class="cookieadmin_consent-wrap">
-            <form action="" method="post">
-            <div class="cookieadmin_consent-contents">
-                <div class="cookieadmin_consent_settings">
-                    <div class="cookieadmin-setting cookieadmin-manager-cookie-scan">
-                        <label class="cookieadmin-title">'.esc_html__('Scanned Cookies', 'cookieadmin').'</label>
-                        <div class="cookieadmin-setting-contents cookieadmin-cookie-scan">
-                            <input type="button" class="cookieadmin-btn cookieadmin-btn-primary cookieadmin-scan" value="'.esc_html__('Scan Cookies', 'cookieadmin').'">
-                        </div>
-                        <div class="cookieadmin-manager-result">
-                            <table class="cookieadmin-table cookieadmin-cookie-categorized">
-                                <thead>
-                                    <tr>
-                                        <th width="30%">'.esc_html__('Name', 'cookieadmin').'</th>
-                                        <th width="50%">'.esc_html__('Description', 'cookieadmin').'</th>
-                                        <th width="10%">'.esc_html__('Expiry', 'cookieadmin').'</th>
-                                        <th width="10%">'.esc_html__('Action', 'cookieadmin').'</th>
-                                    </tr>
-                                </thead>
-                                <tbody id="necessary_tbody">
-                                    <tr><td colspan=4>'.esc_html__('Necessary Cookies', 'cookieadmin').'</td></tr>
-                                    '.( !empty($categorized['Necessary']) ? wp_kses_post($categorized['Necessary']) : '<tr class="cookieadmin-empty-row"><td colspan=4>'.esc_html__('No Cookies Found!', 'cookieadmin').'</td></tr>' ).'
-                                </tbody>
-                                <tbody id="functional_tbody">
-                                    <tr><td colspan=4>'.esc_html__('Functional Cookies', 'cookieadmin').'</td></tr>
-                                    '.( !empty($categorized['Functional']) ? wp_kses_post($categorized['Functional']) : '<tr class="cookieadmin-empty-row"><td colspan=4>'.esc_html__('No Cookies Found!', 'cookieadmin').'</td></tr>' ).'
-                                </tbody>
-                                <tbody id="analytics_tbody">
-                                    <tr><td colspan=4>'.esc_html__('Analytical Cookies', 'cookieadmin').'</td></tr>
-                                    '.( !empty($categorized['Analytics']) ? wp_kses_post($categorized['Analytics']) : '<tr class="cookieadmin-empty-row"><td colspan=4>'.esc_html__('No Cookies Found!', 'cookieadmin').'</td></tr>' ).'
-                                </tbody>
-                                <tbody id="marketing_tbody">
-                                    <tr><td colspan=4>'.esc_html__('Marketing Cookies', 'cookieadmin').'</td></tr>
-                                    '.( !empty($categorized['Marketing']) ? wp_kses_post($categorized['Marketing']) : '<tr class="cookieadmin-empty-row"><td colspan=4>'.esc_html__('No Cookies Found!', 'cookieadmin').'</td></tr>' ).'
-                                </tbody>
-                                <tbody id="unknown_tbody">
-                                    <tr><td colspan=4>'.esc_html__('Unknown Cookies', 'cookieadmin').'</td></tr>
-                                    '.( !empty($categorized['Unknown']) ? wp_kses_post($categorized['Unknown']) : '<tr class="cookieadmin-empty-row"><td colspan=4>'.esc_html__('No Cookies Found!', 'cookieadmin').'</td></tr>' ).'
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>';
-            
-            wp_nonce_field('cookieadmin_admin_nonce', 'cookieadmin_security');
-            
-            echo '
-        </div>
-        </form>
-        <br/>';
-        
-        self::footer_theme();
-        
-        echo '
-        <!-- Modal Overlay -->
-        <div class="cookieadmin_modal-overlay" id="edit-cookie-modal" hidden>
-            <div class="cookieadmin_modal-container">
-                <div class="cookieadmin_modal-header">
-                    <h2>'.esc_html__('Edit Cookie', 'cookieadmin').'</h2>
-                    <button class="cookieadmin_dialog_modal_close_btn">&times;</button>
-                </div>
-
-                <div class="cookieadmin_modal-body">
-                    <div class="cookieadmin_form-group">
-                        <label for="cookieadmin-dialog-cookie-category">'.esc_html__('Category', 'cookieadmin').'</label>
-                        <select id="cookieadmin-dialog-cookie-category">
-                            <option value="Unknown">'.esc_html__('Unknown', 'cookieadmin').'</option>
-                            <option value="Necessary">'.esc_html__('Necessary', 'cookieadmin').'</option>
-                            <option value="Functional">'.esc_html__('Functional', 'cookieadmin').'</option>
-                            <option value="Analytics">'.esc_html__('Analytical', 'cookieadmin').'</option>
-                            <option value="Marketing">'.esc_html__('Marketing', 'cookieadmin').'</option>
-                        </select>
-                    </div>
-                    
-                    <div class="cookieadmin_form-group">
-                        <label for="cookie_id">'.esc_html__('Cookie Name/ID', 'cookieadmin').'</label>
-                        <input type="text" id="cookieadmin-dialog-cookie-name" Placeholder="'.esc_html__('Enter Cookie Name or id', 'cookieadmin').'">
-                    </div>
-
-                    <div class="cookieadmin_form-group">
-                        <label for="description">'.esc_html__('Description', 'cookieadmin').'</label>
-                        <textarea id="cookieadmin-dialog-cookie-desc" Placeholder="'.esc_html__('Enter Cookie description here', 'cookieadmin').'"></textarea>
-                    </div>
-
-                    <div class="cookieadmin_form-group">
-                        <label for="duration">'.esc_html__('Duration', 'cookieadmin').'</label>
-                        <input type="text" id="cookieadmin-dialog-cookie-duration" Placeholder="'.esc_html__('30 days', 'cookieadmin').'">
-                    </div>
-
-                    <div class="cookieadmin_modal-footer" style="background-color:#ffffff;">
-                        <button class="cookieadmin-btn cookieadmin-btn-primary" id="cookieadmin_dialog_save_btn" form="edit-cookie-form">'.esc_html__('Save', 'cookieadmin').'</button>
-                    </div>
-                </div>
-            </div>
+                if($cookieadmin_consent_purge['success'] === false){
+                    /* translators: %1$d: number of consent logs deleted, %2$s: error message*/
+                    $msg = sprintf(__('<br><strong>Consent logs deletion failed:</strong> %1$d logs deleted. Error : %2$s', 'cookieadmin'), $count, esc_html($cookieadmin_consent_purge['message']));
+                }
+            }
+        }
+        
+        if(empty($msg)){
+            return;
+        }
+        
+        // cookieadmin_logo_svg fn is Internal static SVG. if allowing user input or filters, escape it.
+        echo '          
+        <div class="notice notice-info is-dismissible" id="cookieadmin-consent-purge-notice">
+            <p>'.cookieadmin_logo_svg().wp_kses_post($msg). '</p>
         </div>';
-    }
-
-    static function consent_form_page(){
-
-        global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg;
-        
-        self::header_theme(__('Consent Form', 'cookieadmin'));
-        
-        $view = get_option('cookieadmin_law', 'cookieadmin_gdpr');  
-        $policy = cookieadmin_load_policy();
-        
-        $templates = implode("", cookieadmin_load_consent_template($policy[$view], $view));
-        
-        $policy['set'] = $view;
-        $policy['admin_url'] = admin_url('admin-ajax.php');
-        $policy['cookieadmin_nonce'] = wp_create_nonce('cookieadmin_admin_js_nonce');
-        
-        $cookieadmin_requires_pro = self::is_feature_available(1);
-
-        echo '
-        <div class="cookieadmin_consent-wrap">
-            <form action="" method="post" id="consent_submenu">
-            
-            <div class="cookieadmin_consent-contents">
-                <div class="cookieadmin_consent_settings">
-                    <div class="cookieadmin-contents cookieadmin_consent">
-                    
-                        <div class="cookieadmin-setting">
-                            <label class="cookieadmin-title" for="cookieadmin_consent_type">'.esc_html__('Consent Type', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents">
-                                <select name="cookieadmin_consent_type" id="cookieadmin_consent_type">
-                                    <option name="cookieadmin_gdpr" id="cookieadmin_gdpr" value="cookieadmin_gdpr">'.esc_html__('GDPR', 'cookieadmin').'</option>
-                                    <option name="cookieadmin_us" id="cookieadmin_us" value="cookieadmin_us">'.esc_html__('US State Laws', 'cookieadmin').'</option>
-                                </select>
-                            </div>
-                        </div>
-                        
-                        <div class="cookieadmin-setting cookieadmin_consent-expiry">
-                            <label class="cookieadmin-title" for="cookieadmin_consent_expiry">'.esc_html__('Consent Expiry', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents">
-                                <input type="number" name="cookieadmin_days" id="cookieadmin_consent_expiry" style="max-width:70px;" value="'.esc_attr($policy[$view]['cookieadmin_days']).'">
-                            </div>
-                        </div>
-                        
-                        <div class="cookieadmin-setting consent-layout">
-                            <label class="cookieadmin-title">'.esc_html__('Notice Type', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents">
-                                <input name="cookieadmin_layout" type="radio" id="cookieadmin_layout_box" value="box">
-                                <label class="cookieadmin-input" for="cookieadmin_layout_box">'.esc_html__('Box', 'cookieadmin').'</label>
-                                <input name="cookieadmin_layout" type="radio" id="cookieadmin_layout_footer" value="footer">
-                                <label class="cookieadmin-input" for="cookieadmin_layout_footer">'.esc_html__('Footer', 'cookieadmin').'</label>
-                                <input name="cookieadmin_layout" type="radio" id="cookieadmin_layout_popup"  value="popup">
-                                <label for="cookieadmin_layout_popup">'.esc_html__('Popup', 'cookieadmin').'</label>
-                            </div>
-                        </div>
-                        
-                        <div class="cookieadmin-setting consent-position">
-                            <label class="cookieadmin-title">'.esc_html__('Notice Position', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents">
-                                <input class="cookieadmin_box_layout" id="cookieadmin_position_bottom_left" name="cookieadmin_position" type="radio" value="bottom_left" checked>
-                                <label class="cookieadmin_box_layout cookieadmin-input" for="cookieadmin_position_bottom_left">'.esc_html__('Bottom Left', 'cookieadmin').'</label>
-                                <input class="cookieadmin_box_layout" id="cookieadmin_position_bottom_right" name="cookieadmin_position" type="radio" value="bottom_right">
-                                <label class="cookieadmin_box_layout cookieadmin-input" for="cookieadmin_position_bottom_right">'.esc_html__('Bottom Right', 'cookieadmin').'</label>
-                                <input class="cookieadmin_box_layout" id="cookieadmin_position_top_left" name="cookieadmin_position" type="radio" value="top_left">
-                                <label class="cookieadmin_box_layout cookieadmin-input" for="cookieadmin_position_top_left">'.esc_html__('Top Left', 'cookieadmin').'</label>
-                                <input class="cookieadmin_box_layout" id="cookieadmin_position_top_right" name="cookieadmin_position" type="radio" value="top_right">
-                                <label class="cookieadmin_box_layout cookieadmin-input" for="cookieadmin_position_top_right">'.esc_html__('Top Right', 'cookieadmin').'</label>
-                                <input class="cookieadmin_foter_layout" id="cookieadmin_position_top" name="cookieadmin_position" type="radio" value="top" style="display:none;">
-                                <label class="cookieadmin_foter_layout cookieadmin-input" for="cookieadmin_position_top" style="display:none;">'.esc_html__('Top', 'cookieadmin').'</label>
-                                <input class="cookieadmin_foter_layout" id="cookieadmin_position_bottom" name="cookieadmin_position" type="radio" value="bottom" style="display:none;">
-                                <label class="cookieadmin_foter_layout" for="cookieadmin_position_bottom" style="display:none;">'.esc_html__('Bottom', 'cookieadmin').'</label>
-                            </div>
-                        </div>
-                        
-                        <div class="cookieadmin-setting consent-modal-layout">
-                            <label class="cookieadmin-title">'.esc_html__('Preference Position', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents">
-                                <input id="cookieadmin_modal_center" name="cookieadmin_modal" type="radio" value="center" checked>
-                                <label class="cookieadmin-input" for="cookieadmin_modal_center">'.esc_html__('Center', 'cookieadmin').'</label>
-                                <input id="cookieadmin_modal_side" name="cookieadmin_modal" type="radio" value="side">
-                                <label class="cookieadmin-input" for="cookieadmin_modal_side">'.esc_html__('Side', 'cookieadmin').'</label>
-                                <input id="cookieadmin_modal_down" name="cookieadmin_modal" type="radio" value="down">
-                                <label for="cookieadmin_modal_down">'.esc_html__('Draw down', 'cookieadmin').'</label>
-                            </div>
-                        </div>
-                        
-                        <div class="cookieadmin-setting consent-notice">
-                            <label class="cookieadmin-title">'.esc_html__('Notice Section', 'cookieadmin').'</label>
-                            <div class="cookieadmin-setting-contents cookieadmin-vertical">
-                                <label for="cookieadmin_notice_title_layout">'.esc_html__('Title', 'cookieadmin').'</label>
-                                <input type="text" id="cookieadmin_notice_title_layout" name="cookieadmin_notice_title" style="width: 270px;" value="'.esc_attr($policy[$view]['cookieadmin_notice_title']).'">
-                                <label for="cookieadmin_notice_layout" style="margin-top:20px;">'.esc_html__('Notice', 'cookieadmin').'</label>
-                                <textarea rows="5vh" cols="100vw" id="cookieadmin_notice_layout" name="cookieadmin_notice">'.esc_html($policy[$view]['cookieadmin_notice']).'</textarea>
-                                <div class="cookieadmin-setting-colors cookieadmin-setting-contents cookieadmin-horizontal">
-                                    <div class="cookieadmin-setting-color cookieadmin-vertical" >
-                                        <label for="cookieadmin_notice_title_color">'.esc_html__('Title', 'cookieadmin').'</label>
-                                        <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                            <input type="color" id="cookieadmin_notice_title_color_box" name="cookieadmin_notice_title_color_box" value="'.esc_attr($policy[$view]['cookieadmin_notice_title_color']).'">
-                                            <input type="text" id="cookieadmin_notice_title_color" name="cookieadmin_notice_title_color" value="'.esc_attr($policy[$view]['cookieadmin_notice_title_color']).'" class="cookieadmin-color-input">
-                                        </div>
-                                    </div>
-                                    <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                        <label for="cookieadmin_notice_color">'.esc_html__('Content', 'cookieadmin').'</label>
-                                        <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                            <input type="color" id="cookieadmin_notice_color_box" name="cookieadmin_notice_color_box" value="'.esc_attr($policy[$view]['cookieadmin_notice_color']).'">
-                                            <input type="text" id="cookieadmin_notice_color" name="cookieadmin_notice_color" value="'.esc_attr($policy[$view]['cookieadmin_notice_color']).'" class="cookieadmin-color-input">
-                                        </div>
-                                    </div>
-                                    <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                        <label for="cookieadmin_consent_inside_bg_color">'.esc_html__('Background', 'cookieadmin').'</label>
-                                        <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                            <input type="color" id="cookieadmin_consent_inside_bg_color_box" name="cookieadmin_consent_inside_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_consent_inside_bg_color']).'">
-                                            <input type="text" id="cookieadmin_consent_inside_bg_color" name="cookieadmin_consent_inside_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_consent_inside_bg_color']).'" class="cookieadmin-color-input">
-                                        </div>
-                                    </div>
-                                    <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                        <label for="cookieadmin_consent_inside_border_color">'.esc_html__('Border', 'cookieadmin').'</label>
-                                        <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                            <input type="color" id="cookieadmin_consent_inside_border_color_box" name="cookieadmin_consent_inside_border_color_box" value="'.esc_attr($policy[$view]['cookieadmin_consent_inside_border_color']).'">
-                                            <input type="text" id="cookieadmin_consent_inside_border_color" name="cookieadmin_consent_inside_border_color" value="'.esc_attr($policy[$view]['cookieadmin_consent_inside_border_color']).'" class="cookieadmin-color-input">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="cookieadmin-setting">
-                        <label class="cookieadmin-title">'.esc_html__('Buttons', 'cookieadmin').'</label>
-                        <div class="cookieadmin-buttons cookieadmin-setting-contents cookieadmin-horizontal">
-                            <div class="cookieadmin-button cookieadmin-vertical">
-                                <input id="cookieadmin_customize_btn" name="cookieadmin_customize_btn" style="max-width:130px;text-align:center;" value="'.esc_attr($policy[$view]['cookieadmin_customize_btn']).'">
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_customize_btn_color_box" name="cookieadmin_customize_btn_color_box" value="'.esc_attr($policy[$view]['cookieadmin_customize_btn_color']).'">
-                                    <input type="text" id="cookieadmin_customize_btn_color" name="cookieadmin_customize_btn_color" value="'.esc_attr($policy[$view]['cookieadmin_customize_btn_color']).'" class="cookieadmin-color-input">
-                                </div>
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_customize_btn_bg_color_box" name="cookieadmin_customize_btn_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_customize_btn_bg_color']).'">
-                                    <input type="text" id="cookieadmin_customize_btn_bg_color" name="cookieadmin_customize_btn_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_customize_btn_bg_color']).'" class="cookieadmin-color-input">
-                                </div>
-                            </div>
-                            <div class="cookieadmin-button cookieadmin-vertical">
-                                <input id="cookieadmin_reject_btn" name="cookieadmin_reject_btn" style="max-width:130px;text-align:center;" value="'.esc_attr($policy[$view]['cookieadmin_reject_btn']).'">
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_reject_btn_color_box" name="cookieadmin_reject_btn_color_box" value="'.esc_attr($policy[$view]['cookieadmin_reject_btn_color']).'">
-                                    <input type="text" id="cookieadmin_reject_btn_color" name="cookieadmin_reject_btn_color" value="'.esc_attr($policy[$view]['cookieadmin_reject_btn_color']).'" class="cookieadmin-color-input">
-                                </div>
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_reject_btn_bg_color_box" name="cookieadmin_reject_btn_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_reject_btn_bg_color']).'">
-                                    <input type="text" id="cookieadmin_reject_btn_bg_color" name="cookieadmin_reject_btn_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_reject_btn_bg_color']).'" class="cookieadmin-color-input">
-                                </div>
-                            </div>
-                            <div class="cookieadmin-button cookieadmin-vertical">
-                                <input id="cookieadmin_accept_btn" name="cookieadmin_accept_btn" style="max-width:130px;text-align:center;" value="'.esc_attr($policy[$view]['cookieadmin_accept_btn']).'">
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_accept_btn_color_box" name="cookieadmin_accept_btn_color_box" value="'.esc_attr($policy[$view]['cookieadmin_accept_btn_color']).'">
-                                    <input type="text" id="cookieadmin_accept_btn_color" name="cookieadmin_accept_btn_color" value="'.esc_attr($policy[$view]['cookieadmin_accept_btn_color']).'" class="cookieadmin-color-input">
-                                </div>
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_accept_btn_bg_color_box" name="cookieadmin_accept_btn_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_accept_btn_bg_color']).'">
-                                    <input type="text" id="cookieadmin_accept_btn_bg_color" name="cookieadmin_accept_btn_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_accept_btn_bg_color']).'" class="cookieadmin-color-input">
-                                </div>
-                            </div>
-                            <div class="cookieadmin-button cookieadmin-vertical">
-                                <input id="cookieadmin_save_btn" name="cookieadmin_save_btn" style="max-width:130px;text-align:center;" value="'.esc_attr($policy[$view]['cookieadmin_save_btn']).'">
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_save_btn_color_box" name="cookieadmin_save_btn_color_box" value="'.esc_attr($policy[$view]['cookieadmin_save_btn_color']).'">
-                                    <input type="text" id="cookieadmin_save_btn_color" name="cookieadmin_save_btn_color" value="'.esc_attr($policy[$view]['cookieadmin_save_btn_color']).'" class="cookieadmin-color-input">
-                                </div>
-                                <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                    <input type="color" id="cookieadmin_save_btn_bg_color_box" name="cookieadmin_save_btn_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_save_btn_bg_color']).'">
-                                    <input type="text" id="cookieadmin_save_btn_bg_color" name="cookieadmin_save_btn_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_save_btn_bg_color']).'" class="cookieadmin-color-input">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="cookieadmin-setting consent-preference">
-                        <label class="cookieadmin-title">'.esc_html__('Preference Section', 'cookieadmin').'</label>
-                        <div class="cookieadmin-setting-contents cookieadmin-vertical">
-                            <label for="cookieadmin_preference_title_layout">'.esc_html__('Title', 'cookieadmin').'</label>
-                            <input type="text" id="cookieadmin_preference_title_layout" name="cookieadmin_preference_title" style="width: 270px;" value="'.esc_html($policy[$view]['cookieadmin_preference_title']).'">
-                            <label for="cookieadmin_preference_layout" style="margin-top:20px;">'.esc_html__('Privacy Notice', 'cookieadmin').'</label>
-                            <textarea rows="8vh" cols="100vw" id="cookieadmin_preference_layout" name="cookieadmin_preference">'.esc_html($policy[$view]['cookieadmin_preference']).'</textarea>
-                            <div class="cookieadmin-setting-colors cookieadmin-setting-contents cookieadmin-setting-color cookieadmin-horizontal">
-                                <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                    <label for="cookieadmin_preference_title_color">'.esc_html__('Title', 'cookieadmin').'</label>
-                                    <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                        <input type="color" id="cookieadmin_preference_title_color_box" name="cookieadmin_preference_title_color_box" value="'.esc_attr($policy[$view]['cookieadmin_preference_title_color']).'">
-                                        <input type="text" id="cookieadmin_preference_title_color" name="cookieadmin_preference_title_color" value="'.esc_attr($policy[$view]['cookieadmin_preference_title_color']).'" class="cookieadmin-color-input">
-                                    </div>
-                                </div>
-                                <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                    <label for="cookieadmin_details_wrapper_color">'.esc_html__('Content', 'cookieadmin').'</label>
-                                    <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                        <input type="color" id="cookieadmin_details_wrapper_color_box" name="cookieadmin_details_wrapper_color_box" value="'.esc_attr($policy[$view]['cookieadmin_details_wrapper_color']).'">
-                                        <input type="text" id="cookieadmin_details_wrapper_color" name="cookieadmin_details_wrapper_color" value="'.esc_attr($policy[$view]['cookieadmin_details_wrapper_color']).'" class="cookieadmin-color-input">
-                                    </div>
-                                </div>
-                                <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                    <label for="cookieadmin_cookie_modal_bg_color">'.esc_html__('Background', 'cookieadmin').'</label>
-                                    <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                        <input type="color" id="cookieadmin_cookie_modal_bg_color_box" name="cookieadmin_cookie_modal_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_cookie_modal_bg_color']).'">
-                                        <input type="text" id="cookieadmin_cookie_modal_bg_color" name="cookieadmin_cookie_modal_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_cookie_modal_bg_color']).'" class="cookieadmin-color-input">
-                                    </div>
-                                </div>
-                                <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                    <label for="cookieadmin_cookie_modal_border_color">'.esc_html__('Border', 'cookieadmin').'</label>
-                                    <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                        <input type="color" id="cookieadmin_cookie_modal_border_color_box" name="cookieadmin_cookie_modal_border_color_box" value="'.esc_attr($policy[$view]['cookieadmin_cookie_modal_border_color']).'">
-                                        <input type="text" id="cookieadmin_cookie_modal_border_color" name="cookieadmin_cookie_modal_border_color" value="'.esc_attr($policy[$view]['cookieadmin_cookie_modal_border_color']).'" class="cookieadmin-color-input">
-                                    </div>
-                                </div>
-                            </div>
-                            
-                            <div class="cookieadmin-setting-colors cookieadmin-setting-contents cookieadmin-setting-color cookieadmin-horizontal" cookieadmin-pro-only="1">
-                                <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                    <label for="cookieadmin_links_color">'.esc_html__('Links', 'cookieadmin').wp_kses_post($cookieadmin_requires_pro).'</label>
-                                    <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                        <input type="color" id="cookieadmin_links_color_box" name="cookieadmin_links_color_box" value="'.esc_attr($policy[$view]['cookieadmin_links_color']).'">
-                                        <input type="text" id="cookieadmin_links_color" name="cookieadmin_links_color" value="'.esc_attr($policy[$view]['cookieadmin_links_color']).'" class="cookieadmin-color-input">
-                                    </div>
-                                </div>
-                                <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                    <label for="cookieadmin_slider_on_bg_color">'.esc_html__('Button Switch On', 'cookieadmin').wp_kses_post($cookieadmin_requires_pro).'</label>
-                                    <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                        <input type="color" id="cookieadmin_slider_on_bg_color_box" name="cookieadmin_slider_on_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_slider_on_bg_color']).'">
-                                        <input type="text" id="cookieadmin_slider_on_bg_color" name="cookieadmin_slider_on_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_slider_on_bg_color']).'" class="cookieadmin-color-input">
-                                    </div>
-                                </div>
-                                <div class="cookieadmin-setting-color cookieadmin-vertical">
-                                    <label for="cookieadmin_slider_off_bg_color">'.esc_html__('Button Switch Off', 'cookieadmin').wp_kses_post($cookieadmin_requires_pro).'</label>
-                                    <div class="cookieadmin-color-holder cookieadmin-horizontal">
-                                        <input type="color" id="cookieadmin_slider_off_bg_color_box" name="cookieadmin_slider_off_bg_color_box" value="'.esc_attr($policy[$view]['cookieadmin_slider_off_bg_color']).'">
-                                        <input type="text" id="cookieadmin_slider_off_bg_color" name="cookieadmin_slider_off_bg_color" value="'.esc_attr($policy[$view]['cookieadmin_slider_off_bg_color']).'" class="cookieadmin-color-input">
-                                    </div>
-                                </div>
-                            </div>
-                            
-                            <span style="margin-top:30px;">
-                            
-                            <input type="submit" name="cookieadmin_save_settings" class="cookieadmin-btn cookieadmin-btn-primary action" value="'.esc_html__('Save Settings', 'cookieadmin').'">
-                            
-                            <input type="button" id="cookieadmin_show_preview" name="cookieadmin_show_preview" class="cookieadmin-btn cookieadmin-btn-secondary" value="'.esc_html__('Show Preview', 'cookieadmin').'">
-                            
-                            </span>
-                            
-                        </div>
-                    </div>
-                </div>
-            </div>
-            ';  
-            wp_nonce_field('cookieadmin_admin_nonce', 'cookieadmin_security');
-            echo '<br/>
-            <br/>
-            </form>
-        </div>';
-        self::footer_theme();
-        
-        $allowed_tags = cookieadmin_kses_allowed_html();
-        echo wp_kses($templates, $allowed_tags);
-    }
-
-    static function cookieadmin_scan_cookies($url = ''){
-        global $wpdb;
-        
-        $urls = array(get_site_url());
-        
-        if(cookieadmin_is_pro()){
-            $cookieData = apply_filters('cookieadmin_pro_scan_cookies', $urls);
-        }else{
-            $cookieData = \CookieAdmin\Scanner::start_scan($urls);
-        }
-        // cookieadmin_r_print($cookieData);
-        
-        if(!empty($cookieData) && self::save_raw_scan_results($cookieData)){
-            self::cookieadmin_auto_configure_cookies();
-        }
-        
-        wp_send_json_error(array('message' =>__('No cookies found!', 'cookieadmin')));
-    }
-
-    static function cookieadmin_table_exists($table_name) {
-        global $wpdb;
-        
-        $query = $wpdb->prepare("SHOW TABLES LIKE %s", $table_name);
-        
-        return $wpdb->get_var($query) === $table_name;
-    }
-    
-    static function cookieadmin_save_settings(){
-        
-        global $cookieadmin_lang, $cookieadmin_error, $cookieadmin_msg, $cookieadmin_settings, $cookieadmin_policies;
-    
-        // debug_print_backtrace();die;
-        
-        check_admin_referer('cookieadmin_admin_nonce', 'cookieadmin_security');
-     
-        if(!current_user_can('administrator')){
-            wp_send_json_error(array('message' => __('Sorry, but you do not have permissions to perform this action', 'cookieadmin')));
-        }
-        
-        $policy = cookieadmin_load_policy();
-        
-        $cookieadmin_consent_type = isset( $_REQUEST['cookieadmin_consent_type'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['cookieadmin_consent_type'] ) ) : '';
-
-        if(!empty($cookieadmin_consent_type)){
-            
-            $laws = array('cookieadmin_gdpr' => '', 'cookieadmin_us' => '');
-            
-            $law = array_key_exists($cookieadmin_consent_type, $laws) ? $cookieadmin_consent_type : 'cookieadmin_gdpr';
-            
-            if(empty($cookieadmin_error)){
-                update_option('cookieadmin_law', $law);
-            }
-        }
-
-        if(isset($_REQUEST['page']) && $_REQUEST['page'] === 'cookieadmin-settings'){
-            
-            // Save cookieadmin_settings only on settings page
-            $cookieadmin_settings['google_consent_mode_v2'] = (isset( $_REQUEST['cookieadmin_google_consent_mode_v2'] ) ? 1 : 0);
-            $cookieadmin_settings['hide_powered_by'] = (isset( $_REQUEST['cookieadmin_hide_powered_by'] ) ? 1 : 0);
-            $cookieadmin_settings['hide_reconsent'] = (isset( $_REQUEST['cookieadmin_hide_reconsent'] ) ? 1 : 0);
-            
-            if(empty($cookieadmin_error)){
-                update_option('cookieadmin_settings', $cookieadmin_settings);
-            }
-            
-            // get the consent type from option table, if not saved then return default as 'gdpr'
-            $law = get_option('cookieadmin_law', 'cookieadmin_gdpr');
-
-            //set preload and consent field for "cookieadmin-settings" page
-            $setting['preload'] = !empty($_REQUEST['cookieadmin_preload']) ? array_map('sanitize_text_field', wp_unslash($_REQUEST['cookieadmin_preload'])) : [];
-            $setting['reload_on_consent'] = !empty($_REQUEST['cookieadmin_reload_on_consent']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_reload_on_consent'])) : '';
-        }else{
-            // set saved or default preload and consent field for for  "cookieadmin-consent" page
-            $setting['preload'] = !empty($policy[$law]['preload']) ? $policy[$law]['preload'] : [];
-            $setting['reload_on_consent'] = !empty($policy[$law]['reload_on_consent']) ? $policy[$law]['reload_on_consent'] : '';
-        }
-            
-        $setting['cookieadmin_geo_tgt'] = (!empty($_REQUEST['cookieadmin_geo_tgt'])) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_geo_tgt'])) : 'www';
-        
-        $setting['cookieadmin_layout'] = (!empty($_REQUEST['cookieadmin_layout']) && in_array($_REQUEST['cookieadmin_layout'], array('box', 'footer', 'popup'))) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_layout'])) : (!empty($policy[$law]['cookieadmin_layout']) ? $policy[$law]['cookieadmin_layout'] : 'box');
-        
-        $setting['cookieadmin_position'] = (!empty($_REQUEST['cookieadmin_position']) && in_array($_REQUEST['cookieadmin_position'],  array('bottom_left', 'bottom_right', 'top_left', 'top_right', 'top', 'bottom'))) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_position'])) : (!empty($policy[$law]['cookieadmin_position']) ? $policy[$law]['cookieadmin_position'] : 'bottom_left');
-
-        $setting['cookieadmin_modal'] = (isset($_REQUEST['cookieadmin_modal']) && in_array($_REQUEST['cookieadmin_modal'], array('center', 'side', 'down'))) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_modal'])) : (!empty($policy[$law]['cookieadmin_modal']) ? $policy[$law]['cookieadmin_modal'] : 'center');
-        
-        if($setting['cookieadmin_layout'] == 'popup'){
-            $setting['cookieadmin_modal'] = 'center';
-            unset($setting['cookieadmin_position']);
-        }       
-
-        $setting['cookieadmin_notice_title'] = !empty($_REQUEST['cookieadmin_notice_title']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_notice_title'])) : $policy[$law]['cookieadmin_notice_title'];
-        $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');
-        
-        $setting['cookieadmin_notice'] = !empty($_REQUEST['cookieadmin_notice']) ? wp_kses(wp_unslash($_REQUEST['cookieadmin_notice']), cookieadmin_kses_allowed_html()) : $policy[$law]['cookieadmin_notice'];
-        $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');
-        
-        $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');
-        $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');
-        
-        $setting['cookieadmin_customize_btn'] = !empty($_REQUEST['cookieadmin_customize_btn']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_customize_btn'])) : (!empty($policy[$law]['cookieadmin_customize_btn']) ? $policy[$law]['cookieadmin_customize_btn'] : 'Customize');
-        $setting['cookieadmin_customize_btn_color'] = !empty($_REQUEST['cookieadmin_customize_btn_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_customize_btn_color'])) : (!empty($policy[$law]['cookieadmin_customize_btn_color']) ? $policy[$law]['cookieadmin_customize_btn_color'] : '#ffffff');
-        $setting['cookieadmin_customize_btn_bg_color'] = !empty($_REQUEST['cookieadmin_customize_btn_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_customize_btn_bg_color'])) : (!empty($policy[$law]['cookieadmin_customize_btn_bg_color']) ? $policy[$law]['cookieadmin_customize_btn_bg_color'] : '#0000ff');
-        
-        $setting['cookieadmin_reject_btn'] = !empty($_REQUEST['cookieadmin_reject_btn']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_reject_btn'])) : (!empty($policy[$law]['cookieadmin_reject_btn']) ? $policy[$law]['cookieadmin_reject_btn'] : 'Reject All');
-        $setting['cookieadmin_reject_btn_color'] = !empty($_REQUEST['cookieadmin_reject_btn_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_reject_btn_color'])) : (!empty($policy[$law]['cookieadmin_reject_btn_color']) ? $policy[$law]['cookieadmin_reject_btn_color'] : '#ffffff');
-        $setting['cookieadmin_reject_btn_bg_color'] = !empty($_REQUEST['cookieadmin_reject_btn_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_reject_btn_bg_color'])) : (!empty($policy[$law]['cookieadmin_reject_btn_bg_color']) ? $policy[$law]['cookieadmin_reject_btn_bg_color'] : '#ff0000');
-
-        $setting['cookieadmin_accept_btn'] = !empty($_REQUEST['cookieadmin_accept_btn']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_accept_btn'])) : (!empty($policy[$law]['cookieadmin_accept_btn']) ? $policy[$law]['cookieadmin_accept_btn'] : 'Accept All');
-        $setting['cookieadmin_accept_btn_color'] = !empty($_REQUEST['cookieadmin_accept_btn_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_accept_btn_color'])) : (!empty($policy[$law]['cookieadmin_accept_btn']) ? $policy[$law]['cookieadmin_accept_btn_color'] : '#ffffff');
-        $setting['cookieadmin_accept_btn_bg_color'] = !empty($_REQUEST['cookieadmin_accept_btn_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_accept_btn_bg_color'])) : (!empty($policy[$law]['cookieadmin_accept_btn_bg_color']) ? $policy[$law]['cookieadmin_accept_btn_bg_color'] : '#00ff00');
-
-        $setting['cookieadmin_save_btn'] = !empty($_REQUEST['cookieadmin_save_btn']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_save_btn'])) : (!empty($policy[$law]['cookieadmin_save_btn']) ? $policy[$law]['cookieadmin_save_btn'] : 'Save Preferences');
-        $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');
-        $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');
-
-        $setting['cookieadmin_preference_title'] = !empty($_REQUEST['cookieadmin_preference_title']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_preference_title'])) : $policy[$law]['cookieadmin_preference_title'];
-        $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');
-        
-        $setting['cookieadmin_preference'] = !empty($_REQUEST['cookieadmin_preference']) ? wp_kses(wp_unslash($_REQUEST['cookieadmin_preference']), cookieadmin_kses_allowed_html()) : $policy[$law]['cookieadmin_preference'];
-        $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');
-        
-        $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');
-        $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');
-
-        $setting['cookieadmin_slider_off_bg_color'] = !empty($_REQUEST['cookieadmin_slider_off_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_slider_off_bg_color'])) : (!empty($policy[$law]['cookieadmin_slider_off_bg_color']) ? $policy[$law]['cookieadmin_slider_off_bg_color'] : '#808080');
-        $setting['cookieadmin_slider_on_bg_color'] = !empty($_REQUEST['cookieadmin_slider_on_bg_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_slider_on_bg_color'])) : (!empty($policy[$law]['cookieadmin_slider_on_bg_color']) ? $policy[$law]['cookieadmin_slider_on_bg_color'] : '#3582c4');
-        $setting['cookieadmin_links_color'] = !empty($_REQUEST['cookieadmin_links_color']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_links_color'])) : (!empty($policy[$law]['cookieadmin_links_color']) ? $policy[$law]['cookieadmin_links_color'] : '#1863dc');
-        
-        $setting['cookieadmin_days'] = !empty($_REQUEST['cookieadmin_days']) ? sanitize_text_field(wp_unslash($_REQUEST['cookieadmin_days'])) : (!empty($policy[$law]['cookieadmin_days']) ? $policy[$law]['cookieadmin_days'] : '365');
-        
-        $policy[$law] = $setting;
-        
-        // Check for certain fields to be saved only if their values is not the same as default
-        $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');
-        
-        foreach($cookieadmin_check_changes as $c_field){
-            foreach($policy as $c_law => $c_val){
-                if(!empty($c_val[$c_field]) && $c_val[$c_field] == $cookieadmin_policies[$c_law][$c_field]){
-                    unset($policy[$c_law][$c_field]);
-                }
-            }
-        }
-        
-        update_option('cookieadmin_consent_settings', $policy);
-        
-        if(empty($cookieadmin_error)){
-            $cookieadmin_msg = __('Settings saved successfully', 'cookieadmin');
-        }
-    }
-    
-    
-    static function cookieadmin_auto_configure_cookies(){
-        global $wpdb;
-        
-        $table_name = esc_sql($wpdb->prefix . 'cookieadmin_cookies');
-        $categorized_cookies = [];
-        $uncategorized_cookies = [];
-        
-        $all_cookies = $wpdb->get_results("SELECT cookie_name, category FROM {$table_name}");
-        
-        foreach($all_cookies as $cookie){
-            
-            if(!empty($cookie->categorized)){
-                $categorized_cookies[] = $cookie->cookie_name;
-            }else{
-                $uncategorized_cookies[] = $cookie->cookie_name;
-            }
-        }
-        
-        if(!empty($uncategorized_cookies)){
-            
-            $uncategorized_cookies = array_flip($uncategorized_cookies);
-            $categorized_cookies = array_flip($categorized_cookies);
-            
-            
-            $categorizd_cookies = \CookieAdmin\CookieCategorizer::categorize_cookies($uncategorized_cookies, $categorized_cookies);
-            
-            $remove_cookies = $categorizd_cookies['remove_cookies'];
-            unset($categorizd_cookies['remove_cookies']);
-            if(!empty($remove_cookies)){
-                $placeholders = implode(',', array_fill(0, count($remove_cookies), '%s'));
-                $sql = $wpdb->prepare("DELETE FROM {$table_name} WHERE raw_name IN ({$placeholders})", ...$remove_cookies);
-                $wpdb->query($sql);
-            }           
-            
-            foreach($categorizd_cookies as $cookie_data){
-            
-                $wpdb->update(
-                    $table_name,
-                    [ 'cookie_name' => $cookie_data['cookie_name'], 'category' =>  $cookie_data['category'], 'description' =>  $cookie_data['description'], 'edited' =>  1, 'patterns' =>  $cookie_data['patterns'] ], // Data to update
-                    [ 'raw_name' => $cookie_data['raw_name'] ], // WHERE 
-                    [ '%s', '%s', '%s', '%d', '%s' ], // Format for the data
-                    [ '%s' ]  // Format for the WHERE clause
-                );
-                
-            }
-            
-            $categorized_cookies = $wpdb->get_results("SELECT id, cookie_name, category, expires, description FROM {$table_name}");
-            
-            wp_send_json_success($categorized_cookies);
-        }
-        wp_send_json(['success' => true,
-                    'data'    => null,
-                    'message'   => __('No cookies to categorize!', 'cookieadmin')]);
-    }
-    
-    static function cookieadmin_edit_cookies(){
-        global $wpdb;
-        
-        $table_name = esc_sql($wpdb->prefix . 'cookieadmin_cookies');
-        
-        if(!empty($_REQUEST['cookie_info'])) {
-            
-            $cookie_info = wp_unslash($_REQUEST['cookie_info']);
-            
-            $resp = $wpdb->update(
-                    $table_name,
-                    [ 'cookie_name' => sanitize_text_field($cookie_info['name']), 'description' =>  sanitize_text_field($cookie_info['description']), 'expires' =>  sanitize_text_field($cookie_info['duration']), 'category' =>  sanitize_text_field($cookie_info['type']), 'edited' => 1], // Data to update
-                    [ 'id' => sanitize_text_field($cookie_info['id']) ], // WHERE 
-                    [ '%s', '%s', '%s', '%s', '%d' ], // Format for the data
-                    [ '%d' ]  // Format for the WHERE clause
-                );
-            
-        }elseif( !empty($_REQUEST['cookie_raw_id']) ){
-            
-            $cookie_id = (int) sanitize_text_field(wp_unslash($_REQUEST['cookie_raw_id']));
-            
-            $resp = $wpdb->delete( $table_name, ['id' => $cookie_id], [ '%s' ] );
-        }
-        
-        if ($wpdb->last_error || $resp === false) {
-            //error_log('DB Error: ' . $wpdb->last_error); // Log it
-            wp_send_json(['success' => true,
-                'data'    => null,
-                'message'   => __('Error editing cookie, Error: ', 'cookieadmin') . esc_html($wpdb->last_error)]);
-        }
-        
-        wp_send_json_success(__('Cookie updated!', 'cookieadmin'));
-        
-    }
-
-    static function save_raw_scan_results(array $found_cookies){
-
-        global $wpdb;
-        
-        $table_name = esc_sql($wpdb->prefix . 'cookieadmin_cookies');
-
-        if (empty($found_cookies)) {
-            return ['inserted' => 0, 'updated' => 0];
-        }
-
-        // Step 1: Fetch all existing cookie names from our database in one efficient query.
-        $existing_cookies_in_db = $wpdb->get_col("SELECT cookie_name FROM {$table_name}");
-        // Use array_flip for very fast 'isset' lookups instead of slow 'in_array' in a loop.
-        $existing_cookies_lookup = !empty($existing_cookies_in_db) ? array_flip($existing_cookies_in_db) : [];
-
-        $results = ['inserted' => 0, 'updated' => 0];
-
-        // Step 2: Loop through each cookie found by the scanner.
-        foreach ($found_cookies as $cookie_name => $cookie_data) {
-
-            // Step 3: Check if the cookie exists in our DB.
-            if (isset($existing_cookies_lookup[$cookie_name])) {
-                
-                $wpdb->update(
-                    $table_name,
-                    [ 'scan_timestamp' => time() ], // Data to update
-                    [ 'cookie_name' => $cookie_name ], // WHERE clause
-                    [ '%s' ], // Format for the data
-                    [ '%s' ]  // Format for the WHERE clause
-                );
-                $results['updated']++;
-
-            } else {
-
-                // ------ INSERT a NEW cookie ------
-                $data = [
-                    'cookie_name' => sanitize_text_field($cookie_name),
-                    'domain' => sanitize_text_field($cookie_data['domain']),
-                    'path' => sanitize_text_field($cookie_data['path']),
-                    'expires' => !empty($cookie_data['expires']) ? $cookie_data['expires'] : null,
-                    'max_age' => $cookie_data['Max-Age'] ? $cookie_data['Max-Age'] : null,
-                    'samesite' => !empty($cookie_data['samesite']) ? sanitize_text_field($cookie_data['samesite']) : null,
-                    'secure' => (int)($cookie_data['secure'] ?? 0),
-                    'httponly' => (int)($cookie_data['httponly'] ?? 0),
-                    'raw_name' => sanitize_text_field($cookie_name),
-                    'scan_timestamp' => time(),
-                ];
-
-                $formats = ['%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%s'];
-
-                if ($wpdb->insert($table_name, $data, $formats)) {
-                    $results['inserted']++;
-                } else {
-                    //error_log("CookieAdmin: Error inserting cookie data: " . $wpdb->last_error);
-                }
-            }
-        }
-        return $results;
+        
+        wp_register_script('cookieadmin-consent-purge-notice', '', ['jquery'], '', true);
+        wp_enqueue_script('cookieadmin-consent-purge-notice');
+        wp_add_inline_script('cookieadmin-consent-purge-notice', 'jQuery("#cookieadmin-consent-purge-notice").on("click",
+        function(e){
+            
+            let target = jQuery(e.target);
+            if(!target.hasClass("notice-dismiss")){
+                return;
+            }
+            
+            var data;
+
+            // Hide it
+            jQuery("#cookieadmin-consent-purge-notice").remove();
+
+            // Save this preference
+            jQuery.post("'.admin_url('admin-ajax.php?action=cookieadmin_ajax_handler&cookieadmin_act=close-notice&notice=cookieadmin-consent-purge-notice').'&cookieadmin_security='.wp_create_nonce('cookieadmin_admin_js_nonce').'", data, function(response) {
+            });
+            
+        });');
+        
+    }
+    
+    static function close_notices(){
+        
+        if(empty($_REQUEST['notice'])){
+            return;
+        }
+        
+        $notice = sanitize_text_field(wp_unslash($_REQUEST['notice']));
+        $notice = str_replace('-notice', '', $notice);
+        $notice = str_replace('-', '_', $notice);
+        
+        update_option($notice, array());
     }
     
@@ -1106 +382 @@
         }
         
-        $msg = ' <sup style="font-size:11px;"><a href="'.COOKIEADMIN_PRO_URL.'" target="_blank" style="text-decoration:none; color:red;"><b>'.__('Pro', 'cookieadmin').'</b></a></sup>';
+        $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>';
         
         if(!empty($return)){

cookieadmin/trunk/includes/cookiecategorizer.php

@@ -15 +15 @@
      * @return array The enriched list of cookies.
      */
-    static function categorize_cookies(array $found_cookies, array $categorized_cookies) {
+    static function categorize_cookies($found_cookies, $categorized_cookies) {
         if (empty($found_cookies)) {
             return [];
@@ -36 +36 @@
 
 
-    static function generate_query_prefixes(array $cookie_names): array {
+    static function generate_query_prefixes($cookie_names){
         $prefixes = [];
         foreach ($cookie_names as $name) {
@@ -55 +55 @@
 
 
-    static function fetch_candidates_from_db(array $prefixes): array {
+    static function fetch_candidates_from_db($prefixes){
     
         if (empty($prefixes)) {
@@ -71 +71 @@
 
 
-    static function match_and_enrich_cookies(array $found_cookies, array $db_candidates, array $old_categorized_cookies): array {
+    static function match_and_enrich_cookies($found_cookies, $db_candidates, $old_categorized_cookies){
         $categorized_cookies = [];
-        $old_categorized_cookies = [];
         $remove_cookies = [];
 
@@ -103 +102 @@
             
             if (!empty($best_match)) {
-            
-                if(!empty($old_categorized_cookies) && array_key_exists($best_match['cookie_name'], $old_categorized_cookies)){
-                    $remove_cookies[] = $scanned_name;
-                    continue;
+                
+                $cookie_name = $best_match['cookie_name'];
+                
+                if(!empty($old_categorized_cookies) && array_key_exists($cookie_name, $old_categorized_cookies)){
+                    $remove_cookies[] = $old_categorized_cookies[$cookie_name];
                 }
 
-                $cookie_name = $best_match['cookie_name'];
-                $categorized_cookies[$cookie_name]['cookie_name'] = $cookie_name;
-                $categorized_cookies[$cookie_name]['raw_name'] = $scanned_name;
+                $categorized_cookies[$cookie_name]['cookie_name'] = $cookie_name;
+                $categorized_cookies[$cookie_name]['raw_name'] = $scanned_name;
                 $categorized_cookies[$cookie_name]['category'] = $best_match['category'];
                 $categorized_cookies[$cookie_name]['description'] = $best_match['description'];

cookieadmin/trunk/includes/enduser.php

@@ -25 +25 @@
             wp_enqueue_style('cookieadmin-style', COOKIEADMIN_PLUGIN_URL . 'assets/css/consent.css', [], COOKIEADMIN_VERSION);
             
-            wp_enqueue_script('cookieadmin_js', COOKIEADMIN_PLUGIN_URL . 'assets/js/consent.js', [], COOKIEADMIN_VERSION, 'async');
+            wp_enqueue_script('cookieadmin_js', COOKIEADMIN_PLUGIN_URL . 'assets/js/consent.js', [], COOKIEADMIN_VERSION);
         
             $policy[$view]['ajax_url'] = admin_url('admin-ajax.php');
@@ -41 +41 @@
             $policy[$view]['base_path'] = $base_path;
             
-            $policy[$view]['lang']['show_more'] = __('show more', 'cookieadmin');
-            $policy[$view]['lang']['show_less'] = __('show less', 'cookieadmin');
+            $policy[$view]['lang']['show_less'] = __('Show less', 'cookieadmin');
             $policy[$view]['lang']['duration'] = __('Duration', 'cookieadmin');
             $policy[$view]['lang']['session'] = __('Session', 'cookieadmin');
+            $policy[$view]['lang']['days'] = __('Days', 'cookieadmin');
             
             // cookieadmin_r_print($policy);die();
@@ -95 +95 @@
         
         foreach (self::$categorized_cookies as $item) {
-            $category = strtolower($item->category);
-            $patterns = json_decode($item->patterns, true);
+            $category = !empty($item->category) ? strtolower($item->category) : '';
+            $patterns = !empty($item->patterns) ? json_decode($item->patterns, true) : '';
             
             if (!empty($patterns) && !empty($category)) {

cookieadmin/trunk/includes/functions.php

@@ -54 +54 @@
     // Enduser loading
     ///////////////////////////
+    
+    // Check if our scanner is visiting
+    if(defined('COOKIEADMIN_SCANNER')){ 
+        return false;
+    }
     
     add_action('wp_enqueue_scripts', '\CookieAdmin\Enduser::enqueue_scripts');
@@ -99 +104 @@
     }
     // === Plugin Update Notice END === //
-    
 }
 
@@ -132 +136 @@
     
     $admin_allowed_actions = array(
-        'scan_cookies' => 'cookieadmin_scan_cookies',
-        'cookieadmin-auto-categorize' => 'cookieadmin_auto_configure_cookies',
-        'cookieadmin-edit-cookie' => 'cookieadmin_edit_cookies',
-        'close-update-notice' => 'close_plugin_update_notice'
+        'scan_cookies' => '\CookieAdmin\Admin\Scan::scan_cookies_ajax',
+        'cookieadmin-edit-cookie' => '\CookieAdmin\Admin\Scan::edit_cookies',
+        'cookieadmin-delete-cookie' => '\CookieAdmin\Admin\Scan::delete_cookies',
+        'close-update-notice' => '\CookieAdmin\Admin::close_plugin_update_notice',
+        'close-notice' => '\CookieAdmin\Admin::close_notices'
     );
     
@@ -156 +161 @@
         }
         
-        call_user_func('\CookieAdmin\Admin::'.$admin_allowed_actions[$cookieadmin_fn]);
+        // TODO: Need to test this throughly
+        call_user_func($admin_allowed_actions[$cookieadmin_fn]);
         
     }elseif(array_key_exists($cookieadmin_fn, $general_actions)){
@@ -207 +213 @@
             'plugin_url' => esc_url(COOKIEADMIN_PLUGIN_URL),
             'powered_by' => __('Powered by', 'cookieadmin'),
-            'show_more' => __('show more', 'cookieadmin'),
             'reconsent' => __('Re-consent', 'cookieadmin'),
             'cookie_preferences' => __('Cookie Preferences', 'cookieadmin'),
-            'remark_standard' => __('Standard', 'cookieadmin'),
+            'remark_standard' => __('Always Active', 'cookieadmin'),
             'remark' => __('Remark', 'cookieadmin'),
             'none' => __('None', 'cookieadmin'),
@@ -229 +234 @@
 function cookieadmin_load_consent_template($policy, $view){
     
-    if(!file_exists(COOKIEADMIN_DIR.'assets/cookie/template.json')){
+    if(!file_exists(COOKIEADMIN_DIR.'assets/cookie/template.php')){
         return false;
     }
     
-    $content = json_decode(file_get_contents(COOKIEADMIN_DIR.'assets/cookie/template.json'), true);
+    include_once(COOKIEADMIN_DIR.'assets/cookie/template.php');
     
     if(empty($content)){
@@ -240 +245 @@
     
     $template = array();
-    $template[$view] = $content['cookieadmin_layout'][$policy['cookieadmin_layout']];
+    $template[$view] = ($policy['cookieadmin_layout'] != 'popup') ? $content['cookieadmin_layout'][$policy['cookieadmin_layout']] : '';
     $template[$view] .= $content['cookieadmin_modal'][$policy['cookieadmin_modal']];
     $template[$view] .= $content['cookieadmin_reconsent'];

cookieadmin/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.9
 Requires PHP: 7.0
-Stable tag: 1.1.4
+Stable tag: 1.1.5
 License: LGPLv2.1
 License URI: http://www.gnu.org/licenses/lgpl-2.1.html
@@ -76 +76 @@
 == Changelog ==
 
+= 1.1.5 =
+* [Pro Feature] Added German (Switzerland), Spanish (Argentina), Finnish and Croatian languages.
+* [Pro Feature] Introduced monthly automatic cookie scanning across all website pages.
+* [Pro Feature] Added automatic consent log cleanup with configurable limit.
+* [Fix] Improved Google Consent Mode v2 compatibility for cached websites.
+* [Fix] Improved consent saving reliability on cached websites by making frontend requests cache-safe.
+* [UI] Adjusted Consent Preferences modal description to auto height for better readability and removed Show more button.
+* [UI] Fixed Re-Consent icon styling issues caused by page builder CSS conflicts.
+
 = 1.1.4 =
 * [Pro Feature] Added Canadian French and Lithuanian languages.