dynamic / silverstripe-locator

code/Location.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
     public function getCustomSearchContext()
     {
         $fields = $this->scaffoldSearchFields(array(
-            'restrictFields' => array('Address','Category.ID')
+            'restrictFields' => array('Address', 'Category.ID')
         ));
 
         $filters = array(

code/Locator.php

Spacing +16 added lines, -20 removed lines

@@ -113,44 +113,40 @@ 
         Requirements::css('locator/css/map.css');
 
         $featured = (Locator::getLocations(array('Featured' => 1))->count() > 0) ?
-            'featuredLocations: true' :
-            'featuredLocations: false';
+            'featuredLocations: true' : 'featuredLocations: false';
 
         // map config based on user input in Settings tab
         // AutoGeocode or Full Map
         $load = ($this->data()->AutoGeocode) ?
-            'autoGeocode: true, fullMapStart: false,' :
-            'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
+            'autoGeocode: true, fullMapStart: false,' : 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
 
         $base = Director::baseFolder();
-        $themePath = $base.'/'.$themeDir;
+        $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';
+        $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"';
 
-        $link = $this->Link().'xml.xml';
+        $link = $this->Link() . 'xml.xml';
 
         // init map
         if (Locator::getLocations()) {
             Requirements::customScript("
                 $(function($) {
                     $('#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,
                         distanceAlert: 120,
@@ -159,7 +155,7 @@ 
                         inputID: 'Form_LocationSearch_address',
                         categoryID: 'Form_LocationSearch_category',
                         distanceAlert: -1,
-                        ".$kilometer.'
+                        ".$kilometer . '
                     });
                 });
             ');
@@ -178,7 +174,7 @@ 
     public function Items($searchCriteria = array())
     {
         $request = ($this->request) ? $this->request : $this->parentController->getRequest();
-        if(empty($searchCriteria)) $searchCriteria = $request->requestVars();
+        if (empty($searchCriteria)) $searchCriteria = $request->requestVars();
 
         //if category filters are selected on Locator
         $filterAny = array();