Prevents an exception for DWC and focus requests that aren't tracked (#…

…7197) Prevents an exception for DWC and focus requests that aren't tracked
mautic · May 19, 2019 · a26ab81 · a26ab81
2 parents 4e1ad92 + c9ac87b
commit a26ab81
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/app/bundles/DynamicContentBundle/Model/DynamicContentModel.php b/app/bundles/DynamicContentBundle/Model/DynamicContentModel.php
@@ -176,7 +176,19 @@ public function getSlotContentForLead($slot, $lead)
      */
     public function createStatEntry(DynamicContent $dynamicContent, $lead, $source = null)
     {
+        if (empty($lead)) {
+            return;
+        }
+
+        if ($lead instanceof Lead && !$lead->getId()) {
+            return;
+        }
+
         if (is_array($lead)) {
+            if (empty($lead['id'])) {
+                return;
+            }
+
             $lead = $this->em->getReference('MauticLeadBundle:Lead', $lead['id']);
         }
 

diff --git a/app/bundles/LeadBundle/Helper/ContactRequestHelper.php b/app/bundles/LeadBundle/Helper/ContactRequestHelper.php
@@ -123,14 +123,21 @@ public function __construct(
     public function getContactFromQuery(array $queryFields = [])
     {
         $this->trackedContact = $this->contactTracker->getContact();
+
+        unset($queryFields['page_url']); // This is set now automatically by PageModel
         $this->queryFields    = $queryFields;
+
         try {
             $foundContact         = $this->getContactFromUrl();
             $this->trackedContact = $foundContact;
             $this->contactTracker->setTrackedContact($this->trackedContact);
         } catch (ContactNotFoundException $exception) {
         }
 
+        if (!$this->trackedContact) {
+            return null;
+        }
+
         $this->prepareContactFromRequest();
 
         return $this->trackedContact;

diff --git a/plugins/MauticFocusBundle/Model/FocusModel.php b/plugins/MauticFocusBundle/Model/FocusModel.php
@@ -17,6 +17,7 @@
 use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Helper\TemplatingHelper;
 use Mautic\CoreBundle\Model\FormModel;
+use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\FieldModel;
 use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\PageBundle\Model\TrackableModel;
@@ -330,6 +331,22 @@ public static function isLightColor($hex, $level = 200)
      */
     public function addStat(Focus $focus, $type, $data = null, $lead = null)
     {
+        if (empty($lead)) {
+            return;
+        }
+
+        if ($lead instanceof Lead && !$lead->getId()) {
+            return;
+        }
+
+        if (is_array($lead)) {
+            if (empty($lead['id'])) {
+                return;
+            }
+
+            $lead = $this->em->getReference('MauticLeadBundle:Lead', $lead['id']);
+        }
+
         switch ($type) {
             case Stat::TYPE_FORM:
                 /** @var \Mautic\FormBundle\Entity\Submission $data */