Changeset 741552

Timestamp:

07/16/2013 09:16:24 AM (13 years ago)

Author:

Travelgrove

Message:

• subID moved to GET parameter when box loaded through JavaScript

Location:

travel-search/tags/1.2.5

Files:

• classes/tgSearchboxesRenderer.class.php (modified) (3 diffs)
• controllers/controller-frontend.php (modified) (2 diffs)

travel-search/tags/1.2.5/classes/tgSearchboxesRenderer.class.php

@@ -14 +14 @@
     private $defaultSize        = '300x250';
     private $defaultSelectedTab = 'flights';
-    private $subID          = '106';
+    private $subID;
+    /*  added to be able to compare if default subID is in use or not | Tibi | 2013-Jul-10  */
+    private $defaultSubID       = '106';
     private $defaultAlignment   = 'alignnone';
 
@@ -33 +35 @@
         $this->atts     = $atts;
         /** make the subID hookable - only for internal uses    */
-        $this->subID        = apply_filters('tg_searchboxes_subID', $this->subID);
+        $this->subID        = apply_filters('tg_searchboxes_subID', $this->defaultSubID);
         /** current number of boxes needed for incremental IDs for inputs / labels  */
         self::$nrOfBoxes++;
@@ -59 +61 @@
             $queryString.= '&'. urlencode($name) .'='. urlencode($value);
         }
+        
+        /*  @note   subID comparison to default subID added because subID was not transfered to the JS file and custom subID was lost when SB loaded from JS
+            @date   2013-JUL-10
+            @author Tibi    */
+        if ($this->defaultSubID!=$this->subID)
+            $queryString    .= '&subID='. (int)$this->subID;
+        
         $queryString    .= '&tgsbPlaceholder=tgsb_'.self::$nrOfBoxes;
         //the link to the javascript file (php that generates JS code)

travel-search/tags/1.2.5/controllers/controller-frontend.php

@@ -73 +73 @@
         $currentIndex++;
     }
+    
+    /** @note   If we get a subID via GET parameter, we have to use that subID | for the filter using priority of 20 - this should be enough to make sure no other filters were registered after this filter
+        @date   2013-JUL-10
+        @author Tibi    */
+    if ($req['subID']) {
+        $this->javascriptSubID  = $req['subID'];
+        add_filter('tg_searchboxes_subID', array($this, 'set_javascript_subid'), 20);
+    };
         
     // building up shortcode
@@ -105 +113 @@
     // exiting the script to prevent any other output
     exit();
+}
+
+/** @note   used to set the subID got via GET parameter if searchbox is loaded via JS | binded to `tg_searchboxes_subID` filter
+    @date   2013-JUL-10
+    @author Tibi    */
+public function set_javascript_subid($defSubId){
+    return $this->javascriptSubID ? $this->javascriptSubID : $defSubId;
 }