dynamic / silverstripe-locator

code/Locator.php

Indentation +43 added lines, -43 removed lines

@@ -5,47 +5,47 @@ 
 	private static $db = array(
 		'AutoGeocode' => 'Boolean',
 		'ModalWindow' => 'Boolean',
-        'Unit' => 'Enum("km,m","m")'
+		'Unit' => 'Enum("km,m","m")'
 	);
 
-    private static $has_many = array(
-        'Locations' => 'Location'
-    );
+	private static $has_many = array(
+		'Locations' => 'Location'
+	);
 
 	private static $defaults = array(
 		'AutoGeocode' => true
 	);
 
 	private static $singular_name = "Locator";
-    private static $plural_name = "Locators";
-    private static $description = 'Find locations on a map';
+	private static $plural_name = "Locators";
+	private static $description = 'Find locations on a map';
 
-    public function getCMSFields() {
-	    $fields = parent::getCMSFields();
+	public function getCMSFields() {
+		$fields = parent::getCMSFields();
 
-	    // Locations Grid Field
+		// Locations Grid Field
 		$config = (self::getMultipleLocators())
-            ? GridFieldConfig_RelationEditor::create() : GridFieldConfig_RecordEditor::create();
-        $locations = (self::getMultipleLocators()) ? $this->Locations() : Location::get();
-	    $fields->addFieldToTab("Root.Locations", GridField::create("Locations", "Locations", $locations, $config));
-
-	    // Location categories
-	    $config = GridFieldConfig_RecordEditor::create();
-	    $fields->addFieldToTab("Root.Categories", GridField::create("Categories", "Categories", LocationCategory::get(), $config));
-
-	    // Settings
-	    $fields->addFieldsToTab('Root.Settings', array(
-	    	HeaderField::create('DisplayOptions', 'Display Options', 3),
-            OptionsetField::create('Unit', 'Unit of measure', array('km' => 'Kilometers', 'm' => 'Miles')),
-	    	CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location')
+			? GridFieldConfig_RelationEditor::create() : GridFieldConfig_RecordEditor::create();
+		$locations = (self::getMultipleLocators()) ? $this->Locations() : Location::get();
+		$fields->addFieldToTab("Root.Locations", GridField::create("Locations", "Locations", $locations, $config));
+
+		// Location categories
+		$config = GridFieldConfig_RecordEditor::create();
+		$fields->addFieldToTab("Root.Categories", GridField::create("Categories", "Categories", LocationCategory::get(), $config));
+
+		// Settings
+		$fields->addFieldsToTab('Root.Settings', array(
+			HeaderField::create('DisplayOptions', 'Display Options', 3),
+			OptionsetField::create('Unit', 'Unit of measure', array('km' => 'Kilometers', 'm' => 'Miles')),
+			CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location')
 				->setDescription('Note: if any locations are set as featured, the auto geocode is automatically disabled.'),
-	    	CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window')
-	    ));
+			CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window')
+		));
 
 		$this->extend('updateCMSFields', $fields);
 
-	    return $fields;
-    }
+		return $fields;
+	}
 
 	public static function getLocations($filter = array(), $exclude = array()){
 		$filter['ShowInLocator'] = true;
@@ -59,9 +59,9 @@ 
 		return self::getLocations();
 	}
 
-    public static function getMultipleLocators(){
-        return (Locator::get()->count() > 1) ? true : false;
-    }
+	public static function getMultipleLocators(){
+		return (Locator::get()->count() > 1) ? true : false;
+	}
 
 }
 
@@ -108,14 +108,14 @@ 
 		// in page or modal
 		$modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false';
 
-        $kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
+		$kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
 
-        $link = $this->Link() . "xml.xml";
-        $link .= (Locator::getMultipleLocators()) ? "?locatorID=" . $this->data()->ID : "" ;
+		$link = $this->Link() . "xml.xml";
+		$link .= (Locator::getMultipleLocators()) ? "?locatorID=" . $this->data()->ID : "" ;
 
 		// init map
-        if(Locator::getLocations()) {
-            Requirements::customScript("
+		if(Locator::getLocations()) {
+			Requirements::customScript("
                 $(function($) {
                   $('#map-container').storeLocator({
                     " . $load . "
@@ -136,7 +136,7 @@ 
                   });
                 });
             ");
-        }
+		}
 
 	}
 
@@ -147,15 +147,15 @@ 
 	 *
 	 * @access public
 	 * @return XML file
-     * @todo rename/refactor to allow for json/xml
+	 * @todo rename/refactor to allow for json/xml
 	 */
 	public function xml(SS_HTTPRequest $request) {
-        $filter = array();
-        if(Locator::getMultipleLocators()){//only checks published locators
-            if($request->getVar('locatorID')){
-                $filter['LocatorID'] = $request->getVar('locatorID');
-            }
-        }
+		$filter = array();
+		if(Locator::getMultipleLocators()){//only checks published locators
+			if($request->getVar('locatorID')){
+				$filter['LocatorID'] = $request->getVar('locatorID');
+			}
+		}
 		$Locations = Locator::getLocations($filter);
 
 		return $this->customise(array(
@@ -181,7 +181,7 @@ 
 
 		if (LocationCategory::get()->Count() > 0) {
 
-            $filter = ($this->data()->getMultipleLocators()) ? array('LocatorID' => $this->data()->ID) : array();
+			$filter = ($this->data()->getMultipleLocators()) ? array('LocatorID' => $this->data()->ID) : array();
 			$locals = Locator::getLocations($filter, $exclude = array('CategoryID' => 0));
 			//debug::show($locals);
 			$categories = ArrayList::create();

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/LocationCsvBulkLoader.php

Indentation +14 added lines, -14 removed lines

@@ -1,30 +1,30 @@
 <?php
 class LocationCsvBulkLoader extends CsvBulkLoader {
    public $columnMap = array(
-      'Name' => 'Title', 
-      //'Address' => 'Address', 
-      'City' => 'Suburb',
-      //'State' => 'State',
-      'Zip' => 'Postcode',
-      'Category' => 'Category.Name',
+	  'Name' => 'Title', 
+	  //'Address' => 'Address', 
+	  'City' => 'Suburb',
+	  //'State' => 'State',
+	  'Zip' => 'Postcode',
+	  'Category' => 'Category.Name',
 	  'Email' => 'EmailAddress'
    );
    
    public $duplicateChecks = array(
-      'Address' => 'Address',
-      //'Website' => 'Website'
+	  'Address' => 'Address',
+	  //'Website' => 'Website'
    );
    
    public $relationCallbacks = array(
-      'Category.Name' => array(
-         'relationname' => 'Category',
-         'callback' => 'getCatByName'
-      )
+	  'Category.Name' => array(
+		 'relationname' => 'Category',
+		 'callback' => 'getCatByName'
+	  )
    );
    
    public static function getCatByName(&$obj, $val, $record) {
    	  $val = Convert::raw2sql($val);
-      return LocationCategory::get()->filter('Name', $val)->First();
-      //);
+	  return LocationCategory::get()->filter('Name', $val)->First();
+	  //);
    }
 }
\ No newline at end of file

code/LocationAdmin.php

Indentation +12 added lines, -12 removed lines

@@ -7,19 +7,19 @@ 
    	);
    	
    	static $model_importers = array(
-      	'Location' => 'LocationCsvBulkLoader',
-      	'LocationCategory' => 'CsvBulkLoader'
-    );
+	  	'Location' => 'LocationCsvBulkLoader',
+	  	'LocationCategory' => 'CsvBulkLoader'
+	);
    
 	static $menu_title = 'Locator';
-    static $url_segment = 'locator';
+	static $url_segment = 'locator';
 
-    public function getExportFields() {
-        return array(
-            'Title' => 'Name',
-            'Address' => 'Address',
-            'Suburb' => 'City',
-            'State' => 'State',
+	public function getExportFields() {
+		return array(
+			'Title' => 'Name',
+			'Address' => 'Address',
+			'Suburb' => 'City',
+			'State' => 'State',
 			'Postcode' => 'Postal Code',
 			'Country' => 'Country',
 			'Website' => 'Website',
@@ -29,6 +29,6 @@ 
 			'ShowInLocator' => 'Show',
 			'Lat' => 'Lat',
 			'Lng' => 'Lng'
-        );
-    }
+		);
+	}
 }
\ No newline at end of file

code/Location.php

Indentation +44 added lines, -44 removed lines

@@ -13,7 +13,7 @@ 
 	
 	static $has_one = array(
 		'Category' => 'LocationCategory',
-        'Locator' => 'Locator'
+		'Locator' => 'Locator'
 	);
 		
 	static $casting = array(
@@ -32,21 +32,21 @@ 
 	// api access via Restful Server module
 	static $api_access = true;
 
-    // search fields for Model Admin
-    private static $searchable_fields = array(
-        'Title',
-        'Address',
-        'Suburb',
-        'State',
-        'Postcode',
-        'Country',
-        'Category.ID',
-        'ShowInLocator',
-        'Featured',
-        'Website',
-        'Phone',
-        'EmailAddress'
-    );
+	// search fields for Model Admin
+	private static $searchable_fields = array(
+		'Title',
+		'Address',
+		'Suburb',
+		'State',
+		'Postcode',
+		'Country',
+		'Category.ID',
+		'ShowInLocator',
+		'Featured',
+		'Website',
+		'Phone',
+		'EmailAddress'
+	);
 	
 	// columns for grid field
 	static $summary_fields = array(
@@ -59,7 +59,7 @@ 
 		'Category.Name',
 		'ShowInLocator.NiceAsBoolean',
 		'Featured.NiceAsBoolean',
-        'Coords'
+		'Coords'
 	);
 
 	// Coords status for $summary_fields
@@ -67,21 +67,21 @@ 
 		return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
 	}
 
-    // custom labels for fields
+	// custom labels for fields
 	function fieldLabels($includerelations = true) {
-     	$labels = parent::fieldLabels();
-
-     	$labels['Title'] = 'Name';
-     	$labels['Suburb'] = "City";
-     	$labels['Postcode'] = 'Postal Code';
-     	$labels['ShowInLocator'] = 'Show';
-        $labels['ShowInLocator.NiceAsBoolean'] = 'Show';
-     	$labels['Category.Name'] = 'Category';
-     	$labels['EmailAddress'] = 'Email';
+	 	$labels = parent::fieldLabels();
+
+	 	$labels['Title'] = 'Name';
+	 	$labels['Suburb'] = "City";
+	 	$labels['Postcode'] = 'Postal Code';
+	 	$labels['ShowInLocator'] = 'Show';
+		$labels['ShowInLocator.NiceAsBoolean'] = 'Show';
+	 	$labels['Category.Name'] = 'Category';
+	 	$labels['EmailAddress'] = 'Email';
 		$labels['Featured.NiceAsBoolean'] = 'Featured';
-        $labels['Coords'] = 'Coords';
+		$labels['Coords'] = 'Coords';
 
-     	return $labels;
+	 	return $labels;
    	}
  
 	public function getCMSFields() {
@@ -89,7 +89,7 @@ 
 		$fields = parent::getCMSFields();
 		
 		// remove Main tab
-     	$fields->removeByName('Main');
+	 	$fields->removeByName('Main');
 		
 		// create and populate Info tab
 		$fields->addFieldsToTab('Root.Info', array(
@@ -113,19 +113,19 @@ 
 		$fields->insertAfter(CheckboxField::create('Featured', 'Featured'), 'Title');
 		$fields->insertAfter(CheckboxField::create('ShowInLocator', 'Show on Map'), 'Country');
 
-        // allow to be extended via DataExtension
+		// allow to be extended via DataExtension
 		$this->extend('updateCMSFields', $fields);
 				
 		return $fields;
 	}
 
-    public function validate() {
-        $result = parent::validate();
-        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;
-    }
+	public function validate() {
+		$result = parent::validate();
+		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;
+	}
 
 	/**
 	 * @param Member $member
@@ -157,13 +157,13 @@ 
 		);
 	}
 
-    public function onBeforeWrite(){
+	public function onBeforeWrite(){
 
-        if(Locator::get()->count() == 1){
-            $this->LocatorID = Locator::get()->first()->ID;
-        }
+		if(Locator::get()->count() == 1){
+			$this->LocatorID = Locator::get()->first()->ID;
+		}
 
-        parent::onBeforeWrite();
-    }
+		parent::onBeforeWrite();
+	}
 			
 }
\ No newline at end of file

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;
         }