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 +180 added lines, -180 removed lines

@@ -6,184 +6,184 @@
 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',
-            'Import_ID' => 'Import_ID',
-        );
-        $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',
+			'Import_ID' => 'Import_ID',
+		);
+		$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 +214 added lines, -214 removed lines

@@ -17,245 +17,245 @@
 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',
-        'Import_ID' => 'Int',
-    );
+	/**
+	 * @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',
+		'Import_ID' => 'Int',
+	);
 
-    /**
-     * @var array
-     */
-    private static $has_one = array(
-        'Category' => 'LocationCategory',
-    );
+	/**
+	 * @var array
+	 */
+	private static $has_one = array(
+		'Category' => 'LocationCategory',
+	);
 
-    /**
-     * @var array
-     */
-    private static $casting = array(
-        'distance' => 'Decimal(9,3)',
-    );
+	/**
+	 * @var array
+	 */
+	private static $casting = array(
+		'distance' => 'Decimal(9,3)',
+	);
 
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Title';
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Title';
 
-    /**
-     * @var array
-     */
-    private static $defaults = array(
-        'ShowInLocator' => true,
-    );
+	/**
+	 * @var array
+	 */
+	private static $defaults = array(
+		'ShowInLocator' => true,
+	);
 
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Location';
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locations';
+	/**
+	 * @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;
+	/**
+	 * 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',
-    );
+	/**
+	 * 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',
-    );
+	/**
+	 * 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';
-    }
+	/**
+	 * 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);
+	/**
+	 * 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';
+		$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 $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')
-                )
-            )
-        );
+	/**
+	 * @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);
+		// allow to be extended via DataExtension
+		$this->extend('updateCMSFields', $fields);
 
-        // override Suburb field name
-        $fields->dataFieldByName('Suburb')->setTitle('City');
+		// override Suburb field name
+		$fields->dataFieldByName('Suburb')->setTitle('City');
 
-        $fields->removeByName(array(
-            'Import_ID',
-        ));
+		$fields->removeByName(array(
+			'Import_ID',
+		));
 
-        return $fields;
-    }
+		return $fields;
+	}
 
-    /**
-     * @return ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
+	/**
+	 * @return ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
 
-        return $result;
-    }
+		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 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;
-    }
+		return false;
+	}
 
-    /**
-     * @param null|Member $member
-     *
-     * @return bool
-     */
-    public function canView($member = null)
-    {
-        return true;
-    }
+	/**
+	 * @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 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 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);
-    }
+	/**
+	 * @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',
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+	}
 
 }

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/admin/LocationAdmin.php

Indentation +48 added lines, -48 removed lines

@@ -6,56 +6,56 @@
 class LocationAdmin extends ModelAdmin
 {
 
-    /**
-     * @var array
-     */
-    private static $managed_models = array(
-        'Location',
-        'LocationCategory',
-    );
+	/**
+	 * @var array
+	 */
+	private static $managed_models = array(
+		'Location',
+		'LocationCategory',
+	);
 
-    /**
-     * @var array
-     */
-    private static $model_importers = array(
-        'Location' => 'LocationCsvBulkLoader',
-        'LocationCategory' => 'CsvBulkLoader',
-    );
+	/**
+	 * @var array
+	 */
+	private static $model_importers = array(
+		'Location' => 'LocationCsvBulkLoader',
+		'LocationCategory' => 'CsvBulkLoader',
+	);
 
-    /**
-     * @var string
-     */
-    private static $menu_title = 'Locator';
-    /**
-     * @var string
-     */
-    private static $url_segment = 'locator';
+	/**
+	 * @var string
+	 */
+	private static $menu_title = 'Locator';
+	/**
+	 * @var string
+	 */
+	private static $url_segment = 'locator';
 
-    /**
-     * @return array
-     */
-    public function getExportFields()
-    {
-        if ($this->modelClass == 'Location') {
-            return array(
-                'Title' => 'Name',
-                'Address' => 'Address',
-                'Suburb' => 'City',
-                'State' => 'State',
-                'Postcode' => 'Postcode',
-                'Country' => 'Country',
-                'Website' => 'Website',
-                'Phone' => 'Phone',
-                'Fax' => 'Fax',
-                'Email' => 'Email',
-                'Category.Name' => 'Category',
-                'ShowInLocator' => 'ShowInLocator',
-                'Featured' => 'Featured',
-                'Lat' => 'Lat',
-                'Lng' => 'Lng',
-            );
-        }
+	/**
+	 * @return array
+	 */
+	public function getExportFields()
+	{
+		if ($this->modelClass == 'Location') {
+			return array(
+				'Title' => 'Name',
+				'Address' => 'Address',
+				'Suburb' => 'City',
+				'State' => 'State',
+				'Postcode' => 'Postcode',
+				'Country' => 'Country',
+				'Website' => 'Website',
+				'Phone' => 'Phone',
+				'Fax' => 'Fax',
+				'Email' => 'Email',
+				'Category.Name' => 'Category',
+				'ShowInLocator' => 'ShowInLocator',
+				'Featured' => 'Featured',
+				'Lat' => 'Lat',
+				'Lng' => 'Lng',
+			);
+		}
 
-        return parent::getExportFields();
-    }
+		return parent::getExportFields();
+	}
 }

code/pages/Locator.php

Spacing +11 added lines, -11 removed lines

@@ -208,7 +208,7 @@ 
         if ($locations) {
 
             Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-            Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
+            Requirements::javascript('https://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');
@@ -245,27 +245,27 @@ 
             unset($vars['action_doFilterLocations']);
             $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
             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,
                         distanceAlert: -1,
-                        " . $kilometer . ',
-                        ' . $defaultCoords . '
+                        " . $kilometer.',
+                        ' . $defaultCoords.'
                     });
                 });
             ');

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * @param array $filterAny
      * @param array $exclude
      * @param null|callable $callback
-     * @return DataList|ArrayList
+     * @return DataList
      */
     public static function get_locations(
         $filter = [],

Indentation +371 added lines, -371 removed lines

@@ -11,143 +11,143 @@ 
 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';
-
-    /**
-     * @var string
-     */
-    private static $location_class = 'Location';
-
-    /**
-     * @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 array $filter
-     * @param array $filterAny
-     * @param array $exclude
-     * @param null|callable $callback
-     * @return DataList|ArrayList
-     */
-    public static function get_locations(
-        $filter = [],
-        $filterAny = [],
-        $exclude = [],
-        $callback = null
-    )
-    {
-        $locationClass = Config::inst()->get('Locator', 'location_class');
-        $locations = $locationClass::get()->filter($filter)->exclude($exclude);
-
-        if (!empty($filterAny)) {
-            $locations = $locations->filterAny($filterAny);
-        }
-        if (!empty($exclude)) {
-            $locations = $locations->exclude($exclude);
-        }
-
-        if ($callback !== null && is_callable($callback)) {
-            $locations->filterByCallback($callback);
-        }
-
-        return $locations;
-    }
-
-    /**
-     * @return DataList
-     */
-    public static function get_all_categories()
-    {
-        return LocationCategory::get();
-    }
-
-    /**
-     * @return bool
-     */
-    public function getPageCategories()
-    {
-        return self::locator_categories_by_locator($this->ID);
-    }
-
-    /**
-     * @param int $id
-     * @return bool|
-     */
-    public static function locator_categories_by_locator($id = 0)
-    {
-        if ($id == 0) {
-            return false;
-        }
-
-        return Locator::get()->byID($id)->Categories();
-    }
+	/**
+	 * @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';
+
+	/**
+	 * @var string
+	 */
+	private static $location_class = 'Location';
+
+	/**
+	 * @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 array $filter
+	 * @param array $filterAny
+	 * @param array $exclude
+	 * @param null|callable $callback
+	 * @return DataList|ArrayList
+	 */
+	public static function get_locations(
+		$filter = [],
+		$filterAny = [],
+		$exclude = [],
+		$callback = null
+	)
+	{
+		$locationClass = Config::inst()->get('Locator', 'location_class');
+		$locations = $locationClass::get()->filter($filter)->exclude($exclude);
+
+		if (!empty($filterAny)) {
+			$locations = $locations->filterAny($filterAny);
+		}
+		if (!empty($exclude)) {
+			$locations = $locations->exclude($exclude);
+		}
+
+		if ($callback !== null && is_callable($callback)) {
+			$locations->filterByCallback($callback);
+		}
+
+		return $locations;
+	}
+
+	/**
+	 * @return DataList
+	 */
+	public static function get_all_categories()
+	{
+		return LocationCategory::get();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getPageCategories()
+	{
+		return self::locator_categories_by_locator($this->ID);
+	}
+
+	/**
+	 * @param int $id
+	 * @return bool|
+	 */
+	public static function locator_categories_by_locator($id = 0)
+	{
+		if ($id == 0) {
+			return false;
+		}
+
+		return Locator::get()->byID($id)->Categories();
+	}
 
 
 }
@@ -157,111 +157,111 @@ 
  */
 class Locator_Controller extends Page_Controller
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'xml',
-    );
-
-    /**
-     * @var array
-     */
-    private static $base_filter = [
-        'ShowInLocator' => true,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_exclude = [
-        'Lat' => 0,
-        'Lng' => 0,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter_any = [];
-
-    /**
-     * @var string
-     */
-    private static $list_template_path = 'locator/templates/location-list-description.html';
-
-    /**
-     * @var string
-     */
-    private static $info_window_template_path = 'locator/templates/infowindow-description.html';
-
-    /**
-     * @var bool
-     */
-    private static $bootstrapify = true;
-
-    /**
-     * @var DataList|ArrayList
-     */
-    protected $locations;
-
-    /**
-     * Set Requirements based on input from CMS
-     */
-    public function init()
-    {
-        parent::init();
-
-        // google maps api key
-        $key = Config::inst()->get('GoogleGeocoding', 'google_api_key');
-
-        $locations = $this->getLocations();
-
-        if ($locations) {
-
-            Requirements::css('locator/css/map.css');
-            Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-            Requirements::javascript('https://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');
-
-            $featuredInList = ($locations->filter('Featured', true)->count() > 0);
-            $defaultCoords = $this->getAddressSearchCoords() ? $this->getAddressSearchCoords() : '';
-            $isChrome = (strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== FALSE);
-
-            $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 || $defaultCoords != '' || $isChrome
-                    ? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'
-                    : 'autoGeocode: true, fullMapStart: false,';
-            } else {
-                $load = 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
-            }
-
-            $listTemplatePath = $this->config()->get('list_template_path');
-            $infowindowTemplatePath = $this->config()->get('info_window_template_path');
-
-            // 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_doFilterLocations']);
-            $url = '';
-            if (count($vars)) {
-                $url .= '?' . http_build_query($vars);
-            }
-            $link = $this->Link() . 'xml.xml' . $url;
-
-            // init map
-            Requirements::customScript("
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'xml',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter = [
+		'ShowInLocator' => true,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_exclude = [
+		'Lat' => 0,
+		'Lng' => 0,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter_any = [];
+
+	/**
+	 * @var string
+	 */
+	private static $list_template_path = 'locator/templates/location-list-description.html';
+
+	/**
+	 * @var string
+	 */
+	private static $info_window_template_path = 'locator/templates/infowindow-description.html';
+
+	/**
+	 * @var bool
+	 */
+	private static $bootstrapify = true;
+
+	/**
+	 * @var DataList|ArrayList
+	 */
+	protected $locations;
+
+	/**
+	 * Set Requirements based on input from CMS
+	 */
+	public function init()
+	{
+		parent::init();
+
+		// google maps api key
+		$key = Config::inst()->get('GoogleGeocoding', 'google_api_key');
+
+		$locations = $this->getLocations();
+
+		if ($locations) {
+
+			Requirements::css('locator/css/map.css');
+			Requirements::javascript('framework/thirdparty/jquery/jquery.js');
+			Requirements::javascript('https://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');
+
+			$featuredInList = ($locations->filter('Featured', true)->count() > 0);
+			$defaultCoords = $this->getAddressSearchCoords() ? $this->getAddressSearchCoords() : '';
+			$isChrome = (strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== FALSE);
+
+			$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 || $defaultCoords != '' || $isChrome
+					? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'
+					: 'autoGeocode: true, fullMapStart: false,';
+			} else {
+				$load = 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
+			}
+
+			$listTemplatePath = $this->config()->get('list_template_path');
+			$infowindowTemplatePath = $this->config()->get('info_window_template_path');
+
+			// 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_doFilterLocations']);
+			$url = '';
+			if (count($vars)) {
+				$url .= '?' . http_build_query($vars);
+			}
+			$link = $this->Link() . 'xml.xml' . $url;
+
+			// init map
+			Requirements::customScript("
                 $(function(){
                     $('#map-container').storeLocator({
                         " . $load . "
@@ -280,134 +280,134 @@ 
                     });
                 });
             ');
-        }
-    }
-
-    /**
-     * @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)
-    {
-        $locations = $this->getLocations();
-
-        return $this->customise(array(
-            'Locations' => $locations,
-        ))->renderWith('LocationXML');
-    }
-
-    /**
-     * @return ArrayList|DataList
-     */
-    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');
-
-        if ($request->getVar('CategoryID')) {
-            $filter['CategoryID'] = $request->getVar('CategoryID');
-        } else {
-            if ($this->getPageCategories()->exists()) {
-                foreach ($this->getPageCategories() as $category) {
-                    $filter['CategoryID'][] = $category->ID;
-                }
-            }
-        }
-
-        $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);
-
-        $locations = Locator::get_locations($filter, $filterAny, $exclude);
-        $locations = DataToArrayListHelper::to_array_list($locations);
-
-        //allow for adjusting list post possible distance calculation
-        $this->extend('updateLocationList', $locations);
-
-        if ($locations->canSortBy('distance')) {
-            $locations = $locations->sort('distance');
-        }
-
-        //allow for returning list to be set as
-        $this->extend('updateListType', $locations);
-
-        $this->locations = $locations;
-        return $this;
-
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getAddressSearchCoords()
-    {
-        if (!$this->request->getVar('Address')) {
-            return false;
-        }
-        $coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));
-
-        $lat = $coords['lat'];
-        $lng = $coords['lng'];
-
-        return "defaultLat: {$lat}, defaultLng: {$lng},";
-    }
-
-    /**
-     * LocationSearch form.
-     *
-     * Search form for locations, updates map and results list via AJAX
-     *
-     * @return Form
-     */
-    public function LocationSearch()
-    {
-
-        $form = LocatorForm::create($this, 'LocationSearch');
-        if (class_exists('BootstrapForm') && $this->config()->get('bootstrapify')) {
-            $form->Fields()->bootstrapify();
-            $form->Actions()->bootstrapify();
-        }
-
-        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)
+	{
+		$locations = $this->getLocations();
+
+		return $this->customise(array(
+			'Locations' => $locations,
+		))->renderWith('LocationXML');
+	}
+
+	/**
+	 * @return ArrayList|DataList
+	 */
+	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');
+
+		if ($request->getVar('CategoryID')) {
+			$filter['CategoryID'] = $request->getVar('CategoryID');
+		} else {
+			if ($this->getPageCategories()->exists()) {
+				foreach ($this->getPageCategories() as $category) {
+					$filter['CategoryID'][] = $category->ID;
+				}
+			}
+		}
+
+		$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);
+
+		$locations = Locator::get_locations($filter, $filterAny, $exclude);
+		$locations = DataToArrayListHelper::to_array_list($locations);
+
+		//allow for adjusting list post possible distance calculation
+		$this->extend('updateLocationList', $locations);
+
+		if ($locations->canSortBy('distance')) {
+			$locations = $locations->sort('distance');
+		}
+
+		//allow for returning list to be set as
+		$this->extend('updateListType', $locations);
+
+		$this->locations = $locations;
+		return $this;
+
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getAddressSearchCoords()
+	{
+		if (!$this->request->getVar('Address')) {
+			return false;
+		}
+		$coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));
+
+		$lat = $coords['lat'];
+		$lng = $coords['lng'];
+
+		return "defaultLat: {$lat}, defaultLng: {$lng},";
+	}
+
+	/**
+	 * LocationSearch form.
+	 *
+	 * Search form for locations, updates map and results list via AJAX
+	 *
+	 * @return Form
+	 */
+	public function LocationSearch()
+	{
+
+		$form = LocatorForm::create($this, 'LocationSearch');
+		if (class_exists('BootstrapForm') && $this->config()->get('bootstrapify')) {
+			$form->Fields()->bootstrapify();
+			$form->Actions()->bootstrapify();
+		}
+
+		return $form
+			->setFormMethod('GET')
+			->setFormAction($this->Link())
+			->disableSecurityToken()
+			->loadDataFrom($this->request->getVars());
+	}
 
 }

code/extensions/DistanceDataExtension.php

Indentation +19 added lines, -19 removed lines

@@ -2,25 +2,25 @@
 
 class DistanceDataExtension extends DataExtension
 {
-    /**
-     * @param SQLQuery $query
-     */
-    public function augmentSQL(SQLQuery &$query)
-    {
-        $address = Controller::curr()->getRequest()->getVar('Address');
-        if ($this->owner->hasMethod('updateAddressValue')) {
-            $address = $this->owner->updateAddressValue($address);
-        }
-        if ($address) { // on frontend
-            $coords = GoogleGeocoding::address_to_point($address);
+	/**
+	 * @param SQLQuery $query
+	 */
+	public function augmentSQL(SQLQuery &$query)
+	{
+		$address = Controller::curr()->getRequest()->getVar('Address');
+		if ($this->owner->hasMethod('updateAddressValue')) {
+			$address = $this->owner->updateAddressValue($address);
+		}
+		if ($address) { // on frontend
+			$coords = GoogleGeocoding::address_to_point($address);
 
-            $Lat = $coords['lat'];
-            $Lng = $coords['lng'];
+			$Lat = $coords['lat'];
+			$Lng = $coords['lng'];
 
-            $query
-                ->addSelect(array(
-                    '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance',
-                ));
-        }
-    }
+			$query
+				->addSelect(array(
+					'( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance',
+				));
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
     /**
      * @param SQLQuery $query
      */
-    public function augmentSQL(SQLQuery &$query)
+    public function augmentSQL(SQLQuery & $query)
     {
         $address = Controller::curr()->getRequest()->getVar('Address');
         if ($this->owner->hasMethod('updateAddressValue')) {
@@ -19,7 +19,7 @@ 
 
             $query
                 ->addSelect(array(
-                    '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance',
+                    '( 3959 * acos( cos( radians('.$Lat.') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians('.$Lng.') ) + sin( radians('.$Lat.') ) * sin( radians( `Lat` ) ) ) ) AS distance',
                 ));
         }
     }

code/bulkloader/LocationCsvBulkLoader.php

Indentation +42 added lines, -42 removed lines

@@ -6,51 +6,51 @@
 class LocationCsvBulkLoader extends CsvBulkLoader
 {
 
-    /**
-     * @var array
-     */
-    public $columnMap = array(
-        'Name' => 'Title',
-        'City' => 'Suburb',
-        'EmailAddress' => 'Email',
-        'Category' => 'Category.Name',
-        'Import_ID' => 'Import_ID',
-    );
+	/**
+	 * @var array
+	 */
+	public $columnMap = array(
+		'Name' => 'Title',
+		'City' => 'Suburb',
+		'EmailAddress' => 'Email',
+		'Category' => 'Category.Name',
+		'Import_ID' => 'Import_ID',
+	);
 
-    /**
-     * @var array
-     */
-    public $duplicateChecks = array(
-        'Import_ID' => 'Import_ID'
-    );
+	/**
+	 * @var array
+	 */
+	public $duplicateChecks = array(
+		'Import_ID' => 'Import_ID'
+	);
 
-    /**
-     * @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;
+	}
 
 }

code/form/LocatorForm.php

Indentation +38 added lines, -38 removed lines

@@ -6,43 +6,43 @@
 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')
-        );
-
-        $pageCategories = Locator::locator_categories_by_locator($controller->data()->ID);
-        if ($pageCategories && $pageCategories->count() > 0) {
-            $categories = false;
-        } else {
-            $categories = Locator::get_all_categories();
-        }
-
-        if ($categories) {
-            $categoriesField = DropdownField::create('CategoryID')
-                ->setTitle('')
-                ->setEmptyString('All Categories')
-                ->setSource($categories->map());
-            $fields->push($categoriesField);
-        }
-
-        $actions = FieldList::create(
-            FormAction::create('doFilterLocations')
-                ->setTitle('Search')
-        );
-
-        $validator = RequiredFields::create();
-
-        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')
+		);
+
+		$pageCategories = Locator::locator_categories_by_locator($controller->data()->ID);
+		if ($pageCategories && $pageCategories->count() > 0) {
+			$categories = false;
+		} else {
+			$categories = Locator::get_all_categories();
+		}
+
+		if ($categories) {
+			$categoriesField = DropdownField::create('CategoryID')
+				->setTitle('')
+				->setEmptyString('All Categories')
+				->setSource($categories->map());
+			$fields->push($categoriesField);
+		}
+
+		$actions = FieldList::create(
+			FormAction::create('doFilterLocations')
+				->setTitle('Search')
+		);
+
+		$validator = RequiredFields::create();
+
+		parent::__construct($controller, $name, $fields, $actions, $validator);
+	}
 
 }
\ No newline at end of file