dynamic / silverstripe-locator

tests/LocationTest.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     {
         $location = $this->objFromFixture('Location', 'dynamic');
 
-        $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
+        $coords = ((int) $location->Lat != 0 && (int) $location->Lng != 0) ? 'true' : 'false';
 
         $this->assertEquals($coords, $location->getCoords());
     }

Indentation +179 added lines, -179 removed lines

@@ -6,183 +6,183 @@
 class LocationTest extends SapphireTest
 {
 
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'locator/tests/Locator_Test.yml';
-
-    /**
-     *
-     */
-    public function testGetCoords()
-    {
-        $location = $this->objFromFixture('Location', 'dynamic');
-
-        $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
-
-        $this->assertEquals($coords, $location->getCoords());
-    }
-
-    /**
-     *
-     */
-    public function testFieldLabels()
-    {
-        $location = $this->objFromFixture('Location', 'dynamic');
-        $labels = $location->FieldLabels();
-        $expected = array(
-            'Title' => 'Name',
-            'Featured' => 'Featured',
-            'Website' => 'Website',
-            'Phone' => 'Phone',
-            'Email' => 'Email',
-            'EmailAddress' => 'Email Address',
-            'ShowInLocator' => 'Show',
-            'Address' => 'Address',
-            'Suburb' => 'City',
-            'State' => 'State',
-            'Postcode' => 'Postal Code',
-            'Country' => 'Country',
-            'Lat' => 'Lat',
-            'Lng' => 'Lng',
-            'Category' => 'Category',
-            'ShowInLocator.NiceAsBoolean' => 'Show',
-            'Category.Name' => 'Category',
-            'Category.ID' => 'Category',
-            'Featured.NiceAsBoolean' => 'Featured',
-            'Coords' => 'Coords',
-        );
-        $this->assertEquals($expected, $labels);
-    }
-
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        $object = new Location();
-        $fieldset = $object->getCMSFields();
-        $this->assertTrue(is_a($fieldset, 'FieldList'));
-    }
-
-    /**
-     *
-     */
-    public function testValidate()
-    {
-    }
-
-    /**
-     *
-     */
-    public function testEmailAddress()
-    {
-    }
-
-    /**
-     *
-     */
-    public function testCanView()
-    {
-        $object = $this->objFromFixture('Location', 'dynamic');
-        $object->write();
-
-        $this->assertTrue($object->canView());
-
-        $nullMember = Member::create();
-        $nullMember->write();
-
-        $this->assertTrue($object->canView($nullMember));
-
-        $nullMember->delete();
-    }
-
-    /**
-     *
-     */
-    public function testCanEdit()
-    {
-        $object = $this->objFromFixture('Location', 'dynamic');
-        $object->write();
-
-        $objectID = $object->ID;
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture('Member', 'locationcreate');
-        $edit = $this->objFromFixture('Member', 'locationedit');
-        $delete = $this->objFromFixture('Member', 'locationdelete');
-
-        $originalTitle = $object->Title;
-        $this->assertEquals($originalTitle, 'Dynamic, Inc.');
-
-        $this->assertTrue($object->canEdit($edit));
-        $this->assertFalse($object->canEdit($create));
-        $this->assertFalse($object->canEdit($delete));
-
-        $object->Title = 'Changed Title';
-        $object->write();
-
-        $testEdit = Location::get()->byID($objectID);
-        $this->assertEquals($testEdit->Title, 'Changed Title');
-    }
-
-    /**
-     *
-     */
-    public function testCanDelete()
-    {
-        $object = $this->objFromFixture('Location', 'dynamic');
-        $object->write();
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture('Member', 'locationcreate');
-        $edit = $this->objFromFixture('Member', 'locationedit');
-        $delete = $this->objFromFixture('Member', 'locationdelete');
-
-        $this->assertTrue($object->canDelete($delete));
-        $this->assertFalse($object->canDelete($create));
-        $this->assertFalse($object->canDelete($edit));
-
-        $checkObject = $object;
-        $object->delete();
-
-        $this->assertEquals($checkObject->ID, 0);
-    }
-
-    /**
-     *
-     */
-    public function testCanCreate()
-    {
-        $object = singleton('Location');
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture('Member', 'locationcreate');
-        $edit = $this->objFromFixture('Member', 'locationedit');
-        $delete = $this->objFromFixture('Member', 'locationdelete');
-
-        $this->assertTrue($object->canCreate($create));
-        $this->assertFalse($object->canCreate($edit));
-        $this->assertFalse($object->canCreate($delete));
-
-        $nullMember = Member::create();
-        $nullMember->write();
-        $this->assertFalse($object->canCreate($nullMember));
-
-        $nullMember->delete();
-    }
-
-    /**
-     *
-     */
-    public function testProvidePermissions()
-    {
-        $object = Location::create();
-        $expected = array(
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        );
-        $this->assertEquals($expected, $object->providePermissions());
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = 'locator/tests/Locator_Test.yml';
+
+	/**
+	 *
+	 */
+	public function testGetCoords()
+	{
+		$location = $this->objFromFixture('Location', 'dynamic');
+
+		$coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
+
+		$this->assertEquals($coords, $location->getCoords());
+	}
+
+	/**
+	 *
+	 */
+	public function testFieldLabels()
+	{
+		$location = $this->objFromFixture('Location', 'dynamic');
+		$labels = $location->FieldLabels();
+		$expected = array(
+			'Title' => 'Name',
+			'Featured' => 'Featured',
+			'Website' => 'Website',
+			'Phone' => 'Phone',
+			'Email' => 'Email',
+			'EmailAddress' => 'Email Address',
+			'ShowInLocator' => 'Show',
+			'Address' => 'Address',
+			'Suburb' => 'City',
+			'State' => 'State',
+			'Postcode' => 'Postal Code',
+			'Country' => 'Country',
+			'Lat' => 'Lat',
+			'Lng' => 'Lng',
+			'Category' => 'Category',
+			'ShowInLocator.NiceAsBoolean' => 'Show',
+			'Category.Name' => 'Category',
+			'Category.ID' => 'Category',
+			'Featured.NiceAsBoolean' => 'Featured',
+			'Coords' => 'Coords',
+		);
+		$this->assertEquals($expected, $labels);
+	}
+
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		$object = new Location();
+		$fieldset = $object->getCMSFields();
+		$this->assertTrue(is_a($fieldset, 'FieldList'));
+	}
+
+	/**
+	 *
+	 */
+	public function testValidate()
+	{
+	}
+
+	/**
+	 *
+	 */
+	public function testEmailAddress()
+	{
+	}
+
+	/**
+	 *
+	 */
+	public function testCanView()
+	{
+		$object = $this->objFromFixture('Location', 'dynamic');
+		$object->write();
+
+		$this->assertTrue($object->canView());
+
+		$nullMember = Member::create();
+		$nullMember->write();
+
+		$this->assertTrue($object->canView($nullMember));
+
+		$nullMember->delete();
+	}
+
+	/**
+	 *
+	 */
+	public function testCanEdit()
+	{
+		$object = $this->objFromFixture('Location', 'dynamic');
+		$object->write();
+
+		$objectID = $object->ID;
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture('Member', 'locationcreate');
+		$edit = $this->objFromFixture('Member', 'locationedit');
+		$delete = $this->objFromFixture('Member', 'locationdelete');
+
+		$originalTitle = $object->Title;
+		$this->assertEquals($originalTitle, 'Dynamic, Inc.');
+
+		$this->assertTrue($object->canEdit($edit));
+		$this->assertFalse($object->canEdit($create));
+		$this->assertFalse($object->canEdit($delete));
+
+		$object->Title = 'Changed Title';
+		$object->write();
+
+		$testEdit = Location::get()->byID($objectID);
+		$this->assertEquals($testEdit->Title, 'Changed Title');
+	}
+
+	/**
+	 *
+	 */
+	public function testCanDelete()
+	{
+		$object = $this->objFromFixture('Location', 'dynamic');
+		$object->write();
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture('Member', 'locationcreate');
+		$edit = $this->objFromFixture('Member', 'locationedit');
+		$delete = $this->objFromFixture('Member', 'locationdelete');
+
+		$this->assertTrue($object->canDelete($delete));
+		$this->assertFalse($object->canDelete($create));
+		$this->assertFalse($object->canDelete($edit));
+
+		$checkObject = $object;
+		$object->delete();
+
+		$this->assertEquals($checkObject->ID, 0);
+	}
+
+	/**
+	 *
+	 */
+	public function testCanCreate()
+	{
+		$object = singleton('Location');
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture('Member', 'locationcreate');
+		$edit = $this->objFromFixture('Member', 'locationedit');
+		$delete = $this->objFromFixture('Member', 'locationdelete');
+
+		$this->assertTrue($object->canCreate($create));
+		$this->assertFalse($object->canCreate($edit));
+		$this->assertFalse($object->canCreate($delete));
+
+		$nullMember = Member::create();
+		$nullMember->write();
+		$this->assertFalse($object->canCreate($nullMember));
+
+		$nullMember->delete();
+	}
+
+	/**
+	 *
+	 */
+	public function testProvidePermissions()
+	{
+		$object = Location::create();
+		$expected = array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+		$this->assertEquals($expected, $object->providePermissions());
+	}
 }

tests/Locator_Test.php

Indentation +36 added lines, -36 removed lines

@@ -6,45 +6,45 @@
 class Locator_Test extends FunctionalTest
 {
 
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'locator/tests/Locator_Test.yml';
-    /**
-     * @var bool
-     */
-    protected static $disable_themes = true;
-    /**
-     * @var bool
-     */
-    protected static $use_draft_site = false;
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = 'locator/tests/Locator_Test.yml';
+	/**
+	 * @var bool
+	 */
+	protected static $disable_themes = true;
+	/**
+	 * @var bool
+	 */
+	protected static $use_draft_site = false;
 
-    /**
-     *
-     */
-    public function setUp()
-    {
-        parent::setUp();
+	/**
+	 *
+	 */
+	public function setUp()
+	{
+		parent::setUp();
 
-        ini_set('display_errors', 1);
-        ini_set('log_errors', 1);
-        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-    }
+		ini_set('display_errors', 1);
+		ini_set('log_errors', 1);
+		error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+	}
 
-    /**
-     *
-     */
-    public function logOut()
-    {
-        $this->session()->clear('loggedInAs');
-        $this->session()->clear('logInWithPermission');
-    }
+	/**
+	 *
+	 */
+	public function logOut()
+	{
+		$this->session()->clear('loggedInAs');
+		$this->session()->clear('logInWithPermission');
+	}
 
-    /**
-     *
-     */
-    public function testLocator_Test()
-    {
-    }
+	/**
+	 *
+	 */
+	public function testLocator_Test()
+	{
+	}
 
 }

code/objects/Location.php

Doc Comments +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
     }
 
     /**
-     * @return bool|string
+     * @return string|false
      */
     public function EmailAddress()
     {

Indentation +235 added lines, -235 removed lines

@@ -16,240 +16,240 @@
 class Location extends DataObject implements PermissionProvider
 {
 
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Title' => 'Varchar(255)',
-        'Featured' => 'Boolean',
-        'Website' => 'Varchar(255)',
-        'Phone' => 'Varchar(40)',
-        'Email' => 'Varchar(255)',
-        'EmailAddress' => 'Varchar(255)',
-        'ShowInLocator' => 'Boolean',
-    );
-
-    /**
-     * @var array
-     */
-    private static $has_one = array(
-        'Category' => 'LocationCategory',
-    );
-
-    /**
-     * @var array
-     */
-    private static $casting = array(
-        'distance' => 'Int',
-    );
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Title';
-
-    /**
-     * @var array
-     */
-    private static $defaults = array(
-        'ShowInLocator' => true,
-    );
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Location';
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locations';
-
-    /**
-     * api access via Restful Server module
-     *
-     * @var bool
-     */
-    private static $api_access = true;
-
-    /**
-     * search fields for Model Admin
-     *
-     * @var array
-     */
-    private static $searchable_fields = array(
-        'Title',
-        'Address',
-        'Suburb',
-        'State',
-        'Postcode',
-        'Country',
-        'Website',
-        'Phone',
-        'Email',
-        'Category.ID',
-        'ShowInLocator',
-        'Featured',
-    );
-
-    /**
-     * columns for grid field
-     *
-     * @var array
-     */
-    private static $summary_fields = array(
-        'Title',
-        'Address',
-        'Suburb',
-        'State',
-        'Postcode',
-        'Country',
-        'Category.Name',
-        'ShowInLocator.NiceAsBoolean',
-        'Featured.NiceAsBoolean',
-        'Coords',
-    );
-
-    /**
-     * Coords status for $summary_fields
-     *
-     * @return string
-     */
-    public function getCoords()
-    {
-        return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
-    }
-
-    /**
-     * custom labels for fields
-     *
-     * @param bool $includerelations
-     * @return array|string
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-
-        $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;
-    }
-
-    /**
-     * @return FieldList
-     */
-    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;
-    }
-
-    /**
-     * @return ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
-
-        return $result;
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function EmailAddress()
-    {
-        Deprecation::notice('3.0', 'Use "$Email" instead.');
-        if ($this->Email) {
-            return $this->Email;
-        } elseif ($this->EmailAddress) {
-            return $this->EmailAddress;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param null|Member $member
-     *
-     * @return bool
-     */
-    public function canView($member = null)
-    {
-        return true;
-    }
-
-    /**
-     * @param null|Member $member
-     * @return bool|int
-     */
-    public function canEdit($member = null)
-    {
-        return Permission::check('Location_EDIT', 'any', $member);
-    }
-
-    /**
-     * @param null|Member $member
-     * @return bool|int
-     */
-    public function canDelete($member = null)
-    {
-        return Permission::check('Location_DELETE', 'any', $member);
-    }
-
-    /**
-     * @param null|Member $member
-     * @return bool|int
-     */
-    public function canCreate($member = null)
-    {
-        return Permission::check('Location_CREATE', 'any', $member);
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return array(
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        );
-    }
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Title' => 'Varchar(255)',
+		'Featured' => 'Boolean',
+		'Website' => 'Varchar(255)',
+		'Phone' => 'Varchar(40)',
+		'Email' => 'Varchar(255)',
+		'EmailAddress' => 'Varchar(255)',
+		'ShowInLocator' => 'Boolean',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = array(
+		'Category' => 'LocationCategory',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $casting = array(
+		'distance' => 'Int',
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Title';
+
+	/**
+	 * @var array
+	 */
+	private static $defaults = array(
+		'ShowInLocator' => true,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Location';
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locations';
+
+	/**
+	 * api access via Restful Server module
+	 *
+	 * @var bool
+	 */
+	private static $api_access = true;
+
+	/**
+	 * search fields for Model Admin
+	 *
+	 * @var array
+	 */
+	private static $searchable_fields = array(
+		'Title',
+		'Address',
+		'Suburb',
+		'State',
+		'Postcode',
+		'Country',
+		'Website',
+		'Phone',
+		'Email',
+		'Category.ID',
+		'ShowInLocator',
+		'Featured',
+	);
+
+	/**
+	 * columns for grid field
+	 *
+	 * @var array
+	 */
+	private static $summary_fields = array(
+		'Title',
+		'Address',
+		'Suburb',
+		'State',
+		'Postcode',
+		'Country',
+		'Category.Name',
+		'ShowInLocator.NiceAsBoolean',
+		'Featured.NiceAsBoolean',
+		'Coords',
+	);
+
+	/**
+	 * Coords status for $summary_fields
+	 *
+	 * @return string
+	 */
+	public function getCoords()
+	{
+		return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
+	}
+
+	/**
+	 * custom labels for fields
+	 *
+	 * @param bool $includerelations
+	 * @return array|string
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+
+		$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;
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	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;
+	}
+
+	/**
+	 * @return ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
+
+		return $result;
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function EmailAddress()
+	{
+		Deprecation::notice('3.0', 'Use "$Email" instead.');
+		if ($this->Email) {
+			return $this->Email;
+		} elseif ($this->EmailAddress) {
+			return $this->EmailAddress;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param null|Member $member
+	 *
+	 * @return bool
+	 */
+	public function canView($member = null)
+	{
+		return true;
+	}
+
+	/**
+	 * @param null|Member $member
+	 * @return bool|int
+	 */
+	public function canEdit($member = null)
+	{
+		return Permission::check('Location_EDIT', 'any', $member);
+	}
+
+	/**
+	 * @param null|Member $member
+	 * @return bool|int
+	 */
+	public function canDelete($member = null)
+	{
+		return Permission::check('Location_DELETE', 'any', $member);
+	}
+
+	/**
+	 * @param null|Member $member
+	 * @return bool|int
+	 */
+	public function canCreate($member = null)
+	{
+		return Permission::check('Location_CREATE', 'any', $member);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+	}
 
 }

tests/LocatorTest.php

Indentation +116 added lines, -116 removed lines

@@ -6,121 +6,121 @@
 class LocatorTest extends Locator_Test
 {
 
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        $object = new Locator();
-        $fieldset = $object->getCMSFields();
-        $this->assertInstanceOf('FieldList', $fieldset);
-    }
-
-    /**
-     *
-     */
-    public function testLocations()
-    {
-        $filter = Config::inst()->get('Locator_Controller', 'base_filter');
-        $filterAny = Config::inst()->get('Locator_Controller', 'base_filter_any');
-        $exclude = Config::inst()->get('Locator_Controller', 'base_exclude');
-
-        $locator = $this->objFromFixture('Locator', 'locator1');
-
-        $locatorController = new Locator_Controller($locator);
-
-        $locations = Locator::get_locations($locatorController->getRequest(), $locator->ID, $filter, $filterAny, $exclude);
-        $locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude);
-        $this->assertEquals($locations->count(), $locations2->count());
-    }
-
-    /**
-     *
-     */
-    public function testGetAllCategories()
-    {
-        $locator = singleton('Locator');
-        $count = LocationCategory::get();
-        $this->assertEquals($locator->getAllCategories(), $count);
-    }
-
-    /**
-     *
-     */
-    public function testGetPageCategories()
-    {
-        $locator = Locator::create();
-        $this->assertFalse($locator->getPageCategories());
-
-        $this->assertFalse($locator->getPageCategories(500));
-
-        $locator->write();
-        $category = $this->objFromFixture('LocationCategory', 'service');
-        $locator->Categories()->add($category);
-        $this->assertEquals($locator->getPageCategories($locator->ID), $locator->Categories());
-    }
-
-    /**
-     *
-     */
-    public function testInit()
-    {
-    }
-
-    /**
-     *
-     */
-    public function testIndex()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $controller = Locator_Controller::create($locator);
-        $this->assertInstanceOf('ViewableData', $controller->index($controller->request));
-    }
-
-    /**
-     *
-     */
-    public function testXml()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $controller = Locator_Controller::create($locator);
-        $this->assertInstanceOf('HTMLText', $controller->xml($controller->request));
-    }
-
-    /**
-     *
-     */
-    public function testItems()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $controller = Locator_Controller::create($locator);
-
-        $filter = array('ShowInLocator' => 1);
-        $exclude = ['Lat' => 0.00000, 'Lng' => 0.00000];
-
-        $locations = $controller->getLocations();
-        $locations2 = Location::get()->filter($filter)->exclude($exclude);
-        $this->assertEquals($locations->count(), $locations2->count());
-    }
-
-    /**
-     *
-     */
-    public function testLocationSearch()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $object = Locator_Controller::create($locator);
-        $form = $object->LocationSearch();
-        $this->assertTrue(is_a($form, 'Form'));
-
-        $category = $this->objFromFixture('LocationCategory', 'service');
-        $category2 = $this->objFromFixture('LocationCategory', 'manufacturing');
-        $locator->Categories()->add($category);
-        $locator->Categories()->add($category2);
-
-        $form = $object->LocationSearch();
-        $fields = $form->Fields();
-        $this->assertNotNull($fields->fieldByName('CategoryID'));
-    }
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		$object = new Locator();
+		$fieldset = $object->getCMSFields();
+		$this->assertInstanceOf('FieldList', $fieldset);
+	}
+
+	/**
+	 *
+	 */
+	public function testLocations()
+	{
+		$filter = Config::inst()->get('Locator_Controller', 'base_filter');
+		$filterAny = Config::inst()->get('Locator_Controller', 'base_filter_any');
+		$exclude = Config::inst()->get('Locator_Controller', 'base_exclude');
+
+		$locator = $this->objFromFixture('Locator', 'locator1');
+
+		$locatorController = new Locator_Controller($locator);
+
+		$locations = Locator::get_locations($locatorController->getRequest(), $locator->ID, $filter, $filterAny, $exclude);
+		$locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude);
+		$this->assertEquals($locations->count(), $locations2->count());
+	}
+
+	/**
+	 *
+	 */
+	public function testGetAllCategories()
+	{
+		$locator = singleton('Locator');
+		$count = LocationCategory::get();
+		$this->assertEquals($locator->getAllCategories(), $count);
+	}
+
+	/**
+	 *
+	 */
+	public function testGetPageCategories()
+	{
+		$locator = Locator::create();
+		$this->assertFalse($locator->getPageCategories());
+
+		$this->assertFalse($locator->getPageCategories(500));
+
+		$locator->write();
+		$category = $this->objFromFixture('LocationCategory', 'service');
+		$locator->Categories()->add($category);
+		$this->assertEquals($locator->getPageCategories($locator->ID), $locator->Categories());
+	}
+
+	/**
+	 *
+	 */
+	public function testInit()
+	{
+	}
+
+	/**
+	 *
+	 */
+	public function testIndex()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$controller = Locator_Controller::create($locator);
+		$this->assertInstanceOf('ViewableData', $controller->index($controller->request));
+	}
+
+	/**
+	 *
+	 */
+	public function testXml()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$controller = Locator_Controller::create($locator);
+		$this->assertInstanceOf('HTMLText', $controller->xml($controller->request));
+	}
+
+	/**
+	 *
+	 */
+	public function testItems()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$controller = Locator_Controller::create($locator);
+
+		$filter = array('ShowInLocator' => 1);
+		$exclude = ['Lat' => 0.00000, 'Lng' => 0.00000];
+
+		$locations = $controller->getLocations();
+		$locations2 = Location::get()->filter($filter)->exclude($exclude);
+		$this->assertEquals($locations->count(), $locations2->count());
+	}
+
+	/**
+	 *
+	 */
+	public function testLocationSearch()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$object = Locator_Controller::create($locator);
+		$form = $object->LocationSearch();
+		$this->assertTrue(is_a($form, 'Form'));
+
+		$category = $this->objFromFixture('LocationCategory', 'service');
+		$category2 = $this->objFromFixture('LocationCategory', 'manufacturing');
+		$locator->Categories()->add($category);
+		$locator->Categories()->add($category2);
+
+		$form = $object->LocationSearch();
+		$fields = $form->Fields();
+		$this->assertNotNull($fields->fieldByName('CategoryID'));
+	}
 
 }

code/pages/Locator.php

Indentation +349 added lines, -349 removed lines

@@ -11,168 +11,168 @@ 
 class Locator extends Page
 {
 
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'AutoGeocode' => 'Boolean',
-        'ModalWindow' => 'Boolean',
-        'Unit' => 'Enum("m,km","m")',
-    );
-
-    /**
-     * @var array
-     */
-    private static $many_many = array(
-        'Categories' => 'LocationCategory',
-    );
-
-    /**
-     * @var array
-     */
-    private static $defaults = array(
-        'AutoGeocode' => true,
-    );
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Locator';
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locators';
-    /**
-     * @var string
-     */
-    private static $description = 'Find locations on a map';
-
-    /**
-     * @return FieldList
-     */
-    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;
-    }
-
-    /**
-     * @param SS_HTTPRequest|null $request
-     * @param int $locatorID
-     * @param array $filter
-     * @param array $filterAny
-     * @param array $exclude
-     * @param string $locationClass
-     * @param null $filterByCallback
-     * @return ArrayList
-     */
-    public static function get_locations(
-        SS_HTTPRequest $request = null,
-        $locatorID,
-        $filter = [],
-        $filterAny = [],
-        $exclude = [],
-        $locationClass = 'Location',
-        $filterByCallback = null
-    )
-    {
-
-        $request = ($request != null) ? $request : Controller::curr()->getRequest();
-
-        // search across all address related fields
-        $address = ($request->getVar('Address')) ? $request->getVar('Address') : false;
-        if ($address && !Locator::get()->byID($locatorID)->AutoGeocode) {
-            $filterAny['Address:PartialMatch'] = $address;
-            $filterAny['Suburb:PartialMatch'] = $address;
-            $filterAny['State:PartialMatch'] = $address;
-            $filterAny['Postcode:PartialMatch'] = $address;
-            $filterAny['Country:PartialMatch'] = $address;
-        }
-
-        // search for category from form, else categories from Locator
-        $category = ($request->getVar('CategoryID')) ? $request->getVar('CategoryID') : false;
-        if ($category) {
-            $filter['CategoryID:ExactMatch'] = $category;
-        } elseif (Locator::get()->byID($locatorID)->Categories()->exists()) {
-            $categories = Locator::get()->byID($locatorID)->Categories();
-            $categoryArray = array();
-            foreach ($categories as $category) {
-                array_push($categoryArray, $category->ID);
-            }
-            $filter['CategoryID'] = $categoryArray;
-        }
-
-        $locationsList = ArrayList::create();
-
-        $locations = $locationClass::get()->filter($filter)->exclude($exclude);
-
-        if (!empty($filterAny)) {
-            $locations = $locations->filterAny($filterAny);
-        }
-
-        if ($filterByCallback !== null && is_callable($filterByCallback)) {
-            $locations = $locations->filterByCallback($filterByCallback);
-        }
-
-        if ($locations->exists()) {
-            $locationsList->merge($locations);
-        }
-
-        return $locationsList;
-    }
-
-    /**
-     * @return DataList
-     */
-    public static function getAllCategories()
-    {
-        return LocationCategory::get();
-    }
-
-    /**
-     * @param null $id
-     * @return bool
-     */
-    public static function getPageCategories($id = null)
-    {
-        if ($id) {
-            if ($locator = self::get()->byID($id)) {
-                return $locator->Categories();
-            }
-
-            return false;
-        }
-
-        return false;
-    }
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'AutoGeocode' => 'Boolean',
+		'ModalWindow' => 'Boolean',
+		'Unit' => 'Enum("m,km","m")',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $many_many = array(
+		'Categories' => 'LocationCategory',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $defaults = array(
+		'AutoGeocode' => true,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Locator';
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locators';
+	/**
+	 * @var string
+	 */
+	private static $description = 'Find locations on a map';
+
+	/**
+	 * @return FieldList
+	 */
+	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;
+	}
+
+	/**
+	 * @param SS_HTTPRequest|null $request
+	 * @param int $locatorID
+	 * @param array $filter
+	 * @param array $filterAny
+	 * @param array $exclude
+	 * @param string $locationClass
+	 * @param null $filterByCallback
+	 * @return ArrayList
+	 */
+	public static function get_locations(
+		SS_HTTPRequest $request = null,
+		$locatorID,
+		$filter = [],
+		$filterAny = [],
+		$exclude = [],
+		$locationClass = 'Location',
+		$filterByCallback = null
+	)
+	{
+
+		$request = ($request != null) ? $request : Controller::curr()->getRequest();
+
+		// search across all address related fields
+		$address = ($request->getVar('Address')) ? $request->getVar('Address') : false;
+		if ($address && !Locator::get()->byID($locatorID)->AutoGeocode) {
+			$filterAny['Address:PartialMatch'] = $address;
+			$filterAny['Suburb:PartialMatch'] = $address;
+			$filterAny['State:PartialMatch'] = $address;
+			$filterAny['Postcode:PartialMatch'] = $address;
+			$filterAny['Country:PartialMatch'] = $address;
+		}
+
+		// search for category from form, else categories from Locator
+		$category = ($request->getVar('CategoryID')) ? $request->getVar('CategoryID') : false;
+		if ($category) {
+			$filter['CategoryID:ExactMatch'] = $category;
+		} elseif (Locator::get()->byID($locatorID)->Categories()->exists()) {
+			$categories = Locator::get()->byID($locatorID)->Categories();
+			$categoryArray = array();
+			foreach ($categories as $category) {
+				array_push($categoryArray, $category->ID);
+			}
+			$filter['CategoryID'] = $categoryArray;
+		}
+
+		$locationsList = ArrayList::create();
+
+		$locations = $locationClass::get()->filter($filter)->exclude($exclude);
+
+		if (!empty($filterAny)) {
+			$locations = $locations->filterAny($filterAny);
+		}
+
+		if ($filterByCallback !== null && is_callable($filterByCallback)) {
+			$locations = $locations->filterByCallback($filterByCallback);
+		}
+
+		if ($locations->exists()) {
+			$locationsList->merge($locations);
+		}
+
+		return $locationsList;
+	}
+
+	/**
+	 * @return DataList
+	 */
+	public static function getAllCategories()
+	{
+		return LocationCategory::get();
+	}
+
+	/**
+	 * @param null $id
+	 * @return bool
+	 */
+	public static function getPageCategories($id = null)
+	{
+		if ($id) {
+			if ($locator = self::get()->byID($id)) {
+				return $locator->Categories();
+			}
+
+			return false;
+		}
+
+		return false;
+	}
 
 
 }
@@ -182,105 +182,105 @@ 
  */
 class Locator_Controller extends Page_Controller
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = [
-        'xml',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter = [
-        'ShowInLocator' => true,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter_any = [];
-
-    /**
-     * @var array
-     */
-    private static $base_exclude = [
-        'Lat' => 0.00000,
-        'Lng' => 0.00000,
-    ];
-
-    /**
-     * @var
-     */
-    private $locations;
-
-    /**
-     * Set Requirements based on input from CMS
-     */
-    public function init()
-    {
-        parent::init();
-
-        $themeDir = SSViewer::get_theme_folder();
-
-        // google maps api key
-        $key = Config::inst()->get('GoogleGeocoding', 'google_api_key');
-
-        $locations = $this->getLocations();
-
-        Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-        if ($locations) {
-            Requirements::javascript('http://maps.google.com/maps/api/js?key=' . $key);
-            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');
-
-        $featuredInList = ($locations->filter('Featured', true)->count() > 0);
-
-        $featured = $featuredInList
-            ? 'featuredLocations: true'
-            : 'featuredLocations: false';
-
-        // map config based on user input in Settings tab
-        // AutoGeocode or Full Map
-        if ($this->data()->AutoGeocode) {
-            $load = $featuredInList
-                ? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'
-                : 'autoGeocode: true, fullMapStart: false,';
-        } else {
-            $load = '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"';
-
-        // pass GET variables to xml action
-        $vars = $this->request->getVars();
-        unset($vars['url']);
-        unset($vars['action_index']);
-        $url = '';
-        if (count($vars)) {
-            $url .= '?' . http_build_query($vars);
-        }
-        $link = $this->Link() . 'xml.xml' . $url;
-
-        // init map
-        if ($locations) {
-            Requirements::customScript("
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = [
+		'xml',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter = [
+		'ShowInLocator' => true,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter_any = [];
+
+	/**
+	 * @var array
+	 */
+	private static $base_exclude = [
+		'Lat' => 0.00000,
+		'Lng' => 0.00000,
+	];
+
+	/**
+	 * @var
+	 */
+	private $locations;
+
+	/**
+	 * Set Requirements based on input from CMS
+	 */
+	public function init()
+	{
+		parent::init();
+
+		$themeDir = SSViewer::get_theme_folder();
+
+		// google maps api key
+		$key = Config::inst()->get('GoogleGeocoding', 'google_api_key');
+
+		$locations = $this->getLocations();
+
+		Requirements::javascript('framework/thirdparty/jquery/jquery.js');
+		if ($locations) {
+			Requirements::javascript('http://maps.google.com/maps/api/js?key=' . $key);
+			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');
+
+		$featuredInList = ($locations->filter('Featured', true)->count() > 0);
+
+		$featured = $featuredInList
+			? 'featuredLocations: true'
+			: 'featuredLocations: false';
+
+		// map config based on user input in Settings tab
+		// AutoGeocode or Full Map
+		if ($this->data()->AutoGeocode) {
+			$load = $featuredInList
+				? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'
+				: 'autoGeocode: true, fullMapStart: false,';
+		} else {
+			$load = '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"';
+
+		// pass GET variables to xml action
+		$vars = $this->request->getVars();
+		unset($vars['url']);
+		unset($vars['action_index']);
+		$url = '';
+		if (count($vars)) {
+			$url .= '?' . http_build_query($vars);
+		}
+		$link = $this->Link() . 'xml.xml' . $url;
+
+		// init map
+		if ($locations) {
+			Requirements::customScript("
                 $(function($) {
                     $('#map-container').storeLocator({
                         " . $load . "
@@ -301,93 +301,93 @@ 
                     });
                 });
             ');
-        }
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     *
-     * @return ViewableData_Customised
-     */
-    public function index(SS_HTTPRequest $request)
-    {
-        $locations = $this->getLocations();
-
-        return $this->customise(array(
-            'Locations' => $locations,
-        ));
-    }
-
-    /**
-     * Return a XML feed of all locations marked "show in locator"
-     *
-     * @param SS_HTTPRequest $request
-     * @return HTMLText
-     */
-    public function xml(SS_HTTPRequest $request)
-    {
-        $this->setLocations($request);
-        $locations = $this->getLocations();
-
-        return $this->customise(array(
-            'Locations' => $locations,
-        ))->renderWith('LocationXML');
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getLocations()
-    {
-        if (!$this->locations) {
-            $this->setLocations($this->request);
-        }
-        return $this->locations;
-    }
-
-    /**
-     * @param SS_HTTPRequest|null $request
-     * @return $this
-     */
-    public function setLocations(SS_HTTPRequest $request = null)
-    {
-        if ($request === null) {
-            $request = $this->request;
-        }
-        $filter = $this->config()->get('base_filter');
-        $this->extend('updateLocatorFilter', $filter, $request);
-
-        $filterAny = $this->config()->get('base_filter_any');
-        $this->extend('updateLocatorFilterAny', $filterAny, $request);
-
-        $exclude = $this->config()->get('base_exclude');
-        $this->extend('updateLocatorExclude', $exclude, $request);
-
-        $this->locations = Locator::get_locations($request, $this->data()->ID, $filter, $filterAny, $exclude);
-        return $this;
-    }
-
-    /**
-     * LocationSearch form.
-     *
-     * Search form for locations, updates map and results list via AJAX
-     *
-     * @return Form
-     */
-    public function LocationSearch()
-    {
-
-        if (class_exists('BootstrapForm')) {
-            $form = LocatorBootstrapForm::create($this, 'LocationSearch');
-        } else {
-            $form = LocatorForm::create($this, 'LocationSearch');
-        }
-
-        return $form
-            ->setFormMethod('GET')
-            ->setFormAction($this->Link())
-            ->disableSecurityToken()
-            ->loadDataFrom($this->request->getVars());
-    }
+		}
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return ViewableData_Customised
+	 */
+	public function index(SS_HTTPRequest $request)
+	{
+		$locations = $this->getLocations();
+
+		return $this->customise(array(
+			'Locations' => $locations,
+		));
+	}
+
+	/**
+	 * Return a XML feed of all locations marked "show in locator"
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return HTMLText
+	 */
+	public function xml(SS_HTTPRequest $request)
+	{
+		$this->setLocations($request);
+		$locations = $this->getLocations();
+
+		return $this->customise(array(
+			'Locations' => $locations,
+		))->renderWith('LocationXML');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getLocations()
+	{
+		if (!$this->locations) {
+			$this->setLocations($this->request);
+		}
+		return $this->locations;
+	}
+
+	/**
+	 * @param SS_HTTPRequest|null $request
+	 * @return $this
+	 */
+	public function setLocations(SS_HTTPRequest $request = null)
+	{
+		if ($request === null) {
+			$request = $this->request;
+		}
+		$filter = $this->config()->get('base_filter');
+		$this->extend('updateLocatorFilter', $filter, $request);
+
+		$filterAny = $this->config()->get('base_filter_any');
+		$this->extend('updateLocatorFilterAny', $filterAny, $request);
+
+		$exclude = $this->config()->get('base_exclude');
+		$this->extend('updateLocatorExclude', $exclude, $request);
+
+		$this->locations = Locator::get_locations($request, $this->data()->ID, $filter, $filterAny, $exclude);
+		return $this;
+	}
+
+	/**
+	 * LocationSearch form.
+	 *
+	 * Search form for locations, updates map and results list via AJAX
+	 *
+	 * @return Form
+	 */
+	public function LocationSearch()
+	{
+
+		if (class_exists('BootstrapForm')) {
+			$form = LocatorBootstrapForm::create($this, 'LocationSearch');
+		} else {
+			$form = LocatorForm::create($this, 'LocationSearch');
+		}
+
+		return $form
+			->setFormMethod('GET')
+			->setFormAction($this->Link())
+			->disableSecurityToken()
+			->loadDataFrom($this->request->getVars());
+	}
 
 }

Spacing +15 added lines, -17 removed lines

@@ -149,7 +149,7 @@ 
 
         Requirements::javascript('framework/thirdparty/jquery/jquery.js');
         if ($locations) {
-            Requirements::javascript('http://maps.google.com/maps/api/js?key=' . $key);
+            Requirements::javascript('http://maps.google.com/maps/api/js?key='.$key);
             Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js');
             Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js');
         }
@@ -177,14 +177,12 @@ 
             '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';
@@ -197,22 +195,22 @@ 
         unset($vars['action_index']);
         $url = '';
         if (count($vars)) {
-            $url .= '?' . http_build_query($vars);
+            $url .= '?'.http_build_query($vars);
         }
-        $link = $this->Link() . 'xml.xml' . $url;
+        $link = $this->Link().'xml.xml'.$url;
 
         // init map
         if ($locations) {
             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,
                         noForm: true,
@@ -220,7 +218,7 @@ 
                         inputID: 'Form_LocationSearch_Address',
                         categoryID: 'Form_LocationSearch_category',
                         distanceAlert: -1,
-                        " . $kilometer . '
+                        " . $kilometer.'
                     });
                 });
             ');

code/objects/LocationCategory.php

Indentation +30 added lines, -30 removed lines

@@ -10,39 +10,39 @@
 class LocationCategory extends DataObject
 {
 
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Name' => 'Varchar(100)',
-    );
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Name' => 'Varchar(100)',
+	);
 
-    /**
-     * @var array
-     */
-    private static $has_many = array(
-        'Locations' => 'Location',
-    );
+	/**
+	 * @var array
+	 */
+	private static $has_many = array(
+		'Locations' => 'Location',
+	);
 
-    /**
-     * @var array
-     */
-    private static $belogs_many_many = array(
-        'Locators' => 'Locator',
-    );
+	/**
+	 * @var array
+	 */
+	private static $belogs_many_many = array(
+		'Locators' => 'Locator',
+	);
 
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Category';
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Categories';
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Category';
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Categories';
 
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Name';
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Name';
 
 }

code/form/LocatorBootstrapForm.php

Indentation +45 added lines, -45 removed lines

@@ -2,50 +2,50 @@
 
 if (class_exists('BootstrapForm')) {
 
-    /**
-     * Class LocatorForm
-     */
-    class LocatorBootstrapForm extends BootstrapForm
-    {
-
-        /**
-         * LocatorForm constructor.
-         * @param Controller $controller
-         * @param string $name
-         */
-        public function __construct(Controller $controller, $name)
-        {
-
-            $fields = FieldList::create(
-                TextField::create('Address')
-                    ->setTitle('')
-                    ->setAttribute('placeholder', 'address or zip code')
-            );
-
-            if (LocationCategory::get()->count() > 0) {
-                $categories = DropdownField::create('CategoryID')
-                    ->setTitle('')
-                    ->setEmptyString('All Categories')
-                    ->setSource(LocationCategory::get()->map());
-                $fields->push($categories);
-            }
-
-            $this->extend('updateLocatorFormFields', $fields);
-
-            $actions = FieldList::create(
-                FormAction::create('doFilterLocations')
-                    ->setTitle('Search')
-            );
-
-            $this->extend('updateLocatorFormActions', $actions);
-
-            $validator = RequiredFields::create();
-
-            $this->extend('updateLocatorFormRequiredFields', $validator);
-
-            parent::__construct($controller, $name, $fields, $actions, $validator);
-        }
-
-    }
+	/**
+	 * Class LocatorForm
+	 */
+	class LocatorBootstrapForm extends BootstrapForm
+	{
+
+		/**
+		 * LocatorForm constructor.
+		 * @param Controller $controller
+		 * @param string $name
+		 */
+		public function __construct(Controller $controller, $name)
+		{
+
+			$fields = FieldList::create(
+				TextField::create('Address')
+					->setTitle('')
+					->setAttribute('placeholder', 'address or zip code')
+			);
+
+			if (LocationCategory::get()->count() > 0) {
+				$categories = DropdownField::create('CategoryID')
+					->setTitle('')
+					->setEmptyString('All Categories')
+					->setSource(LocationCategory::get()->map());
+				$fields->push($categories);
+			}
+
+			$this->extend('updateLocatorFormFields', $fields);
+
+			$actions = FieldList::create(
+				FormAction::create('doFilterLocations')
+					->setTitle('Search')
+			);
+
+			$this->extend('updateLocatorFormActions', $actions);
+
+			$validator = RequiredFields::create();
+
+			$this->extend('updateLocatorFormRequiredFields', $validator);
+
+			parent::__construct($controller, $name, $fields, $actions, $validator);
+		}
+
+	}
 
 }
\ No newline at end of file

code/form/LocatorForm.php

Indentation +37 added lines, -37 removed lines

@@ -6,42 +6,42 @@
 class LocatorForm extends Form
 {
 
-    /**
-     * LocatorForm constructor.
-     * @param Controller $controller
-     * @param string $name
-     */
-    public function __construct(Controller $controller, $name)
-    {
-
-        $fields = FieldList::create(
-            TextField::create('Address')
-                ->setTitle('')
-                ->setAttribute('placeholder', 'address or zip code')
-        );
-
-        if (LocationCategory::get()->count() > 0) {
-            $categories = DropdownField::create('CategoryID')
-                ->setTitle('')
-                ->setEmptyString('All Categories')
-                ->setSource(LocationCategory::get()->map());
-            $fields->push($categories);
-        }
-
-        $this->extend('updateLocatorFormFields', $fields);
-
-        $actions = FieldList::create(
-            FormAction::create('doFilterLocations')
-                ->setTitle('Search')
-        );
-
-        $this->extend('updateLocatorFormActions', $actions);
-
-        $validator = RequiredFields::create();
-
-        $this->extend('updateLocatorFormRequiredFields', $validator);
-
-        parent::__construct($controller, $name, $fields, $actions, $validator);
-    }
+	/**
+	 * LocatorForm constructor.
+	 * @param Controller $controller
+	 * @param string $name
+	 */
+	public function __construct(Controller $controller, $name)
+	{
+
+		$fields = FieldList::create(
+			TextField::create('Address')
+				->setTitle('')
+				->setAttribute('placeholder', 'address or zip code')
+		);
+
+		if (LocationCategory::get()->count() > 0) {
+			$categories = DropdownField::create('CategoryID')
+				->setTitle('')
+				->setEmptyString('All Categories')
+				->setSource(LocationCategory::get()->map());
+			$fields->push($categories);
+		}
+
+		$this->extend('updateLocatorFormFields', $fields);
+
+		$actions = FieldList::create(
+			FormAction::create('doFilterLocations')
+				->setTitle('Search')
+		);
+
+		$this->extend('updateLocatorFormActions', $actions);
+
+		$validator = RequiredFields::create();
+
+		$this->extend('updateLocatorFormRequiredFields', $validator);
+
+		parent::__construct($controller, $name, $fields, $actions, $validator);
+	}
 
 }
\ No newline at end of file

code/bulkloader/LocationCsvBulkLoader.php

Indentation +35 added lines, -35 removed lines

@@ -6,43 +6,43 @@
 class LocationCsvBulkLoader extends CsvBulkLoader
 {
 
-    /**
-     * @var array
-     */
-    public $columnMap = array(
-        'Name' => 'Title',
-        'City' => 'Suburb',
-        'EmailAddress' => 'Email',
-        'Category' => 'Category.Name',
-    );
+	/**
+	 * @var array
+	 */
+	public $columnMap = array(
+		'Name' => 'Title',
+		'City' => 'Suburb',
+		'EmailAddress' => 'Email',
+		'Category' => 'Category.Name',
+	);
 
-    /**
-     * @var array
-     */
-    public $relationCallbacks = array(
-       'Category.Name' => array(
-           'relationname' => 'Category',
-           'callback' => 'getCategoryByName',
-        ),
-    );
+	/**
+	 * @var array
+	 */
+	public $relationCallbacks = array(
+	   'Category.Name' => array(
+		   'relationname' => 'Category',
+		   'callback' => 'getCategoryByName',
+		),
+	);
 
-    /**
-     * @param $obj
-     * @param $val
-     * @param $record
-     * @return DataObject|static
-     */
-    public static function getCategoryByName(&$obj, $val, $record)
-    {
-        $val = Convert::raw2sql($val);
-        $category = LocationCategory::get()->filter(array('Name' => $val))->First();
-        if (!$category) {
-            $category = LocationCategory::create();
-            $category->Name = $val;
-            $category->write();
-        }
+	/**
+	 * @param $obj
+	 * @param $val
+	 * @param $record
+	 * @return DataObject|static
+	 */
+	public static function getCategoryByName(&$obj, $val, $record)
+	{
+		$val = Convert::raw2sql($val);
+		$category = LocationCategory::get()->filter(array('Name' => $val))->First();
+		if (!$category) {
+			$category = LocationCategory::create();
+			$category->Name = $val;
+			$category->write();
+		}
 
-        return $category;
-    }
+		return $category;
+	}
 
 }