dynamic / silverstripe-locator

code/Location.php

Indentation +196 added lines, -196 removed lines

@@ -2,200 +2,200 @@
 
 class Location extends DataObject implements PermissionProvider
 {
-    private static $db = array(
-        'Title' => 'Varchar(255)',
-        'Featured' => 'Boolean',
-        'Website' => 'Varchar(255)',
-        'Phone' => 'Varchar(40)',
-        'Email' => 'Varchar(255)',
-        'EmailAddress' => 'Varchar(255)',
-        'ShowInLocator' => 'Boolean',
-    );
-
-    private static $has_one = array(
-        'Category' => 'LocationCategory',
-    );
-
-    private static $casting = array(
-        'distance' => 'Int',
-    );
-
-    private static $default_sort = 'Title';
-
-    private static $defaults = array(
-        'ShowInLocator' => true,
-    );
-
-    private static $singular_name = 'Location';
-    private static $plural_name = 'Locations';
-
-    // api access via Restful Server module
-    private static $api_access = true;
-
-    // search fields for Model Admin
-    private static $searchable_fields = array(
-        'Title',
-        'Address',
-        'Suburb',
-        'State',
-        'Postcode',
-        'Country',
-        'Website',
-        'Phone',
-        'Email',
-        'Category.ID',
-        'ShowInLocator',
-        'Featured',
-    );
-
-    // columns for grid field
-    private static $summary_fields = array(
-        'Title',
-        'Address',
-        'Suburb',
-        'State',
-        'Postcode',
-        'Country',
-        'Category.Name',
-        'ShowInLocator.NiceAsBoolean',
-        'Featured.NiceAsBoolean',
-        'Coords',
-    );
-
-    // Coords status for $summary_fields
-    public function getCoords()
-    {
-        return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
-    }
-
-    // custom labels for fields
-    public 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['Category.ID'] = 'Category';
-        $labels['Email'] = 'Email';
-        $labels['Featured.NiceAsBoolean'] = 'Featured';
-        $labels['Coords'] = 'Coords';
-
-        return $labels;
-    }
-
-    public function getCMSFields()
-    {
-        $fields = FieldList::create(
-            new TabSet(
-                $name = 'Root',
-                new Tab(
-                    $title = 'Main',
-                    HeaderField::create('ContactHD', 'Contact Information'),
-                    TextField::create('Title', 'Name'),
-                    TextField::create('Phone'),
-                    EmailField::create('Email', 'Email'),
-                    TextField::create('Website')
-                        ->setAttribute('placeholder', 'http://'),
-                    DropDownField::create('CategoryID', 'Category', LocationCategory::get()->map('ID', 'Title'))
-                        ->setEmptyString('-- select --'),
-                    CheckboxField::create('ShowInLocator', 'Show in results')
-                        ->setDescription('Location will be included in results list'),
-                    CheckboxField::create('Featured')
-                        ->setDescription('Location will show at/near the top of the results list')
-                )
-            )
-        );
-
-        // allow to be extended via DataExtension
-        $this->extend('updateCMSFields', $fields);
-
-        // override Suburb field name
-        $fields->dataFieldByName('Suburb')->setTitle('City');
-
-        return $fields;
-    }
-
-    public function validate()
-    {
-        $result = parent::validate();
-
-        return $result;
-    }
-
-    public function EmailAddress()
-    {
-        Deprecation::notice('3.0', 'Use "$Email" instead.');
-        if ($this->Email) {
-            return $this->Email;
-        } elseif ($this->EmailAddress) {
-            return $this->EmailAddress;
-        }
-
-        return false;
-    }
-
-    public function getCustomSearchContext()
-    {
-        $fields = $this->scaffoldSearchFields(array(
-            'restrictFields' => array('Address','Category.ID')
-        ));
-
-        $filters = array(
-            'Address' => new PartialMatchFilter('Address'),
-            'Suburb' => new PartialMatchFilter('Suburb'),
-            'State' => new PartialMatchFilter('State'),
-            'Postcode' => new PartialMatchFilter('Postcode'),
-            'Country' => new PartialMatchFilter('Postcode'),
-            'CategoryID' => new ExactMatchFilter('CategoryID'),
-        );
-
-        return new SearchContext(
-            $this->class,
-            $fields,
-            $filters
-        );
-    }
-
-    /**
-     * @param Member $member
-     *
-     * @return bool
-     */
-    public function canView($member = false)
-    {
-        return true;
-    }
-
-    public function canEdit($member = false)
-    {
-        return Permission::check('Location_EDIT');
-    }
-
-    public function canDelete($member = false)
-    {
-        return Permission::check('Location_DELETE');
-    }
-
-    public function canCreate($member = false)
-    {
-        return Permission::check('Location_CREATE');
-    }
-
-    public function providePermissions()
-    {
-        return array(
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        );
-    }
-
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
-    }
+	private static $db = array(
+		'Title' => 'Varchar(255)',
+		'Featured' => 'Boolean',
+		'Website' => 'Varchar(255)',
+		'Phone' => 'Varchar(40)',
+		'Email' => 'Varchar(255)',
+		'EmailAddress' => 'Varchar(255)',
+		'ShowInLocator' => 'Boolean',
+	);
+
+	private static $has_one = array(
+		'Category' => 'LocationCategory',
+	);
+
+	private static $casting = array(
+		'distance' => 'Int',
+	);
+
+	private static $default_sort = 'Title';
+
+	private static $defaults = array(
+		'ShowInLocator' => true,
+	);
+
+	private static $singular_name = 'Location';
+	private static $plural_name = 'Locations';
+
+	// api access via Restful Server module
+	private static $api_access = true;
+
+	// search fields for Model Admin
+	private static $searchable_fields = array(
+		'Title',
+		'Address',
+		'Suburb',
+		'State',
+		'Postcode',
+		'Country',
+		'Website',
+		'Phone',
+		'Email',
+		'Category.ID',
+		'ShowInLocator',
+		'Featured',
+	);
+
+	// columns for grid field
+	private static $summary_fields = array(
+		'Title',
+		'Address',
+		'Suburb',
+		'State',
+		'Postcode',
+		'Country',
+		'Category.Name',
+		'ShowInLocator.NiceAsBoolean',
+		'Featured.NiceAsBoolean',
+		'Coords',
+	);
+
+	// Coords status for $summary_fields
+	public function getCoords()
+	{
+		return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
+	}
+
+	// custom labels for fields
+	public 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['Category.ID'] = 'Category';
+		$labels['Email'] = 'Email';
+		$labels['Featured.NiceAsBoolean'] = 'Featured';
+		$labels['Coords'] = 'Coords';
+
+		return $labels;
+	}
+
+	public function getCMSFields()
+	{
+		$fields = FieldList::create(
+			new TabSet(
+				$name = 'Root',
+				new Tab(
+					$title = 'Main',
+					HeaderField::create('ContactHD', 'Contact Information'),
+					TextField::create('Title', 'Name'),
+					TextField::create('Phone'),
+					EmailField::create('Email', 'Email'),
+					TextField::create('Website')
+						->setAttribute('placeholder', 'http://'),
+					DropDownField::create('CategoryID', 'Category', LocationCategory::get()->map('ID', 'Title'))
+						->setEmptyString('-- select --'),
+					CheckboxField::create('ShowInLocator', 'Show in results')
+						->setDescription('Location will be included in results list'),
+					CheckboxField::create('Featured')
+						->setDescription('Location will show at/near the top of the results list')
+				)
+			)
+		);
+
+		// allow to be extended via DataExtension
+		$this->extend('updateCMSFields', $fields);
+
+		// override Suburb field name
+		$fields->dataFieldByName('Suburb')->setTitle('City');
+
+		return $fields;
+	}
+
+	public function validate()
+	{
+		$result = parent::validate();
+
+		return $result;
+	}
+
+	public function EmailAddress()
+	{
+		Deprecation::notice('3.0', 'Use "$Email" instead.');
+		if ($this->Email) {
+			return $this->Email;
+		} elseif ($this->EmailAddress) {
+			return $this->EmailAddress;
+		}
+
+		return false;
+	}
+
+	public function getCustomSearchContext()
+	{
+		$fields = $this->scaffoldSearchFields(array(
+			'restrictFields' => array('Address','Category.ID')
+		));
+
+		$filters = array(
+			'Address' => new PartialMatchFilter('Address'),
+			'Suburb' => new PartialMatchFilter('Suburb'),
+			'State' => new PartialMatchFilter('State'),
+			'Postcode' => new PartialMatchFilter('Postcode'),
+			'Country' => new PartialMatchFilter('Postcode'),
+			'CategoryID' => new ExactMatchFilter('CategoryID'),
+		);
+
+		return new SearchContext(
+			$this->class,
+			$fields,
+			$filters
+		);
+	}
+
+	/**
+	 * @param Member $member
+	 *
+	 * @return bool
+	 */
+	public function canView($member = false)
+	{
+		return true;
+	}
+
+	public function canEdit($member = false)
+	{
+		return Permission::check('Location_EDIT');
+	}
+
+	public function canDelete($member = false)
+	{
+		return Permission::check('Location_DELETE');
+	}
+
+	public function canCreate($member = false)
+	{
+		return Permission::check('Location_CREATE');
+	}
+
+	public function providePermissions()
+	{
+		return array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+	}
+
+	public function onBeforeWrite()
+	{
+		parent::onBeforeWrite();
+	}
 }

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

Indentation +249 added lines, -249 removed lines

@@ -2,146 +2,146 @@ 
 
 class Locator extends Page
 {
-    private static $db = array(
-        'AutoGeocode' => 'Boolean',
-        'ModalWindow' => 'Boolean',
-        'Unit' => 'Enum("m,km","m")',
-    );
-
-    private static $many_many = array(
-        'Categories' => 'LocationCategory',
-    );
-
-    private static $defaults = array(
-        'AutoGeocode' => true,
-    );
-
-    private static $singular_name = 'Locator';
-    private static $plural_name = 'Locators';
-    private static $description = 'Find locations on a map';
-
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        // Settings
-        $fields->addFieldsToTab('Root.Settings', array(
-            HeaderField::create('DisplayOptions', 'Display Options', 3),
-            OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
-            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'),
-        ));
-
-        // Filter categories
-        $config = GridFieldConfig_RelationEditor::create();
-        if (class_exists('GridFieldAddExistingSearchButton')) {
-            $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-            $config->addComponent(new GridFieldAddExistingSearchButton());
-        }
-        $categories = $this->Categories();
-        $categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
-            ->setDescription('only show locations from the selected category');
-
-            // Filter
-            $fields->addFieldsToTab('Root.Filter', array(
-                HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
-                $categoriesField,
-            ));
-
-        $this->extend('updateCMSFields', $fields);
-
-        return $fields;
-    }
-
-    public static function getLocations($filter = array(), $exclude = array(), $filterAny = array())
-    {
-        $filter['ShowInLocator'] = true;
-        $exclude['Lat'] = 0;
-
-        $Locations = Location::get()->exclude($exclude)->filter($filter)->filterAny($filterAny);
-
-        return $Locations;
-    }
-
-    public function getAreLocations()
-    {
-        return self::getLocations();
-    }
-
-    public function getAllCategories()
-    {
-        return LocationCategory::get();
-    }
-
-    public static function getPageCategories($id = null)
-    {
-        if ($id) {
-            if ($locator = self::get()->byID($id)) {
-                return $locator->Categories();
-            }
-
-            return false;
-        }
-
-        return false;
-    }
+	private static $db = array(
+		'AutoGeocode' => 'Boolean',
+		'ModalWindow' => 'Boolean',
+		'Unit' => 'Enum("m,km","m")',
+	);
+
+	private static $many_many = array(
+		'Categories' => 'LocationCategory',
+	);
+
+	private static $defaults = array(
+		'AutoGeocode' => true,
+	);
+
+	private static $singular_name = 'Locator';
+	private static $plural_name = 'Locators';
+	private static $description = 'Find locations on a map';
+
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		// Settings
+		$fields->addFieldsToTab('Root.Settings', array(
+			HeaderField::create('DisplayOptions', 'Display Options', 3),
+			OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
+			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'),
+		));
+
+		// Filter categories
+		$config = GridFieldConfig_RelationEditor::create();
+		if (class_exists('GridFieldAddExistingSearchButton')) {
+			$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
+			$config->addComponent(new GridFieldAddExistingSearchButton());
+		}
+		$categories = $this->Categories();
+		$categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
+			->setDescription('only show locations from the selected category');
+
+			// Filter
+			$fields->addFieldsToTab('Root.Filter', array(
+				HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
+				$categoriesField,
+			));
+
+		$this->extend('updateCMSFields', $fields);
+
+		return $fields;
+	}
+
+	public static function getLocations($filter = array(), $exclude = array(), $filterAny = array())
+	{
+		$filter['ShowInLocator'] = true;
+		$exclude['Lat'] = 0;
+
+		$Locations = Location::get()->exclude($exclude)->filter($filter)->filterAny($filterAny);
+
+		return $Locations;
+	}
+
+	public function getAreLocations()
+	{
+		return self::getLocations();
+	}
+
+	public function getAllCategories()
+	{
+		return LocationCategory::get();
+	}
+
+	public static function getPageCategories($id = null)
+	{
+		if ($id) {
+			if ($locator = self::get()->byID($id)) {
+				return $locator->Categories();
+			}
+
+			return false;
+		}
+
+		return false;
+	}
 }
 
 class Locator_Controller extends Page_Controller
 {
-    // allowed actions
-    private static $allowed_actions = array(
-        'xml',
-        'LocationSearch',
-    );
-
-    // Set Requirements based on input from CMS
-    public function init()
-    {
-        parent::init();
-
-        $themeDir = SSViewer::get_theme_folder();
-
-        Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-        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');
-        }
-
-        Requirements::css('locator/css/map.css');
-
-        $featured = (Locator::getLocations(array('Featured' => 1))->count() > 0) ?
-            '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,';
-
-        $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';
-
-        // 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';
-
-        // init map
-        if (Locator::getLocations()) {
-            Requirements::customScript("
+	// allowed actions
+	private static $allowed_actions = array(
+		'xml',
+		'LocationSearch',
+	);
+
+	// Set Requirements based on input from CMS
+	public function init()
+	{
+		parent::init();
+
+		$themeDir = SSViewer::get_theme_folder();
+
+		Requirements::javascript('framework/thirdparty/jquery/jquery.js');
+		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');
+		}
+
+		Requirements::css('locator/css/map.css');
+
+		$featured = (Locator::getLocations(array('Featured' => 1))->count() > 0) ?
+			'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,';
+
+		$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';
+
+		// 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';
+
+		// init map
+		if (Locator::getLocations()) {
+			Requirements::customScript("
                 $(function($) {
                     $('#map-container').storeLocator({
                         ".$load."
@@ -163,117 +163,117 @@ 
                     });
                 });
             ');
-        }
-    }
-
-    public function index(SS_HTTPRequest $request)
-    {
-
-    }
-
-    /**
-     * @param array $searchCriteria
-     * @return mixed
-     */
-    public function Items($searchCriteria = array())
-    {
-        $request = ($this->request) ? $this->request : $this->parentController->getRequest();
-        if(empty($searchCriteria)) $searchCriteria = $request->requestVars();
-
-        //if category filters are selected on Locator
-        $filterAny = array();
-        if ($this->Categories()->exists() && !isset($searchCriteria['CategoryID'])) {
-            $categories = $this->Categories();
-            foreach ($categories as $category) {
-                $filterAny['CategoryID'] = $category->ID;
-            }
-            $searchCriteria['filterAny'] = $filterAny;
-        }
-
-        // if address field has value, check against all address fields
-
-
-        $context = (method_exists('Location', 'getCustomSearchContext')) ? singleton('Location')->getCustomSearchContext() : singleton('Location')->getDefaultSearchContext();
-        $records = $context->getResults($searchCriteria);
-
-        return $records;
-    }
-
-    /**
-     * Find all locations for map.
-     *
-     * Will return a XML feed of all locations marked "show in locator".
-     *
-     * @return XML file
-     *
-     * @todo rename/refactor to allow for json/xml
-     * @todo allow $filter to run off of getVars key/val pair
-     */
-    public function xml()
-    {
-        return $this->customise(array(
-            'Locations' => $this->Items(),
-        ))->renderWith('LocationXML');
-    }
-
-    /**
-     * LocationSearch form.
-     *
-     * Search form for locations, updates map and results list via AJAX
-     *
-     * @return Form
-     */
-    public function LocationSearch()
-    {
-        $fields = FieldList::create(
-            $address = TextField::create('location', '')
-                ->setAttribute('placeholder', 'address or zip code')
-        );
-
-        $locatorCategories = Locator::getPageCategories($this->ID);
-
-        if (LocationCategory::get()->Count() > 0 && $locatorCategories && $locatorCategories->Count() != 1) {
-
-            $ct = $locatorCategories->Count();
-
-            if ($ct > 0 && $ct != 1) {
-                $categories = $locatorCategories;
-            } else {
-                $categories = LocationCategory::get();
-            }
-
-            if ($categories->count() > 0) {
-                $fields->push(
-                    DropdownField::create(
-                        'CategoryID',
-                        '',
-                        $categories->map()
-                    )->setEmptyString('Select Category'));
-            }
-        }
-
-        $actions = FieldList::create(
-            FormAction::create('doSearch', 'Search')
-        );
-
-        return Form::create($this, 'LocationSearch', $fields, $actions)
-            ->setFormMethod('get');
-    }
-
-    // Results filtered by query
-    function doSearch($data, $form, $request)
-    {
-        if (isset($data['location'])) {
-            $location = $data['location'];
-            $data['Address'] = $location;
-            $data['Suburb'] = $location;
-            $data['State'] = $location;
-            $data['Postcode'] = $location;
-            $data['Country'] = $location;
-        }
-        return $this->render(array(
-            'Items' => $this->Items($data),
-            'AdvSearchForm' => $form
-        ));
-    }
+		}
+	}
+
+	public function index(SS_HTTPRequest $request)
+	{
+
+	}
+
+	/**
+	 * @param array $searchCriteria
+	 * @return mixed
+	 */
+	public function Items($searchCriteria = array())
+	{
+		$request = ($this->request) ? $this->request : $this->parentController->getRequest();
+		if(empty($searchCriteria)) $searchCriteria = $request->requestVars();
+
+		//if category filters are selected on Locator
+		$filterAny = array();
+		if ($this->Categories()->exists() && !isset($searchCriteria['CategoryID'])) {
+			$categories = $this->Categories();
+			foreach ($categories as $category) {
+				$filterAny['CategoryID'] = $category->ID;
+			}
+			$searchCriteria['filterAny'] = $filterAny;
+		}
+
+		// if address field has value, check against all address fields
+
+
+		$context = (method_exists('Location', 'getCustomSearchContext')) ? singleton('Location')->getCustomSearchContext() : singleton('Location')->getDefaultSearchContext();
+		$records = $context->getResults($searchCriteria);
+
+		return $records;
+	}
+
+	/**
+	 * Find all locations for map.
+	 *
+	 * Will return a XML feed of all locations marked "show in locator".
+	 *
+	 * @return XML file
+	 *
+	 * @todo rename/refactor to allow for json/xml
+	 * @todo allow $filter to run off of getVars key/val pair
+	 */
+	public function xml()
+	{
+		return $this->customise(array(
+			'Locations' => $this->Items(),
+		))->renderWith('LocationXML');
+	}
+
+	/**
+	 * LocationSearch form.
+	 *
+	 * Search form for locations, updates map and results list via AJAX
+	 *
+	 * @return Form
+	 */
+	public function LocationSearch()
+	{
+		$fields = FieldList::create(
+			$address = TextField::create('location', '')
+				->setAttribute('placeholder', 'address or zip code')
+		);
+
+		$locatorCategories = Locator::getPageCategories($this->ID);
+
+		if (LocationCategory::get()->Count() > 0 && $locatorCategories && $locatorCategories->Count() != 1) {
+
+			$ct = $locatorCategories->Count();
+
+			if ($ct > 0 && $ct != 1) {
+				$categories = $locatorCategories;
+			} else {
+				$categories = LocationCategory::get();
+			}
+
+			if ($categories->count() > 0) {
+				$fields->push(
+					DropdownField::create(
+						'CategoryID',
+						'',
+						$categories->map()
+					)->setEmptyString('Select Category'));
+			}
+		}
+
+		$actions = FieldList::create(
+			FormAction::create('doSearch', 'Search')
+		);
+
+		return Form::create($this, 'LocationSearch', $fields, $actions)
+			->setFormMethod('get');
+	}
+
+	// Results filtered by query
+	function doSearch($data, $form, $request)
+	{
+		if (isset($data['location'])) {
+			$location = $data['location'];
+			$data['Address'] = $location;
+			$data['Suburb'] = $location;
+			$data['State'] = $location;
+			$data['Postcode'] = $location;
+			$data['Country'] = $location;
+		}
+		return $this->render(array(
+			'Items' => $this->Items($data),
+			'AdvSearchForm' => $form
+		));
+	}
 }

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();

Braces +3 added lines, -1 removed lines

@@ -178,7 +178,9 @@
     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();