Merge branch 'dev'

ajax/contact.php

@@ -24,12 +24,14 @@ function ($brickId, $project, $siteId, $message, $name, $email, $privacyPolicyAc
             );
         }
 
-        $BrickManager          = QUI\Bricks\Manager::init();
-        $Project               = QUI::getProjectManager()->decode($project);
-        $Site                  = $Project->get((int)$siteId);
-        $privacyPolicyCheckbox = boolval($Site->getAttribute('quiqqer.settings.sitetypes.contact.showPrivacyPolicyCheckbox'));
+        $BrickManager               = QUI\Bricks\Manager::init();
+        $Project                    = QUI::getProjectManager()->decode($project);
+        $Site                       = $Project->get((int)$siteId);
+        $Brick                      = $BrickManager->getBrickByID($brickId);
+        $privacyPolicyCheckbox      = boolval($Site->getAttribute('quiqqer.settings.sitetypes.contact.showPrivacyPolicyCheckbox'));
+        $privacyPolicyCheckboxBrick = $Brick->getSetting('showPrivacyPolicyCheckbox');
 
-        if ($privacyPolicyCheckbox && !(int)$privacyPolicyAccepted) {
+        if (($privacyPolicyCheckbox || $privacyPolicyCheckboxBrick) && !(int)$privacyPolicyAccepted) {
             throw new QUI\Exception(
                 QUI::getLocale()->get(
                     'quiqqer/bricks',
@@ -43,7 +45,6 @@ function ($brickId, $project, $siteId, $message, $name, $email, $privacyPolicyAc
             $receiver = $Site->getAttribute('quiqqer.settings.sitetypes.contact.email');
         } else {
             // Contact form (brick)
-            $Brick    = $BrickManager->getBrickByID($brickId);
             $receiver = $Brick->getSetting('mailTo');
         }
 

src/QUI/Bricks/Controls/SimpleContact.php

@@ -53,11 +53,10 @@ public function getBody()
         $name                  = '';
         $email                 = '';
         $message               = '';
-        $Site                  = $this->getSite();
-        $privacyPolicyCheckbox = boolval($Site->getAttribute('quiqqer.settings.sitetypes.contact.showPrivacyPolicyCheckbox'));
+        $privacyPolicyCheckbox = $this->getAttribute('showPrivacyPolicyCheckbox');
         $error                 = false;
 
-        // is javascript disabled?
+        // Is javascript disabled?
         if (isset($_POST['name'])
             && isset($_POST['email'])
             && isset($_POST['message'])
@@ -84,7 +83,7 @@ public function getBody()
             }
         }
 
-        if ($this->getAttribute('showPrivacyPolicyCheckbox')) {
+        if ($privacyPolicyCheckbox) {
             $PrivacyPolicySite = $this->getPrivacyPolicySite();
             $label             = QUI::getLocale()->get(
                 'quiqqer/bricks',