dynamic / silverstripe-locator

code/Locator.php

Spacing +15 added lines, -19 removed lines

@@ -47,7 +47,7 @@ 
 	    return $fields;
     }
 
-	public static function getLocations($filter = array(), $exclude = array()){
+	public static function getLocations($filter = array(), $exclude = array()) {
 		$filter['ShowInLocator'] = true;
 		return Location::get()
 			->exclude($exclude)
@@ -55,11 +55,11 @@ 
 			->filter($filter);
 	}
 
-	public function getAreLocations(){
+	public function getAreLocations() {
 		return self::getLocations();
 	}
 
-    public static function getMultipleLocators(){
+    public static function getMultipleLocators() {
         return (Locator::get()->count() > 1) ? true : false;
     }
 
@@ -77,7 +77,7 @@ 
 		$themeDir = SSViewer::get_theme_folder();
 
 		Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-		if(Locator::getLocations()){
+		if (Locator::getLocations()) {
 			Requirements::javascript('http://maps.google.com/maps/api/js?sensor=false');
 			Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js');
 			Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js');
@@ -86,24 +86,20 @@ 
 		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';
+			$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';
+			$themeDir . '/templates/infowindow-description.html' : 'locator/templates/infowindow-description.html';
 
 		// in page or modal
 		$modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false';
@@ -111,10 +107,10 @@ 
         $kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
 
         $link = $this->Link() . "xml.xml";
-        $link .= (Locator::getMultipleLocators()) ? "?locatorID=" . $this->data()->ID : "" ;
+        $link .= (Locator::getMultipleLocators()) ? "?locatorID=" . $this->data()->ID : "";
 
 		// init map
-        if(Locator::getLocations()) {
+        if (Locator::getLocations()) {
             Requirements::customScript("
                 $(function($) {
                   $('#map-container').storeLocator({
@@ -151,8 +147,8 @@ 
 	 */
 	public function xml(SS_HTTPRequest $request) {
         $filter = array();
-        if(Locator::getMultipleLocators()){//only checks published locators
-            if($request->getVar('locatorID')){
+        if (Locator::getMultipleLocators()) {//only checks published locators
+            if ($request->getVar('locatorID')) {
                 $filter['LocatorID'] = $request->getVar('locatorID');
             }
         }
@@ -186,11 +182,11 @@ 
 			//debug::show($locals);
 			$categories = ArrayList::create();
 
-			foreach($locals as $local){
+			foreach ($locals as $local) {
 				$categories->add($local->Category());
 			}
 
-			if($categories->count()>0){
+			if ($categories->count() > 0) {
 				$fields->push(
 					DropdownField::create(
 						'category',

code/Location.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Location extends DataObject implements PermissionProvider{
+class Location extends DataObject implements PermissionProvider {
 
 	static $db = array(
 		'Title' => 'Varchar(255)',
@@ -121,7 +121,7 @@ 
 
     public function validate() {
         $result = parent::validate();
-        if(Locator::getMultipleLocators() && $this->LocatorID == 0) {
+        if (Locator::getMultipleLocators() && $this->LocatorID == 0) {
             $result->error('You must associate this location with a locator page. Add the location from the desired locator page.');
         }
         return $result;
@@ -157,9 +157,9 @@ 
 		);
 	}
 
-    public function onBeforeWrite(){
+    public function onBeforeWrite() {
 
-        if(Locator::get()->count() == 1){
+        if (Locator::get()->count() == 1) {
             $this->LocatorID = Locator::get()->first()->ID;
         }