dynamic / silverstripe-locator

code/extensions/DistanceDataExtension.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     /**
      * @param SQLQuery $query
      */
-    public function augmentSQL(SQLQuery &$query)
+    public function augmentSQL(SQLQuery & $query)
     {
         if (Controller::curr()->getRequest()->getVar('Address')) { // on frontend
             $coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));

code/pages/Locator.php

Spacing +15 added lines, -17 removed lines

@@ -207,7 +207,7 @@ 
         if ($locations) {
             Requirements::javascript('https://code.jquery.com/jquery-3.0.0.min.js');
             Requirements::javascript('locator/thirdparty/locator-plugin/libs/handlebars/handlebars-v4.0.5.js');
-            Requirements::javascript('https://maps.googleapis.com/maps/api/js?key=' . $key);
+            Requirements::javascript('https://maps.googleapis.com/maps/api/js?key='.$key);
             Requirements::javascript('locator/thirdparty/locator-plugin/src/js/jquery.storelocator.js');
         }
         Requirements::css('locator/css/map.css');
@@ -229,13 +229,11 @@ 
             'autoGeocode: true, fullMapStart: false,' :
             'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';*/
         $base = Director::baseFolder();
-        $themePath = $base . '/' . $themeDir;
-        $listTemplatePath = (file_exists($themePath . '/templates/location-list-description.html')) ?
-            $themeDir . '/templates/location-list-description.html' :
-            'locator/templates/location-list-description.html';
-        $infowindowTemplatePath = (file_exists($themePath . '/templates/infowindow-description.html')) ?
-            $themeDir . '/templates/infowindow-description.html' :
-            'locator/templates/infowindow-description.html';
+        $themePath = $base.'/'.$themeDir;
+        $listTemplatePath = (file_exists($themePath.'/templates/location-list-description.html')) ?
+            $themeDir.'/templates/location-list-description.html' : 'locator/templates/location-list-description.html';
+        $infowindowTemplatePath = (file_exists($themePath.'/templates/infowindow-description.html')) ?
+            $themeDir.'/templates/infowindow-description.html' : 'locator/templates/infowindow-description.html';
         // in page or modal
         $modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false';
         $kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
@@ -245,22 +243,22 @@ 
         unset($vars['action_index']);
         $url = '';
         if (count($vars)) {
-            $url .= '?' . http_build_query($vars);
+            $url .= '?'.http_build_query($vars);
         }
-        $link = $this->AbsoluteLink() . 'xml.xml' . $url;
+        $link = $this->AbsoluteLink().'xml.xml'.$url;
 
         // init map
         if ($locations) {
             Requirements::customScript("
                 $(function() {
 					$('#bh-sl-map-container').storeLocator({
-					    " . $load . "
-                        dataLocation: '" . $link . "',
-                        listTemplatePath: '" . $listTemplatePath . "',
-                        infowindowTemplatePath: '" . $infowindowTemplatePath . "',
+					    " . $load."
+                        dataLocation: '" . $link."',
+                        listTemplatePath: '" . $listTemplatePath."',
+                        infowindowTemplatePath: '" . $infowindowTemplatePath."',
                         originMarker: true,
-                        " . $modal . ',
-                        ' . $featured . ",
+                        " . $modal.',
+                        ' . $featured.",
                         slideMap: false,
                         zoomLevel: 0,
                         noForm: true,
@@ -268,7 +266,7 @@ 
                         inputID: 'Form_LocationSearch_Address',
                         categoryID: 'Form_LocationSearch_category',
                         distanceAlert: -1,
-                        " . $kilometer . "
+                        " . $kilometer."
                     });
                 });
             ");