Changeset 2604177 for shapepress-dsgvo

Timestamp:

09/24/2021 09:27:53 AM (5 years ago)

Author:

legalweb

Message:

• added nonce check to forms where it was missing
• added admin permission check on forms
• disabled all integrations by default so user has to enable them again

Location:

shapepress-dsgvo/trunk

Files:

• admin/tabs/v3/popup-notice/class-sp-dsgvo-cookie-notice-action.php (modified) (1 diff)
• includes/class-sp-dsgvo-embedding-api-base.php (modified) (2 diffs)
• includes/class-sp-dsgvo-integration-api-base.php (modified) (6 diffs)
• includes/class-sp-dsgvo-integration.php (modified) (1 diff)
• includes/integrations/embeddings/facebook-feed/class-sp-dsgvo-facebook-feed-integration.php (modified) (1 diff)
• includes/integrations/embeddings/facebook-feed/page.php (modified) (1 diff)
• includes/integrations/embeddings/gmaps/class-sp-dsgvo-gmaps-api.php (modified) (2 diffs)
• includes/integrations/embeddings/gmaps/class-sp-dsgvo-gmaps-integration.php (modified) (1 diff)
• includes/integrations/embeddings/gmaps/page.php (modified) (1 diff)
• includes/integrations/embeddings/instagram/class-sp-dsgvo-instagram-integration.php (modified) (1 diff)
• includes/integrations/embeddings/instagram/page.php (modified) (1 diff)
• includes/integrations/embeddings/openstreetmap/class-sp-dsgvo-openstreetmap-api.php (modified) (2 diffs)
• includes/integrations/embeddings/openstreetmap/class-sp-dsgvo-openstreetmap-integration.php (modified) (1 diff)
• includes/integrations/embeddings/openstreetmap/page.php (modified) (1 diff)
• includes/integrations/embeddings/soundcloud/class-sp-dsgvo-soundcloud-integration.php (modified) (1 diff)
• includes/integrations/embeddings/soundcloud/page.php (modified) (1 diff)
• includes/integrations/embeddings/twitter/class-sp-dsgvo-twitter-integration.php (modified) (1 diff)
• includes/integrations/embeddings/twitter/page.php (modified) (1 diff)
• includes/integrations/embeddings/vimeo/class-sp-dsgvo-vimeo-api.php (modified) (2 diffs)
• includes/integrations/embeddings/vimeo/class-sp-dsgvo-vimeo-integration.php (modified) (1 diff)
• includes/integrations/embeddings/vimeo/page.php (modified) (1 diff)
• includes/integrations/embeddings/youtube/class-sp-dsgvo-youtube-api.php (modified) (2 diffs)
• includes/integrations/embeddings/youtube/class-sp-dsgvo-youtube-integration.php (modified) (1 diff)
• includes/integrations/embeddings/youtube/page.php (modified) (1 diff)
• includes/integrations/mailchimp/MailchimpIntegration.php (modified) (1 diff)
• includes/integrations/statistics/clicky/class-sp-dsgvo-clicky-integration.php (modified) (2 diffs)
• includes/integrations/statistics/clicky/page.php (modified) (1 diff)
• includes/integrations/statistics/etracker/class-sp-dsgvo-etracker-integration.php (modified) (2 diffs)
• includes/integrations/statistics/etracker/page.php (modified) (1 diff)
• includes/integrations/statistics/googleanalytics/class-sp-dsgvo-google-analytics-integration.php (modified) (1 diff)
• includes/integrations/statistics/googleanalytics/page.php (modified) (1 diff)
• includes/integrations/statistics/hotjar/class-sp-dsgvo-hotjar-integration.php (modified) (2 diffs)
• includes/integrations/statistics/hotjar/page.php (modified) (1 diff)
• includes/integrations/statistics/matomo/class-sp-dsgvo-matomo-integration.php (modified) (1 diff)
• includes/integrations/statistics/matomo/page.php (modified) (1 diff)
• includes/integrations/statistics/mautic/class-sp-dsgvo-mautic-integration.php (modified) (1 diff)
• includes/integrations/statistics/mautic/page.php (modified) (1 diff)
• includes/integrations/statistics/piwik/class-sp-dsgvo-piwik-integration.php (modified) (2 diffs)
• includes/integrations/statistics/piwik/page.php (modified) (1 diff)
• includes/integrations/statistics/wpstatistics/class-sp-dsgvo-wpstatistics-integration.php (modified) (1 diff)
• includes/integrations/statistics/wpstatistics/page.php (modified) (1 diff)
• includes/integrations/tagmanager/googletagmanager/class-sp-dsgvo-google-tagmanager-api.php (modified) (2 diffs)
• includes/integrations/tagmanager/googletagmanager/class-sp-dsgvo-google-tagmanager-integration.php (modified) (2 diffs)
• includes/integrations/tagmanager/googletagmanager/page.php (modified) (1 diff)
• includes/integrations/tagmanager/matomotagmanager/class-sp-dsgvo-matomo-tagmanager-api.php (modified) (1 diff)
• includes/integrations/tagmanager/matomotagmanager/class-sp-dsgvo-matomo-tagmanager-integration.php (modified) (2 diffs)
• includes/integrations/tagmanager/matomotagmanager/page.php (modified) (1 diff)
• includes/integrations/targeting/bingadsuet/class-sp-dsgvo-bing-ads-uet-integration.php (modified) (2 diffs)
• includes/integrations/targeting/bingadsuet/page.php (modified) (1 diff)
• includes/integrations/targeting/criteo/class-sp-dsgvo-criteo-integration.php (modified) (2 diffs)
• includes/integrations/targeting/criteo/page.php (modified) (1 diff)
• includes/integrations/targeting/fbpixel/class-sp-dsgvo-fb-pixel-integration.php (modified) (2 diffs)
• includes/integrations/targeting/fbpixel/page.php (modified) (1 diff)
• includes/integrations/targeting/gadsense/class-sp-dsgvo-gadsense-integration.php (modified) (2 diffs)
• includes/integrations/targeting/gadsense/page.php (modified) (1 diff)
• includes/integrations/targeting/linkedinpixel/class-sp-dsgvo-linkedin-pixel-integration.php (modified) (2 diffs)
• includes/integrations/targeting/linkedinpixel/page.php (modified) (1 diff)

shapepress-dsgvo/trunk/admin/tabs/v3/popup-notice/class-sp-dsgvo-cookie-notice-action.php

@@ -13 +13 @@
         SPDSGVOSettings::set('show_notice_on_close', $this->get('show_notice_on_close', '0'));
         SPDSGVOSettings::set('force_cookie_info', $this->get('force_cookie_info', '0'));
+        SPDSGVOSettings::set('run_necessary_automatically', $this->get('run_necessary_automatically', '0'));
         SPDSGVOSettings::set('mandatory_integrations_editable', $this->get('mandatory_integrations_editable', '0'));
         SPDSGVOSettings::set('cookie_notice_text', $this->get('cookie_notice_text', ''));

shapepress-dsgvo/trunk/includes/class-sp-dsgvo-embedding-api-base.php

@@ -135 +135 @@
     {
         $settings = array();
-        $settings['enabled'] = '0';
+        $settings['isEnabled'] = '0';
         $settings['propertyId'] = '';
         $settings['cookieNames'] = $this->cookieNames;
@@ -165 +165 @@
         $settings = $this->getSettings();
 
-        return $settings['enabled'] == '1';
+        return $settings['isEnabled'] == '1';
     }
 

shapepress-dsgvo/trunk/includes/class-sp-dsgvo-integration-api-base.php

@@ -158 +158 @@
     {
         $settings = array();
-        $settings['enabled'] = '0';
+        $settings['isEnabled'] = '0';
         $settings['propertyId'] = '';
         $settings['useOwnCode'] = $ownCodeEnabledByDefault ? '1' : '0';
@@ -185 +185 @@
     }
 
+    public function validateJsCode($code){
+
+        return $code;
+    }
+
     public final function checkIfIntegrationIsAllowed($integrationSlug)
     {
@@ -204 +209 @@
         $settings = $this->getSettings();
 
-        return $settings['enabled'] == '1';
+        return $settings['isEnabled'] == '1';
     }
 
@@ -260 +265 @@
         $settings = $this->getSettings();
 
-        if ($settings['enabled'] == '0') return;
+        if ($settings['isEnabled'] == '0') return;
         $propertyId = $settings['propertyId'];
 
@@ -283 +288 @@
         $settings = $this->getSettings();
 
-        if ($settings['enabled'] == '0') return;
+        if ($settings['isEnabled'] == '0') return;
         $propertyId = $settings['propertyId'];
 
@@ -307 +312 @@
         $settings = $this->getSettings();
 
-        if ($settings['enabled'] == '0') return;
+        if ($settings['isEnabled'] == '0') return;
         $propertyId = $settings['propertyId'];
 

shapepress-dsgvo/trunk/includes/class-sp-dsgvo-integration.php

@@ -109 +109 @@
         die();
     }
-    
+
+    public function requireAdmin(){
+        if(!current_user_can('administrator')){
+            echo '0';
+            die;
+        }
+    }
+
+    public function checkCSRF(){
+
+        $actionName = self::action().'-nonce';
+        $submittedNonce = $_REQUEST['_wpnonce'];
+
+        if ( wp_verify_nonce( $submittedNonce, $actionName ) ) {
+            return TRUE;
+        } else
+        {
+            echo 'CSRF ERROR: Nonce not valid';
+            die;
+            //return FALSE;
+        }
+
+    }
 }

shapepress-dsgvo/trunk/includes/integrations/embeddings/facebook-feed/class-sp-dsgvo-facebook-feed-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
+
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/facebook-feed/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/embeddings/gmaps/class-sp-dsgvo-gmaps-api.php

@@ -33 +33 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false &&  in_array('google-maps', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false &&  in_array('google-maps', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 
-        return $settings['enabled'] == '1';
+        return $settings['isEnabled'] == '1';
     }
 
@@ -46 +46 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false && in_array('google-maps', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false && in_array('google-maps', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/gmaps/class-sp-dsgvo-gmaps-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
+
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
         // delete old setting from times before we had embeddings

shapepress-dsgvo/trunk/includes/integrations/embeddings/gmaps/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/embeddings/instagram/class-sp-dsgvo-instagram-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
+
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/instagram/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/embeddings/openstreetmap/class-sp-dsgvo-openstreetmap-api.php

@@ -32 +32 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false &&  in_array('open-street-map', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false &&  in_array('open-street-map', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 
-        return $settings['enabled'] == '1';
+        return $settings['isEnabled'] == '1';
     }
 
@@ -45 +45 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false && in_array('open-street-map', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false && in_array('open-street-map', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/openstreetmap/class-sp-dsgvo-openstreetmap-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
+
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
         // delete old setting from times before we had embeddings

shapepress-dsgvo/trunk/includes/integrations/embeddings/openstreetmap/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/embeddings/soundcloud/class-sp-dsgvo-soundcloud-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/soundcloud/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/embeddings/twitter/class-sp-dsgvo-twitter-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
+
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/twitter/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/embeddings/vimeo/class-sp-dsgvo-vimeo-api.php

@@ -32 +32 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false &&  in_array('vimeo', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false &&  in_array('vimeo', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 
-        return $settings['enabled'] == '1';
+        return $settings['isEnabled'] == '1';
     }
 
@@ -45 +45 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false &&  in_array('vimeo', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false &&  in_array('vimeo', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/vimeo/class-sp-dsgvo-vimeo-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
+
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
        // delete old setting from times before we had embeddings

shapepress-dsgvo/trunk/includes/integrations/embeddings/vimeo/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/embeddings/youtube/class-sp-dsgvo-youtube-api.php

@@ -32 +32 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false &&  in_array('youtube', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false &&  in_array('youtube', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 
-        return $settings['enabled'] == '1';
+        return $settings['isEnabled'] == '1';
     }
 
@@ -45 +45 @@
 
         $legacySettings = SPDSGVOSettings::get('page_basics_embeddings');
-        if ($settings['enabled'] == '0' && empty($legacySettings) == false &&  in_array('youtube', $legacySettings))
+        if ($settings['isEnabled'] == '0' && empty($legacySettings) == false &&  in_array('youtube', $legacySettings))
         {
-            $settings['enabled'] = '1';
+            $settings['isEnabled'] = '1';
         }
 

shapepress-dsgvo/trunk/includes/integrations/embeddings/youtube/class-sp-dsgvo-youtube-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->requireAdmin();
+
         $settings = $this->apiInstance->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
 
         // delete old setting from times before we had embeddings

shapepress-dsgvo/trunk/includes/integrations/embeddings/youtube/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/mailchimp/MailchimpIntegration.php

@@ -20 +20 @@
     
     public function viewSubmit(){
+
+        $this->requireAdmin();
 
         if($this->has('mailchimp_api_token')){

shapepress-dsgvo/trunk/includes/integrations/statistics/clicky/class-sp-dsgvo-clicky-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -34 +37 @@
         $settings = SPDSGVOClickyApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_property_id', '');
         $settings['useOwnCode'] = $this->get($this->slug.'_own_code', '0');

shapepress-dsgvo/trunk/includes/integrations/statistics/clicky/page.php

@@ -19 +19 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/statistics/etracker/class-sp-dsgvo-etracker-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -34 +37 @@
         $settings = SPDSGVOEtrackerApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_property_id', '');
         $settings['useOwnCode'] = $this->get($this->slug.'_own_code', '0');

shapepress-dsgvo/trunk/includes/integrations/statistics/etracker/page.php

@@ -21 +21 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/statistics/googleanalytics/class-sp-dsgvo-google-analytics-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $settings = SPDSGVOGoogleAnalyticsApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get('ga_enable_analytics', '0');
+        $settings['isEnabled'] = $this->get('ga_enable_analytics', '0');
         $settings['propertyId'] = $this->get('ga_tag_number', '');
         $settings['useOwnCode'] = $this->get('ga_own_code', '0');

shapepress-dsgvo/trunk/includes/integrations/statistics/googleanalytics/page.php

@@ -18 +18 @@
 
             <?php
-            spDsgvoWriteInput('switch', '', 'ga_enable_analytics', $settings['enabled'],
+            spDsgvoWriteInput('switch', '', 'ga_enable_analytics', $settings['isEnabled'],
                 __('Use Google Analytics', 'shapepress-dsgvo'),
                 '',

shapepress-dsgvo/trunk/includes/integrations/statistics/hotjar/class-sp-dsgvo-hotjar-integration.php

@@ -26 +26 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -35 +38 @@
         $settings = SPDSGVOHotjarApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['useOwnCode'] = '1';//$this->get($this->slug.'_own_code', '1');

shapepress-dsgvo/trunk/includes/integrations/statistics/hotjar/page.php

@@ -23 +23 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/statistics/matomo/class-sp-dsgvo-matomo-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $settings = SPDSGVOMatomoApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['implementationMode'] = $this->get( $this->slug.'_implementationMode', '');

shapepress-dsgvo/trunk/includes/integrations/statistics/matomo/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/statistics/mautic/class-sp-dsgvo-mautic-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $settings = SPDSGVOMauticApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['implementationMode'] = $this->get( $this->slug.'_implementationMode', '');

shapepress-dsgvo/trunk/includes/integrations/statistics/mautic/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/statistics/piwik/class-sp-dsgvo-piwik-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -34 +37 @@
         $settings = SPDSGVOPiwikApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['useOwnCode'] = '1';//$this->get($this->slug.'_own_code', '1');

shapepress-dsgvo/trunk/includes/integrations/statistics/piwik/page.php

@@ -21 +21 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/statistics/wpstatistics/class-sp-dsgvo-wpstatistics-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $settings = SPDSGVOWpStatisticsApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['cloudMode'] = '0';
         $settings['useOwnCode'] = '1';//$this->get($this->slug.'_own_code', '1');

shapepress-dsgvo/trunk/includes/integrations/statistics/wpstatistics/page.php

@@ -21 +21 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/tagmanager/googletagmanager/class-sp-dsgvo-google-tagmanager-api.php

@@ -37 +37 @@
         $settings = $this->getSettings();
 
-        if ($settings['enabled'] == '0') return;
+        if ($settings['isEnabled'] == '0') return;
         $propertyId = $settings['propertyId'];
 
@@ -57 +57 @@
         $settings = $this->getSettings();
 
-        if ($settings['enabled'] == '0') return;
+        if ($settings['isEnabled'] == '0') return;
         $propertyId = $settings['propertyId'];
 

shapepress-dsgvo/trunk/includes/integrations/tagmanager/googletagmanager/class-sp-dsgvo-google-tagmanager-integration.php

@@ -26 +26 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -35 +38 @@
         $settings = SPDSGVOGoogleTagmanagerApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get('gtag_enable', '0');
+        $settings['isEnabled'] = $this->get('gtag_enable', '0');
         $settings['propertyId'] = $this->get('gtag_tag_number', '');
         $settings['useOwnCode'] = $this->get('gtag_own_code', '0');

shapepress-dsgvo/trunk/includes/integrations/tagmanager/googletagmanager/page.php

@@ -20 +20 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', 'gtag_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', 'gtag_enable', $settings['isEnabled'],
                     __('Use Google TagManager', 'shapepress-dsgvo'),
                     '',

shapepress-dsgvo/trunk/includes/integrations/tagmanager/matomotagmanager/class-sp-dsgvo-matomo-tagmanager-api.php

@@ -37 +37 @@
         $settings = $this->getSettings();
 
-        if ($settings['enabled'] == '0') return;
+        if ($settings['isEnabled'] == '0') return;
         $propertyId = $settings['propertyId'];
 

shapepress-dsgvo/trunk/includes/integrations/tagmanager/matomotagmanager/class-sp-dsgvo-matomo-tagmanager-integration.php

@@ -26 +26 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -35 +38 @@
         $settings = SPDSGVOMatomoTagmanagerApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['useOwnCode'] = '1';//$this->get($this->slug.'_own_code', '1');

shapepress-dsgvo/trunk/includes/integrations/tagmanager/matomotagmanager/page.php

@@ -21 +21 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/targeting/bingadsuet/class-sp-dsgvo-bing-ads-uet-integration.php

@@ -26 +26 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -35 +38 @@
         $settings = SPDSGVOBingAdsUetApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['useOwnCode'] = '1';//$this->get($this->slug.'_own_code', '1');

shapepress-dsgvo/trunk/includes/integrations/targeting/bingadsuet/page.php

@@ -23 +23 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/targeting/criteo/class-sp-dsgvo-criteo-integration.php

@@ -25 +25 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -34 +37 @@
         $settings = SPDSGVOCriteoApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['useOwnCode'] = '1';//$this->get($this->slug.'_own_code', '1');

shapepress-dsgvo/trunk/includes/integrations/targeting/criteo/page.php

@@ -23 +23 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',

shapepress-dsgvo/trunk/includes/integrations/targeting/fbpixel/class-sp-dsgvo-fb-pixel-integration.php

@@ -26 +26 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition() || isValidBlogEdition();
         if ($hasValidLicense == false)
@@ -35 +38 @@
         $settings = SPDSGVOFbPixelApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get('fb_enable_pixel', '0');
+        $settings['isEnabled'] = $this->get('fb_enable_pixel', '0');
         $settings['propertyId'] = $this->get('fb_pixel_number', '');
         $settings['useOwnCode'] = $this->get('fb_own_code', '0');

shapepress-dsgvo/trunk/includes/integrations/targeting/fbpixel/page.php

@@ -23 +23 @@
 
             <?php
-            spDsgvoWriteInput('switch', '', 'fb_enable_pixel', $settings['enabled'],
+            spDsgvoWriteInput('switch', '', 'fb_enable_pixel', $settings['isEnabled'],
                 __('Use Facebook Pixel', 'shapepress-dsgvo'),
                 '',

shapepress-dsgvo/trunk/includes/integrations/targeting/gadsense/class-sp-dsgvo-gadsense-integration.php

@@ -26 +26 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition() || isValidBlogEdition();
         if ($hasValidLicense == false)
@@ -35 +38 @@
         $settings = SPDSGVOFbPixelApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_property_id', '');
         $settings['useOwnCode'] = $this->get($this->slug.'_own_code', '0');

shapepress-dsgvo/trunk/includes/integrations/targeting/gadsense/page.php

@@ -21 +21 @@
 
             <?php
-            spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+            spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                 sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                 '',

shapepress-dsgvo/trunk/includes/integrations/targeting/linkedinpixel/class-sp-dsgvo-linkedin-pixel-integration.php

@@ -26 +26 @@
     public function viewSubmit(){
 
+        $this->checkCSRF();
+        $this->requireAdmin();
+
         $hasValidLicense = isValidPremiumEdition();
         if ($hasValidLicense == false)
@@ -35 +38 @@
         $settings = SPDSGVOLinkedInPixelApi::getInstance()->getSettings();
 
-        $settings['enabled'] = $this->get( $this->slug.'_enable', '0');
+        $settings['isEnabled'] = $this->get( $this->slug.'_enable', '0');
         $settings['propertyId'] = $this->get($this->slug.'_tag_number', '');
         $settings['useOwnCode'] = '1';//$this->get($this->slug.'_own_code', '1');

shapepress-dsgvo/trunk/includes/integrations/targeting/linkedinpixel/page.php

@@ -23 +23 @@
 
                 <?php
-                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['enabled'],
+                spDsgvoWriteInput('switch', '', $apiInstance->getSlug().'_enable', $settings['isEnabled'],
                     sprintf(__('Use %s', 'shapepress-dsgvo'), $apiInstance->getName()),
                     '',