Merge pull request #95 from RRZE-Webteam/dev

Dev

Author: rvdforst

includes/Consent/Frontend.php

@@ -125,7 +125,8 @@ public static function handleLogAjaxRequest()
             // Frontend request
             if ($requestType == 'log' && !empty($_POST['cookieData'])) {
                 echo json_encode([
-                    'success' => Log::add($_POST['cookieData']),
+                    // 'success' => Log::add($_POST['cookieData']),
+                    'success' => Log::delete(),
                 ]);
             } elseif ($requestType == 'consent_history' && !empty($_POST['uid'])) {
                 echo json_encode(Log::getConsentHistory($_POST['uid']));

includes/Consent/Log.php

@@ -74,7 +74,6 @@ public static function add($cookieData)
 
     /**
      * Get consent history.
-     *
      * @param mixed $uid
      */
     public static function getConsentHistory($uid)
@@ -93,6 +92,9 @@ public static function getConsentHistory($uid)
 
         // Get logs
         $logs = get_option('rrze_legal_consent_log');
+        if (!$logs || !is_array($logs)) {
+            return $consentHistory;
+        }
 
         foreach ($logs as $logItem) {
             $consentList = [];
@@ -132,4 +134,13 @@ public static function getConsentHistory($uid)
 
         return $consentHistory;
     }
+
+    /**
+     * Delete consent log
+     * @return void
+     */
+    public static function delete()
+    {
+        return delete_option('rrze_legal_consent_log');
+    }
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "rrze-legal",
-    "version": "2.6.16",
+    "version": "2.6.17",
     "main": "rrze-legal.php",
     "scripts": {
         "start": "webpack --mode=development --watch",

rrze-legal.php

@@ -4,7 +4,7 @@
 Plugin Name:     RRZE Legal
 Plugin URI:      https://gitlab.rrze.fau.de/rrze-webteam/rrze-legal
 Description:     Legal Mandatory Information & GDPR.
-Version:         2.6.16
+Version:         2.6.17
 Author:          RRZE Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License Version 3