FIX: prevent repeated requests

CHG: product campaigns: html flag handling, and method to pass through raw data for processing with JavaScript
FACT-Finder · May 5, 2015 · f68cfaf · f68cfaf
1 parent 98dd7fd
commit f68cfaf
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/FACTFinder/Adapter/ProductCampaign.php b/FACTFinder/Adapter/ProductCampaign.php
@@ -195,7 +195,7 @@ private function createEmptyCampaignObject(array $campaignData)
      * @param mixed[] $campaignData An associative array corresponding to the
      *        JSON for that campaign.
      */
-    private function fillCampaignWithFeedback(
+    protected function fillCampaignWithFeedback(
         \FACTFinder\Data\Campaign $campaign,
         array $campaignData
     ) {
@@ -206,13 +206,20 @@ private function fillCampaignWithFeedback(
             foreach ($campaignData['feedbackTexts'] as $feedbackData)
             {
                 // If present, add the feedback to both the label and the ID.
+                $html = $feedbackData['html'];
+                $text = $feedbackData['text'];
+                if (!$html)
+                {
+                    $text = htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
+                }
+
                 $label = $feedbackData['label'];
                 if ($label !== '')
-                    $feedback[$label] = $feedbackData['text'];
+                    $feedback[$label] = $text;
 
                 $id = $feedbackData['id'];
                 if ($id !== null)
-                    $feedback[$id] = $feedbackData['text'];
+                    $feedback[$id] = $text;
             }
 
             $campaign->addFeedback($feedback);
@@ -245,4 +252,28 @@ private function fillCampaignWithPushedProducts(
             $campaign->addPushedProducts($pushedProducts);
         }
     }
+
+    /**
+     * Get the product campaigns from FACT-Finder as the string returned by the
+     * server.
+     *
+     * @param string $format Optional. Either 'json' or 'jsonp'. Use to
+     *                       overwrite the 'format' parameter.
+     * @param string $callback Optional name to overwrite the 'callback'
+     *                         parameter, which determines the name of the
+     *                         callback the response is wrapped in.
+     *
+     * @return string
+     */
+    public function getRawProductCampaigns($format = null, $callback = null)
+    {
+        $this->usePassthroughResponseContentProcessor();
+
+        if (!is_null($format))
+            $this->parameters['format'] = $format;
+        if (!is_null($callback))
+            $this->parameters['callback'] = $callback;
+
+        return $this->getResponseContent();
+    }
 }
diff --git a/FACTFinder/Core/Server/Request.php b/FACTFinder/Core/Server/Request.php
@@ -25,6 +25,11 @@ class Request
      */
     private $connectionData;
 
+    /**
+     * @var ConnectionData
+     */
+    protected $blLoaded;
+
     /**
      * @var AbstractDataProvider
      */
@@ -41,6 +46,7 @@ public function __construct(
 
         $this->connectionData = $connectionData;
         $this->dataProvider = $dataProvider;
+        $this->blLoaded = false;
     }
 
     public function __destruct()
@@ -101,7 +107,10 @@ public function setTimeout($timeout)
      */
     public function getResponse()
     {
-        $this->dataProvider->loadResponse($this->id);
+        if(!$this->blLoaded) {
+            $this->dataProvider->loadResponse($this->id);
+            $this->blLoaded = true;
+        }
         return $this->connectionData->getResponse();
     }
 }