silverstripe / cwp

tests/Extensions/WorkflowDefinitionExtensionTest.php

Indentation +34 added lines, -34 removed lines

@@ -15,38 +15,38 @@
 class WorkflowDefinitionExtensionTest extends FunctionalTest
 {
 
-    /**
-     * @var Boolean If set to TRUE, this will force a test database to be generated
-     * in {@link setUp()}. Note that this flag is overruled by the presence of a
-     * {@link $fixture_file}, which always forces a database build.
-     */
-    protected $usesDatabase = true;
-
-    /**
-     * Tests the config option that controls the creation of a default workflow definition
-     *
-     * @return void
-     */
-    public function testCreateDefaultWorkflowTest()
-    {
-        if (!class_exists(WorkflowDefinition::class)) {
-            $this->markTestSkipped('This test requires the advancedworkflow module to be installed');
-        }
-
-        DB::quiet();
-
-        // test disabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNull($definition);
-
-        // test enabling the default workflow definition
-        Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
-        $workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
-        $workflowExtn->requireDefaultRecords();
-        $definition = WorkflowDefinition::get()->first();
-        $this->assertNotNull($definition);
-    }
+	/**
+	 * @var Boolean If set to TRUE, this will force a test database to be generated
+	 * in {@link setUp()}. Note that this flag is overruled by the presence of a
+	 * {@link $fixture_file}, which always forces a database build.
+	 */
+	protected $usesDatabase = true;
+
+	/**
+	 * Tests the config option that controls the creation of a default workflow definition
+	 *
+	 * @return void
+	 */
+	public function testCreateDefaultWorkflowTest()
+	{
+		if (!class_exists(WorkflowDefinition::class)) {
+			$this->markTestSkipped('This test requires the advancedworkflow module to be installed');
+		}
+
+		DB::quiet();
+
+		// test disabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', false);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNull($definition);
+
+		// test enabling the default workflow definition
+		Config::modify()->set(CwpWorkflowDefinitionExtension::class, 'create_default_workflow', true);
+		$workflowExtn = Injector::inst()->create(CwpWorkflowDefinitionExtension::class);
+		$workflowExtn->requireDefaultRecords();
+		$definition = WorkflowDefinition::get()->first();
+		$this->assertNotNull($definition);
+	}
 }

tests/Tasks/PopulateThemeSampleDataTaskTest.php

Indentation +46 added lines, -46 removed lines

@@ -10,50 +10,50 @@
 
 class PopulateThemeSampleDataTaskTest extends SapphireTest
 {
-    protected $usesDatabase = true;
-
-    /**
-     * Ensure that the "contact" user form is only created once
-     */
-    public function testOnlyCreateContactFormOnce()
-    {
-        if (!class_exists(UserDefinedForm::class)) {
-            $this->markTestSkipped('This test requires the userforms module to be installed');
-        }
-
-        $createdMessage = 'Created "contact" UserDefinedForm';
-
-        $task = new PopulateThemeSampleDataTask;
-
-        // Run the task
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
-
-        // Run a second time
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
-
-        // Change the page name
-        $form = UserDefinedForm::get()->filter('URLSegment', 'contact')->first();
-        $form->URLSegment = 'testing';
-        $form->write();
-
-        // Ensure the old version is still detected in draft, so not recreated
-        $this->assertNotContains($createdMessage, $this->bufferedTask($task));
-
-        // Delete the page, then ensure it's recreated again (DataObject::delete will remove staged versions)
-        $form->delete();
-        $this->assertContains($createdMessage, $this->bufferedTask($task));
-    }
-
-    /**
-     * Run a BuildTask while buffering its output, and return the result
-     *
-     * @param  BuildTask $task
-     * @return string
-     */
-    protected function bufferedTask(BuildTask $task)
-    {
-        ob_start();
-        $task->run(new HTTPRequest('GET', '/'));
-        return ob_get_clean();
-    }
+	protected $usesDatabase = true;
+
+	/**
+	 * Ensure that the "contact" user form is only created once
+	 */
+	public function testOnlyCreateContactFormOnce()
+	{
+		if (!class_exists(UserDefinedForm::class)) {
+			$this->markTestSkipped('This test requires the userforms module to be installed');
+		}
+
+		$createdMessage = 'Created "contact" UserDefinedForm';
+
+		$task = new PopulateThemeSampleDataTask;
+
+		// Run the task
+		$this->assertContains($createdMessage, $this->bufferedTask($task));
+
+		// Run a second time
+		$this->assertNotContains($createdMessage, $this->bufferedTask($task));
+
+		// Change the page name
+		$form = UserDefinedForm::get()->filter('URLSegment', 'contact')->first();
+		$form->URLSegment = 'testing';
+		$form->write();
+
+		// Ensure the old version is still detected in draft, so not recreated
+		$this->assertNotContains($createdMessage, $this->bufferedTask($task));
+
+		// Delete the page, then ensure it's recreated again (DataObject::delete will remove staged versions)
+		$form->delete();
+		$this->assertContains($createdMessage, $this->bufferedTask($task));
+	}
+
+	/**
+	 * Run a BuildTask while buffering its output, and return the result
+	 *
+	 * @param  BuildTask $task
+	 * @return string
+	 */
+	protected function bufferedTask(BuildTask $task)
+	{
+		ob_start();
+		$task->run(new HTTPRequest('GET', '/'));
+		return ob_get_clean();
+	}
 }

src/Tasks/PopulateThemeSampleDataTask.php

Indentation +132 added lines, -132 removed lines

@@ -17,136 +17,136 @@
  */
 class PopulateThemeSampleDataTask extends BuildTask
 {
-    protected $title = 'Populate sample data for theme demo';
-
-    protected $description = 'Populates some sample data for showcasing the functionality of the '
-        . 'starter and Wātea themes';
-
-    /**
-     * A series of method calls to create sample data
-     *
-     * @param HTTPRequest $request
-     */
-    public function run($request)
-    {
-        if (!class_exists(UserDefinedForm::class)) {
-            return;
-        }
-        $this->handleContactForm();
-    }
-
-    /**
-     * Decide whether to create a contact user defined form, and call it to be be created if so
-     *
-     * @return $this
-     */
-    protected function handleContactForm()
-    {
-        if (!$this->getContactFormExists()) {
-            $this->createContactForm();
-        }
-        return $this;
-    }
-
-    /**
-     * Determine whether a "contact us" userform exists yet
-     *
-     * @return bool
-     */
-    protected function getContactFormExists()
-    {
-        $exists = false;
-        foreach (UserDefinedForm::get()->column('ID') as $formId) {
-            $count = Versioned::get_all_versions(UserDefinedForm::class, $formId)
-                ->filter('URLSegment', 'contact')
-                ->count();
-
-            if ($count >= 1) {
-                $exists = true;
-                break;
-            }
-        }
-        return $exists;
-    }
-
-    /**
-     * Create a "contact us" userform. Please note that this form does not have any recipients by default, so
-     * no emails will be sent. To add recipients - edit the page in the CMS and add a recipient via the "Recipients"
-     * tab.
-     *
-     * @return $this
-     */
-    protected function createContactForm()
-    {
-        $form = UserDefinedForm::create(array(
-            'Title' => 'Contact',
-            'URLSegment' => 'contact',
-            'Content' => '<p>$UserDefinedForm</p>',
-            'SubmitButtonText' => 'Submit',
-            'ClearButtonText' => 'Clear',
-            'OnCompleteMessage' => "<p>Thanks, we've received your submission and will be in touch shortly.</p>",
-            'EnableLiveValidation' => true
-        ));
-
-        $form->write();
-
-        // Add form fields
-        $fields = array(
-            EditableFormStep::create([
-                'Title' => _t(
-                    'SilverStripe\\UserForms\\Model\\EditableFormField\\EditableFormStep.TITLE_FIRST',
-                    'First Page'
-                )
-            ]),
-            EditableTextField::create([
-                'Title' => 'Name',
-                'Required' => true,
-                'RightTitle' => 'Please enter your first and last name'
-            ]),
-            EditableEmailField::create([
-                'Title' => Email::class,
-                'Required' => true,
-                'Placeholder' => 'example@example.com'
-            ]),
-            EditableTextField::create([
-                'Title' => 'Subject'
-            ]),
-            EditableTextField::create([
-                'Title' => 'Message',
-                'Required' => true,
-                'Rows' => 5
-            ])
-        );
-
-        foreach ($fields as $field) {
-            $field->write();
-            $form->Fields()->add($field);
-            $field->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
-        }
-
-        $form->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
-        $form->flushCache();
-
-        $this->output(' + Created "contact" UserDefinedForm page');
-
-        return $this;
-    }
-
-    /**
-     * Output a message either to the console or browser
-     *
-     * @param  string $message
-     * @return $this
-     */
-    protected function output($message)
-    {
-        if (Director::is_cli()) {
-            $message .= PHP_EOL;
-        } else {
-            $message = sprintf('<p>%s</p>', $message);
-        }
-        echo $message;
-
-        return $this;
-    }
+	protected $title = 'Populate sample data for theme demo';
+
+	protected $description = 'Populates some sample data for showcasing the functionality of the '
+		. 'starter and Wātea themes';
+
+	/**
+	 * A series of method calls to create sample data
+	 *
+	 * @param HTTPRequest $request
+	 */
+	public function run($request)
+	{
+		if (!class_exists(UserDefinedForm::class)) {
+			return;
+		}
+		$this->handleContactForm();
+	}
+
+	/**
+	 * Decide whether to create a contact user defined form, and call it to be be created if so
+	 *
+	 * @return $this
+	 */
+	protected function handleContactForm()
+	{
+		if (!$this->getContactFormExists()) {
+			$this->createContactForm();
+		}
+		return $this;
+	}
+
+	/**
+	 * Determine whether a "contact us" userform exists yet
+	 *
+	 * @return bool
+	 */
+	protected function getContactFormExists()
+	{
+		$exists = false;
+		foreach (UserDefinedForm::get()->column('ID') as $formId) {
+			$count = Versioned::get_all_versions(UserDefinedForm::class, $formId)
+				->filter('URLSegment', 'contact')
+				->count();
+
+			if ($count >= 1) {
+				$exists = true;
+				break;
+			}
+		}
+		return $exists;
+	}
+
+	/**
+	 * Create a "contact us" userform. Please note that this form does not have any recipients by default, so
+	 * no emails will be sent. To add recipients - edit the page in the CMS and add a recipient via the "Recipients"
+	 * tab.
+	 *
+	 * @return $this
+	 */
+	protected function createContactForm()
+	{
+		$form = UserDefinedForm::create(array(
+			'Title' => 'Contact',
+			'URLSegment' => 'contact',
+			'Content' => '<p>$UserDefinedForm</p>',
+			'SubmitButtonText' => 'Submit',
+			'ClearButtonText' => 'Clear',
+			'OnCompleteMessage' => "<p>Thanks, we've received your submission and will be in touch shortly.</p>",
+			'EnableLiveValidation' => true
+		));
+
+		$form->write();
+
+		// Add form fields
+		$fields = array(
+			EditableFormStep::create([
+				'Title' => _t(
+					'SilverStripe\\UserForms\\Model\\EditableFormField\\EditableFormStep.TITLE_FIRST',
+					'First Page'
+				)
+			]),
+			EditableTextField::create([
+				'Title' => 'Name',
+				'Required' => true,
+				'RightTitle' => 'Please enter your first and last name'
+			]),
+			EditableEmailField::create([
+				'Title' => Email::class,
+				'Required' => true,
+				'Placeholder' => 'example@example.com'
+			]),
+			EditableTextField::create([
+				'Title' => 'Subject'
+			]),
+			EditableTextField::create([
+				'Title' => 'Message',
+				'Required' => true,
+				'Rows' => 5
+			])
+		);
+
+		foreach ($fields as $field) {
+			$field->write();
+			$form->Fields()->add($field);
+			$field->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
+		}
+
+		$form->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
+		$form->flushCache();
+
+		$this->output(' + Created "contact" UserDefinedForm page');
+
+		return $this;
+	}
+
+	/**
+	 * Output a message either to the console or browser
+	 *
+	 * @param  string $message
+	 * @return $this
+	 */
+	protected function output($message)
+	{
+		if (Director::is_cli()) {
+			$message .= PHP_EOL;
+		} else {
+			$message = sprintf('<p>%s</p>', $message);
+		}
+		echo $message;
+
+		return $this;
+	}
 }

src/PageTypes/SitemapPageController.php

Indentation +41 added lines, -41 removed lines

@@ -7,45 +7,45 @@
 
 class SitemapPageController extends PageController
 {
-    private static $allowed_actions = [
-        'showpage',
-    ];
-
-    private static $url_handlers = [
-        'page/$ID' => 'showpage',
-    ];
-
-    public function showpage($request)
-    {
-        $id = (int) $request->param('ID');
-        if (!$id) {
-            return false;
-        }
-        $page = SiteTree::get()->byId($id);
-
-        // does the page exist?
-        if (!($page && $page->exists())) {
-            return $this->httpError(404);
-        }
-
-        // can the page be viewed?
-        if (!$page->canView()) {
-            return $this->httpError(403);
-        }
-
-        $viewer = $this->customise([
-            'IsAjax' => $request->isAjax(),
-            'SelectedPage' => $page,
-            'Children' => $page->Children(),
-        ]);
-
-        if ($request->isAjax()) {
-            return $viewer->renderWith([
-                'type' => 'Includes',
-                'SitemapNodeChildren'
-            ]);
-        }
-
-        return $viewer;
-    }
+	private static $allowed_actions = [
+		'showpage',
+	];
+
+	private static $url_handlers = [
+		'page/$ID' => 'showpage',
+	];
+
+	public function showpage($request)
+	{
+		$id = (int) $request->param('ID');
+		if (!$id) {
+			return false;
+		}
+		$page = SiteTree::get()->byId($id);
+
+		// does the page exist?
+		if (!($page && $page->exists())) {
+			return $this->httpError(404);
+		}
+
+		// can the page be viewed?
+		if (!$page->canView()) {
+			return $this->httpError(403);
+		}
+
+		$viewer = $this->customise([
+			'IsAjax' => $request->isAjax(),
+			'SelectedPage' => $page,
+			'Children' => $page->Children(),
+		]);
+
+		if ($request->isAjax()) {
+			return $viewer->renderWith([
+				'type' => 'Includes',
+				'SitemapNodeChildren'
+			]);
+		}
+
+		return $viewer;
+	}
 }

src/PageTypes/BasePage.php

Indentation +143 added lines, -143 removed lines

@@ -27,147 +27,147 @@
 
 class BasePage extends SiteTree
 {
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
-
-    /**
-     * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
-     *
-     * {@inheritDoc}
-     */
-    private static $hide_ancestor = BasePage::class;
-
-    private static $api_access = [
-        'view' => [
-            'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
-            'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
-        ],
-        'edit' => [
-            'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
-            'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
-        ],
-    ];
-
-    private static $table_name = 'BasePage';
-
-    /**
-     * @config
-     * @var string
-     */
-    private static $related_pages_title = 'Related pages';
-
-    private static $many_many = [
-        'Terms' => TaxonomyTerm::class,
-        'RelatedPages' => BasePage::class,
-    ];
-
-    /**
-     * @var array
-     * @config
-     */
-    private static $many_many_extraFields = [
-        'RelatedPages' => [
-            'SortOrder' => DBInt::class,
-        ],
-    ];
-
-    private static $plural_name = 'Base Pages';
-
-    /**
-     * Get the footer holder.
-     */
-    public function getFooter()
-    {
-        return FooterHolder::get_one(FooterHolder::class);
-    }
-
-    public function RelatedPages()
-    {
-        return $this->getManyManyComponents('RelatedPages')->sort('SortOrder');
-    }
-
-    public function RelatedPagesTitle()
-    {
-        return $this->config()->get('related_pages_title');
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            // Related Pages
-            $components = GridFieldConfig_RelationEditor::create();
-            $components->removeComponentsByType(GridFieldAddNewButton::class);
-            $components->removeComponentsByType(GridFieldEditButton::class);
-            $components->removeComponentsByType(GridFieldFilterHeader::class);
-            $components->addComponent(new GridFieldOrderableRows('SortOrder'));
-
-            /** @var GridFieldDataColumns $dataColumns */
-            $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-            $dataColumns->setDisplayFields([
-                'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
-                'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
-            ]);
-
-            $fields->findOrMakeTab(
-                'Root.RelatedPages',
-                _t(__CLASS__ . '.RelatedPages', 'Related pages')
-            );
-            $fields->addFieldToTab(
-                'Root.RelatedPages',
-                GridField::create(
-                    'RelatedPages',
-                    _t(__CLASS__ . '.RelatedPages', 'Related pages'),
-                    $this->RelatedPages(),
-                    $components
-                )
-            );
-
-            // Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
-            $hasMany = $this->hasMany();
-            $manyMany = $this->manyMany();
-            if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
-                $components = GridFieldConfig_RelationEditor::create();
-                $components->removeComponentsByType(GridFieldAddNewButton::class);
-                $components->removeComponentsByType(GridFieldEditButton::class);
-
-                /** @var GridFieldAddExistingAutocompleter $autoCompleter */
-                $autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
-                $autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
-
-                /** @var GridFieldDataColumns $dataColumns */
-                $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-                $dataColumns->setDisplayFields([
-                    'Name' => _t(__CLASS__ . '.Term', 'Term'),
-                    'TaxonomyName' => _t(__CLASS__ . '.Taxonomy', 'Taxonomy')
-                ]);
-
-                $fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
-                $fields->addFieldToTab(
-                    'Root.Tags',
-                    TreeMultiselectField::create(
-                        'Terms',
-                        _t(__CLASS__ . '.Terms', 'Terms'),
-                        TaxonomyTerm::class
-                    )->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
-                );
-            }
-        });
-        return parent::getCMSFields();
-    }
-
-    /**
-     * Returns the native language name for the selected locale/language, empty string if Fluent is not available
-     *
-     * @return string
-     */
-    public function getSelectedLanguage()
-    {
-        if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
-            return '';
-        }
-
-        /** @var ArrayData $information */
-        $information = $this->LocaleInformation(FluentState::singleton()->getLocale());
-
-        return $information->LanguageNative;
-    }
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
+
+	/**
+	 * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
+	 *
+	 * {@inheritDoc}
+	 */
+	private static $hide_ancestor = BasePage::class;
+
+	private static $api_access = [
+		'view' => [
+			'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
+			'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
+		],
+		'edit' => [
+			'Locale', 'URLSegment', 'Title', 'MenuTitle', 'Content', 'MetaDescription',
+			'ExtraMenu', 'Sort', 'Version', 'ParentID', 'ID'
+		],
+	];
+
+	private static $table_name = 'BasePage';
+
+	/**
+	 * @config
+	 * @var string
+	 */
+	private static $related_pages_title = 'Related pages';
+
+	private static $many_many = [
+		'Terms' => TaxonomyTerm::class,
+		'RelatedPages' => BasePage::class,
+	];
+
+	/**
+	 * @var array
+	 * @config
+	 */
+	private static $many_many_extraFields = [
+		'RelatedPages' => [
+			'SortOrder' => DBInt::class,
+		],
+	];
+
+	private static $plural_name = 'Base Pages';
+
+	/**
+	 * Get the footer holder.
+	 */
+	public function getFooter()
+	{
+		return FooterHolder::get_one(FooterHolder::class);
+	}
+
+	public function RelatedPages()
+	{
+		return $this->getManyManyComponents('RelatedPages')->sort('SortOrder');
+	}
+
+	public function RelatedPagesTitle()
+	{
+		return $this->config()->get('related_pages_title');
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			// Related Pages
+			$components = GridFieldConfig_RelationEditor::create();
+			$components->removeComponentsByType(GridFieldAddNewButton::class);
+			$components->removeComponentsByType(GridFieldEditButton::class);
+			$components->removeComponentsByType(GridFieldFilterHeader::class);
+			$components->addComponent(new GridFieldOrderableRows('SortOrder'));
+
+			/** @var GridFieldDataColumns $dataColumns */
+			$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+			$dataColumns->setDisplayFields([
+				'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
+				'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
+			]);
+
+			$fields->findOrMakeTab(
+				'Root.RelatedPages',
+				_t(__CLASS__ . '.RelatedPages', 'Related pages')
+			);
+			$fields->addFieldToTab(
+				'Root.RelatedPages',
+				GridField::create(
+					'RelatedPages',
+					_t(__CLASS__ . '.RelatedPages', 'Related pages'),
+					$this->RelatedPages(),
+					$components
+				)
+			);
+
+			// Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
+			$hasMany = $this->hasMany();
+			$manyMany = $this->manyMany();
+			if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
+				$components = GridFieldConfig_RelationEditor::create();
+				$components->removeComponentsByType(GridFieldAddNewButton::class);
+				$components->removeComponentsByType(GridFieldEditButton::class);
+
+				/** @var GridFieldAddExistingAutocompleter $autoCompleter */
+				$autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
+				$autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
+
+				/** @var GridFieldDataColumns $dataColumns */
+				$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+				$dataColumns->setDisplayFields([
+					'Name' => _t(__CLASS__ . '.Term', 'Term'),
+					'TaxonomyName' => _t(__CLASS__ . '.Taxonomy', 'Taxonomy')
+				]);
+
+				$fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
+				$fields->addFieldToTab(
+					'Root.Tags',
+					TreeMultiselectField::create(
+						'Terms',
+						_t(__CLASS__ . '.Terms', 'Terms'),
+						TaxonomyTerm::class
+					)->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
+				);
+			}
+		});
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * Returns the native language name for the selected locale/language, empty string if Fluent is not available
+	 *
+	 * @return string
+	 */
+	public function getSelectedLanguage()
+	{
+		if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
+			return '';
+		}
+
+		/** @var ArrayData $information */
+		$information = $this->LocaleInformation(FluentState::singleton()->getLocale());
+
+		return $information->LanguageNative;
+	}
 }

src/PageTypes/BaseHomePage.php

Indentation +133 added lines, -133 removed lines

@@ -26,137 +26,137 @@
  */
 class BaseHomePage extends Page
 {
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
-
-    private static $hide_ancestor = BaseHomePage::class;
-
-    private static $singular_name = 'Home Page';
-
-    private static $plural_name = 'Home Pages';
-
-    private static $table_name = 'BaseHomePage';
-
-    private static $db = [
-        'FeatureOneTitle' => 'Varchar(255)',
-        'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureOneContent' => 'HTMLText',
-        'FeatureOneButtonText' => 'Varchar(255)',
-        'FeatureTwoTitle' => 'Varchar(255)',
-        'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureTwoContent' => 'HTMLText',
-        'FeatureTwoButtonText' => 'Varchar(255)'
-    ];
-
-    private static $has_one = [
-        'LearnMorePage' => SiteTree::class,
-        'FeatureOneLink' => SiteTree::class,
-        'FeatureTwoLink' => SiteTree::class,
-    ];
-
-    private static $has_many = [
-        'Quicklinks' => Quicklink::class . '.Parent',
-    ];
-
-    public function Quicklinks()
-    {
-        return $this->getComponents('Quicklinks')->sort('SortOrder');
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            // Main Content tab
-            $fields->addFieldToTab(
-                'Root.Main',
-                TreeDropdownField::create(
-                    'LearnMorePageID',
-                    _t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
-                    SiteTree::class
-                ),
-                'Metadata'
-            );
-
-            $gridField = GridField::create(
-                'Quicklinks',
-                'Quicklinks',
-                $this->Quicklinks(),
-                GridFieldConfig_RelationEditor::create()
-            );
-            $gridConfig = $gridField->getConfig();
-            $gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
-                _t(__CLASS__ . '.AddNewButton', 'Add new')
-            );
-
-            $injector = Injector::inst();
-
-            $gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
-            $gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
-            $gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
-            $gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
-            $gridField->setModelClass(Quicklink::class);
-
-            $fields->addFieldToTab('Root.Quicklinks', $gridField);
-
-            $fields->removeByName('Import');
-
-            $fields->addFieldToTab(
-                'Root.Features',
-                ToggleCompositeField::create(
-                    'FeatureOne',
-                    _t(__CLASS__ . '.FeatureOne', 'Feature One'),
-                    array(
-                        TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
-                        $dropdownField = DropdownField::create(
-                            'FeatureOneCategory',
-                            _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                            singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
-                        ),
-                        HTMLEditorField::create(
-                            'FeatureOneContent',
-                            _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                        ),
-                        TextField::create(
-                            'FeatureOneButtonText',
-                            _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                        ),
-                        TreeDropdownField::create(
-                            'FeatureOneLinkID',
-                            _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                            SiteTree::class
-                        )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                    )
-                )->setHeadingLevel(3)
-            );
-            $dropdownField->setEmptyString('none');
-
-            $fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
-                'FeatureTwo',
-                _t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
-                array(
-                    TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
-                    $dropdownField = DropdownField::create(
-                        'FeatureTwoCategory',
-                        _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                        singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
-                    ),
-                    HTMLEditorField::create(
-                        'FeatureTwoContent',
-                        _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                    ),
-                    TextField::create(
-                        'FeatureTwoButtonText',
-                        _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                    ),
-                    TreeDropdownField::create(
-                        'FeatureTwoLinkID',
-                        _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                        SiteTree::class
-                    )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                )
-            )->setHeadingLevel(3));
-            $dropdownField->setEmptyString('none');
-        });
-
-        return parent::getCMSFields();
-    }
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
+
+	private static $hide_ancestor = BaseHomePage::class;
+
+	private static $singular_name = 'Home Page';
+
+	private static $plural_name = 'Home Pages';
+
+	private static $table_name = 'BaseHomePage';
+
+	private static $db = [
+		'FeatureOneTitle' => 'Varchar(255)',
+		'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureOneContent' => 'HTMLText',
+		'FeatureOneButtonText' => 'Varchar(255)',
+		'FeatureTwoTitle' => 'Varchar(255)',
+		'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureTwoContent' => 'HTMLText',
+		'FeatureTwoButtonText' => 'Varchar(255)'
+	];
+
+	private static $has_one = [
+		'LearnMorePage' => SiteTree::class,
+		'FeatureOneLink' => SiteTree::class,
+		'FeatureTwoLink' => SiteTree::class,
+	];
+
+	private static $has_many = [
+		'Quicklinks' => Quicklink::class . '.Parent',
+	];
+
+	public function Quicklinks()
+	{
+		return $this->getComponents('Quicklinks')->sort('SortOrder');
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			// Main Content tab
+			$fields->addFieldToTab(
+				'Root.Main',
+				TreeDropdownField::create(
+					'LearnMorePageID',
+					_t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
+					SiteTree::class
+				),
+				'Metadata'
+			);
+
+			$gridField = GridField::create(
+				'Quicklinks',
+				'Quicklinks',
+				$this->Quicklinks(),
+				GridFieldConfig_RelationEditor::create()
+			);
+			$gridConfig = $gridField->getConfig();
+			$gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
+				_t(__CLASS__ . '.AddNewButton', 'Add new')
+			);
+
+			$injector = Injector::inst();
+
+			$gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
+			$gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
+			$gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
+			$gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
+			$gridField->setModelClass(Quicklink::class);
+
+			$fields->addFieldToTab('Root.Quicklinks', $gridField);
+
+			$fields->removeByName('Import');
+
+			$fields->addFieldToTab(
+				'Root.Features',
+				ToggleCompositeField::create(
+					'FeatureOne',
+					_t(__CLASS__ . '.FeatureOne', 'Feature One'),
+					array(
+						TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
+						$dropdownField = DropdownField::create(
+							'FeatureOneCategory',
+							_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+							singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
+						),
+						HTMLEditorField::create(
+							'FeatureOneContent',
+							_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+						),
+						TextField::create(
+							'FeatureOneButtonText',
+							_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+						),
+						TreeDropdownField::create(
+							'FeatureOneLinkID',
+							_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+							SiteTree::class
+						)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+					)
+				)->setHeadingLevel(3)
+			);
+			$dropdownField->setEmptyString('none');
+
+			$fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
+				'FeatureTwo',
+				_t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
+				array(
+					TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
+					$dropdownField = DropdownField::create(
+						'FeatureTwoCategory',
+						_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+						singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
+					),
+					HTMLEditorField::create(
+						'FeatureTwoContent',
+						_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+					),
+					TextField::create(
+						'FeatureTwoButtonText',
+						_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+					),
+					TreeDropdownField::create(
+						'FeatureTwoLinkID',
+						_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+						SiteTree::class
+					)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+				)
+			)->setHeadingLevel(3));
+			$dropdownField->setEmptyString('none');
+		});
+
+		return parent::getCMSFields();
+	}
 }

src/PageTypes/EventPage.php

Indentation +77 added lines, -77 removed lines

@@ -12,81 +12,81 @@
 
 class EventPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an event occurring on a specific date.';
-
-    private static $default_parent = EventHolder::class;
-
-    private static $can_be_root = false;
-
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/event_page.png';
-
-    private static $singular_name = 'Event Page';
-
-    private static $plural_name = 'Event Pages';
-
-    private static $db = [
-        'StartTime' => 'Time',
-        'EndTime' => 'Time',
-        'Location' => 'Text',
-    ];
-
-    private static $table_name = 'EventPage';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
-        $labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
-        $labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
-
-        return $labels;
-    }
-
-    /**
-     * Add the default for the Date being the current day.
-     */
-    public function populateDefaults()
-    {
-        if (!isset($this->Date) || $this->Date === null) {
-            $this->Date = DBDatetime::now()->Format('y-MM-dd');
-        }
-
-        if (!isset($this->StartTime) || $this->StartTime === null) {
-            $this->StartTime = '09:00:00';
-        }
-
-        if (!isset($this->EndTime) || $this->EndTime === null) {
-            $this->EndTime = '17:00:00';
-        }
-
-        parent::populateDefaults();
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('Date');
-
-            $dateTimeFields = array();
-
-            $dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
-            $dateTimeFields[] = $startTimeField = TimeField::create(
-                'StartTime',
-                $this->fieldLabel('StartTime')
-            );
-            $dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
-
-            $fields->addFieldsToTab('Root.Main', [
-                $dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
-                $locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
-            ], 'Abstract');
-            $locationField->setRows(4);
-        });
-        return parent::getCMSFields();
-    }
-
-    public function NiceLocation()
-    {
-        return nl2br(Convert::raw2xml($this->Location), true);
-    }
+	private static $description = 'Describes an event occurring on a specific date.';
+
+	private static $default_parent = EventHolder::class;
+
+	private static $can_be_root = false;
+
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/event_page.png';
+
+	private static $singular_name = 'Event Page';
+
+	private static $plural_name = 'Event Pages';
+
+	private static $db = [
+		'StartTime' => 'Time',
+		'EndTime' => 'Time',
+		'Location' => 'Text',
+	];
+
+	private static $table_name = 'EventPage';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
+		$labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
+		$labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
+
+		return $labels;
+	}
+
+	/**
+	 * Add the default for the Date being the current day.
+	 */
+	public function populateDefaults()
+	{
+		if (!isset($this->Date) || $this->Date === null) {
+			$this->Date = DBDatetime::now()->Format('y-MM-dd');
+		}
+
+		if (!isset($this->StartTime) || $this->StartTime === null) {
+			$this->StartTime = '09:00:00';
+		}
+
+		if (!isset($this->EndTime) || $this->EndTime === null) {
+			$this->EndTime = '17:00:00';
+		}
+
+		parent::populateDefaults();
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('Date');
+
+			$dateTimeFields = array();
+
+			$dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
+			$dateTimeFields[] = $startTimeField = TimeField::create(
+				'StartTime',
+				$this->fieldLabel('StartTime')
+			);
+			$dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
+
+			$fields->addFieldsToTab('Root.Main', [
+				$dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
+				$locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
+			], 'Abstract');
+			$locationField->setRows(4);
+		});
+		return parent::getCMSFields();
+	}
+
+	public function NiceLocation()
+	{
+		return nl2br(Convert::raw2xml($this->Location), true);
+	}
 }

src/PageTypes/DatedUpdateHolderController.php

Indentation +357 added lines, -357 removed lines

@@ -34,361 +34,361 @@
  */
 class DatedUpdateHolderController extends PageController
 {
-    private static $allowed_actions = [
-        'rss',
-        'atom',
-        'DateRangeForm',
-    ];
-
-    private static $casting = [
-        'MetaTitle' => 'Text',
-        'FilterDescription' => 'Text',
-    ];
-
-    /**
-     * The session key for storing temporary form messages
-     *
-     * @var string
-     */
-    const TEMP_FORM_MESSAGE = __CLASS__ . '.TempFormMessage';
-
-    /**
-     * Get the meta title for the current action
-     *
-     * @return string
-     */
-    public function getMetaTitle()
-    {
-        $title = $this->data()->getTitle();
-        $filter = $this->FilterDescription();
-        if ($filter) {
-            $title = "{$title} - {$filter}";
-        }
-
-        $this->extend('updateMetaTitle', $title);
-        return $title;
-    }
-
-    /**
-     * Returns a description of the current filter
-     *
-     * @return string
-     */
-    public function FilterDescription()
-    {
-        $params = $this->parseParams();
-
-        $filters = array();
-        if ($params['tag']) {
-            $term = TaxonomyTerm::get_by_id(TaxonomyTerm::class, $params['tag']);
-            if ($term) {
-                $filters[] = _t(
-                    'CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_WITHIN',
-                    'within'
-                ) . ' "' . $term->Name . '"';
-            }
-        }
-
-        if ($params['from'] || $params['to']) {
-            if ($params['from']) {
-                $from = strtotime($params['from']);
-                if ($params['to']) {
-                    $to = strtotime($params['to']);
-                    $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_BETWEEN', 'between') . ' '
-                        . date('j/m/Y', $from) . ' and ' . date('j/m/Y', $to);
-                } else {
-                    $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
-                        . ' ' . date('j/m/Y', $from);
-                }
-            } else {
-                $to = strtotime($params['to']);
-                $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
-                    . ' ' . date('j/m/Y', $to);
-            }
-        }
-
-        if ($params['year'] && $params['month']) {
-            $timestamp = mktime(1, 1, 1, $params['month'], 1, $params['year']);
-            $filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_IN', 'in')
-                . ' ' . date('F', $timestamp) . ' ' . $params['year'];
-        }
-
-        if ($filters) {
-            return $this->getUpdateName() . ' ' . implode(' ', $filters);
-        }
-    }
-
-    public function getUpdateName()
-    {
-        return Config::inst()->get($this->data()->ClassName, 'update_name');
-    }
-
-    protected function init()
-    {
-        parent::init();
-        RSSFeed::linkToFeed($this->Link() . 'rss', $this->getSubscriptionTitle());
-    }
-
-    /**
-     * Parse URL parameters.
-     *
-     * @param bool $produceErrorMessages Set to false to omit session messages.
-     */
-    public function parseParams($produceErrorMessages = true)
-    {
-        $tag = $this->request->getVar('tag');
-        $from = $this->request->getVar('from');
-        $to = $this->request->getVar('to');
-        $year = $this->request->getVar('year');
-        $month = $this->request->getVar('month');
-
-        if ($tag == '') {
-            $tag = null;
-        }
-        if ($from == '') {
-            $from = null;
-        }
-        if ($to == '') {
-            $to = null;
-        }
-        if ($year == '') {
-            $year = null;
-        }
-        if ($month == '') {
-            $month = null;
-        }
-
-        if (isset($tag)) {
-            $tag = (int)$tag;
-        }
-        if (isset($from)) {
-            $from = urldecode($from);
-            $parser = DBDatetime::create();
-            $parser->setValue($from);
-            $from = $parser->Format('y-MM-dd');
-        }
-        if (isset($to)) {
-            $to = urldecode($to);
-            $parser = DBDatetime::create();
-            $parser->setValue($to);
-            $to = $parser->Format('y-MM-dd');
-        }
-        if (isset($year)) {
-            $year = (int)$year;
-        }
-        if (isset($month)) {
-            $month = (int)$month;
-        }
-
-        // If only "To" has been provided filter by single date. Normalise by swapping with "From".
-        if (isset($to) && !isset($from)) {
-            list($to, $from) = [$from, $to];
-        }
-
-        // Flip the dates if the order is wrong.
-        if (isset($to) && isset($from) && strtotime($from) > strtotime($to)) {
-            list($to, $from) = [$from, $to];
-
-            if ($produceErrorMessages) {
-                $this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
-                    __CLASS__ . '.FilterAppliedMessage',
-                    'Filter has been applied with the dates reversed.'
-                ));
-            }
-        }
-
-        // Notify the user that filtering by single date is taking place.
-        if (isset($from) && !isset($to)) {
-            if ($produceErrorMessages) {
-                $this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
-                    __CLASS__ . '.DateRangeFilterMessage',
-                    'Filtered by a single date.'
-                ));
-            }
-        }
-
-        return [
-            'tag' => $tag,
-            'from' => $from,
-            'to' => $to,
-            'year' => $year,
-            'month' => $month,
-        ];
-    }
-
-    /**
-     * Build the link - keep the date range, reset the rest.
-     */
-    public function AllTagsLink()
-    {
-        $link = HTTP::setGetVar('tag', null, null, '&');
-        $link = HTTP::setGetVar('month', null, $link, '&');
-        $link = HTTP::setGetVar('year', null, $link, '&');
-        $link = HTTP::setGetVar('start', null, $link, '&');
-
-        return $link;
-    }
-
-    /**
-     * List tags and attach links.
-     */
-    public function UpdateTagsWithLinks()
-    {
-        $tags = $this->UpdateTags();
-
-        $processed = ArrayList::create();
-
-        foreach ($tags as $tag) {
-            // Build the link - keep the tag, and date range, but reset month, year and pagination.
-            $link = HTTP::setGetVar('tag', $tag->ID, null, '&');
-            $link = HTTP::setGetVar('month', null, $link, '&');
-            $link = HTTP::setGetVar('year', null, $link, '&');
-            $link = HTTP::setGetVar('start', null, $link, '&');
-
-            $tag->Link = $link;
-            $processed->push($tag);
-        }
-
-        return $processed;
-    }
-
-    /**
-     * Get the TaxonomyTerm related to the current tag GET parameter.
-     */
-    public function CurrentTag()
-    {
-        $tagID = $this->request->getVar('tag');
-
-        if (isset($tagID)) {
-            return TaxonomyTerm::get_by_id(TaxonomyTerm::class, (int)$tagID);
-        }
-    }
-
-    /**
-     * Extract the available months based on the current query.
-     * Only tag is respected. Pagination and months are ignored.
-     */
-    public function AvailableMonths()
-    {
-        $params = $this->parseParams();
-
-        return DatedUpdateHolder::ExtractMonths(
-            $this->Updates($params['tag'], $params['from'], $params['to']),
-            Director::makeRelative($_SERVER['REQUEST_URI']),
-            $params['year'],
-            $params['month']
-        );
-    }
-
-    /**
-     * Get the updates based on the current query.
-     */
-    public function FilteredUpdates($pageSize = 20)
-    {
-        $params = $this->parseParams();
-
-        $items = $this->Updates(
-            $params['tag'],
-            $params['from'],
-            $params['to'],
-            $params['year'],
-            $params['month']
-        );
-
-        // Apply pagination
-        $list = PaginatedList::create($items, $this->getRequest());
-        $list->setPageLength($pageSize);
-        return $list;
-    }
-
-    /**
-     * @return Form
-     */
-    public function DateRangeForm()
-    {
-        $dateFromTitle = DBField::create_field('HTMLText', sprintf(
-            '%s <span class="field-note">%s</span>',
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FROM_DATE', 'From date'),
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 30/12/2017)')
-        ));
-        $dateToTitle = DBField::create_field('HTMLText', sprintf(
-            '%s <span class="field-note">%s</span>',
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.TO_DATE', 'To date'),
-            _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 30/12/2017)')
-        ));
-
-        $fields = FieldList::create(
-            DateField::create('from', $dateFromTitle),
-            DateField::create('to', $dateToTitle),
-            HiddenField::create('tag')
-        );
-
-        $actions = FieldList::create(
-            FormAction::create("doDateFilter")
-                ->setTitle(_t(__CLASS__ . '.Filter', 'Filter'))
-                ->addExtraClass('btn btn-primary primary'),
-            FormAction::create("doDateReset")
-                ->setTitle(_t(__CLASS__ . '.Clear', 'Clear'))
-                ->addExtraClass('btn')
-        );
-
-        $form = Form::create($this, 'DateRangeForm', $fields, $actions);
-        $form->loadDataFrom($this->request->getVars());
-        $form->setFormMethod('get');
-
-        // Add any locally stored form messages before returning
-        if ($formMessage = $this->getRequest()->getSession()->get(self::TEMP_FORM_MESSAGE)) {
-            $form->setMessage($formMessage, ValidationResult::TYPE_WARNING);
-            $this->getRequest()->getSession()->clear(self::TEMP_FORM_MESSAGE);
-        }
-
-        return $form;
-    }
-
-    public function doDateFilter()
-    {
-        $params = $this->parseParams();
-
-        // Build the link - keep the tag, but reset month, year and pagination.
-        $link = HTTP::setGetVar('from', $params['from'], $this->AbsoluteLink(), '&');
-        $link = HTTP::setGetVar('to', $params['to'], $link, '&');
-        if (isset($params['tag'])) {
-            $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
-        }
-
-        $this->redirect($link);
-    }
-
-    public function doDateReset()
-    {
-        $params = $this->parseParams(false);
-
-        // Reset the link - only include the tag.
-        $link = $this->AbsoluteLink();
-        if (isset($params['tag'])) {
-            $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
-        }
-
-        $this->redirect($link);
-    }
-
-    public function rss()
-    {
-        $rss = RSSFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('rss'),
-            $this->getSubscriptionTitle()
-        );
-        return $rss->outputToBrowser();
-    }
-
-    public function atom()
-    {
-        $atom = CwpAtomFeed::create(
-            $this->Updates()->sort('Created DESC')->limit(20),
-            $this->Link('atom'),
-            $this->getSubscriptionTitle()
-        );
-        return $atom->outputToBrowser();
-    }
+	private static $allowed_actions = [
+		'rss',
+		'atom',
+		'DateRangeForm',
+	];
+
+	private static $casting = [
+		'MetaTitle' => 'Text',
+		'FilterDescription' => 'Text',
+	];
+
+	/**
+	 * The session key for storing temporary form messages
+	 *
+	 * @var string
+	 */
+	const TEMP_FORM_MESSAGE = __CLASS__ . '.TempFormMessage';
+
+	/**
+	 * Get the meta title for the current action
+	 *
+	 * @return string
+	 */
+	public function getMetaTitle()
+	{
+		$title = $this->data()->getTitle();
+		$filter = $this->FilterDescription();
+		if ($filter) {
+			$title = "{$title} - {$filter}";
+		}
+
+		$this->extend('updateMetaTitle', $title);
+		return $title;
+	}
+
+	/**
+	 * Returns a description of the current filter
+	 *
+	 * @return string
+	 */
+	public function FilterDescription()
+	{
+		$params = $this->parseParams();
+
+		$filters = array();
+		if ($params['tag']) {
+			$term = TaxonomyTerm::get_by_id(TaxonomyTerm::class, $params['tag']);
+			if ($term) {
+				$filters[] = _t(
+					'CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_WITHIN',
+					'within'
+				) . ' "' . $term->Name . '"';
+			}
+		}
+
+		if ($params['from'] || $params['to']) {
+			if ($params['from']) {
+				$from = strtotime($params['from']);
+				if ($params['to']) {
+					$to = strtotime($params['to']);
+					$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_BETWEEN', 'between') . ' '
+						. date('j/m/Y', $from) . ' and ' . date('j/m/Y', $to);
+				} else {
+					$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
+						. ' ' . date('j/m/Y', $from);
+				}
+			} else {
+				$to = strtotime($params['to']);
+				$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_ON', 'on')
+					. ' ' . date('j/m/Y', $to);
+			}
+		}
+
+		if ($params['year'] && $params['month']) {
+			$timestamp = mktime(1, 1, 1, $params['month'], 1, $params['year']);
+			$filters[] = _t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FILTER_IN', 'in')
+				. ' ' . date('F', $timestamp) . ' ' . $params['year'];
+		}
+
+		if ($filters) {
+			return $this->getUpdateName() . ' ' . implode(' ', $filters);
+		}
+	}
+
+	public function getUpdateName()
+	{
+		return Config::inst()->get($this->data()->ClassName, 'update_name');
+	}
+
+	protected function init()
+	{
+		parent::init();
+		RSSFeed::linkToFeed($this->Link() . 'rss', $this->getSubscriptionTitle());
+	}
+
+	/**
+	 * Parse URL parameters.
+	 *
+	 * @param bool $produceErrorMessages Set to false to omit session messages.
+	 */
+	public function parseParams($produceErrorMessages = true)
+	{
+		$tag = $this->request->getVar('tag');
+		$from = $this->request->getVar('from');
+		$to = $this->request->getVar('to');
+		$year = $this->request->getVar('year');
+		$month = $this->request->getVar('month');
+
+		if ($tag == '') {
+			$tag = null;
+		}
+		if ($from == '') {
+			$from = null;
+		}
+		if ($to == '') {
+			$to = null;
+		}
+		if ($year == '') {
+			$year = null;
+		}
+		if ($month == '') {
+			$month = null;
+		}
+
+		if (isset($tag)) {
+			$tag = (int)$tag;
+		}
+		if (isset($from)) {
+			$from = urldecode($from);
+			$parser = DBDatetime::create();
+			$parser->setValue($from);
+			$from = $parser->Format('y-MM-dd');
+		}
+		if (isset($to)) {
+			$to = urldecode($to);
+			$parser = DBDatetime::create();
+			$parser->setValue($to);
+			$to = $parser->Format('y-MM-dd');
+		}
+		if (isset($year)) {
+			$year = (int)$year;
+		}
+		if (isset($month)) {
+			$month = (int)$month;
+		}
+
+		// If only "To" has been provided filter by single date. Normalise by swapping with "From".
+		if (isset($to) && !isset($from)) {
+			list($to, $from) = [$from, $to];
+		}
+
+		// Flip the dates if the order is wrong.
+		if (isset($to) && isset($from) && strtotime($from) > strtotime($to)) {
+			list($to, $from) = [$from, $to];
+
+			if ($produceErrorMessages) {
+				$this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
+					__CLASS__ . '.FilterAppliedMessage',
+					'Filter has been applied with the dates reversed.'
+				));
+			}
+		}
+
+		// Notify the user that filtering by single date is taking place.
+		if (isset($from) && !isset($to)) {
+			if ($produceErrorMessages) {
+				$this->getRequest()->getSession()->set(self::TEMP_FORM_MESSAGE, _t(
+					__CLASS__ . '.DateRangeFilterMessage',
+					'Filtered by a single date.'
+				));
+			}
+		}
+
+		return [
+			'tag' => $tag,
+			'from' => $from,
+			'to' => $to,
+			'year' => $year,
+			'month' => $month,
+		];
+	}
+
+	/**
+	 * Build the link - keep the date range, reset the rest.
+	 */
+	public function AllTagsLink()
+	{
+		$link = HTTP::setGetVar('tag', null, null, '&');
+		$link = HTTP::setGetVar('month', null, $link, '&');
+		$link = HTTP::setGetVar('year', null, $link, '&');
+		$link = HTTP::setGetVar('start', null, $link, '&');
+
+		return $link;
+	}
+
+	/**
+	 * List tags and attach links.
+	 */
+	public function UpdateTagsWithLinks()
+	{
+		$tags = $this->UpdateTags();
+
+		$processed = ArrayList::create();
+
+		foreach ($tags as $tag) {
+			// Build the link - keep the tag, and date range, but reset month, year and pagination.
+			$link = HTTP::setGetVar('tag', $tag->ID, null, '&');
+			$link = HTTP::setGetVar('month', null, $link, '&');
+			$link = HTTP::setGetVar('year', null, $link, '&');
+			$link = HTTP::setGetVar('start', null, $link, '&');
+
+			$tag->Link = $link;
+			$processed->push($tag);
+		}
+
+		return $processed;
+	}
+
+	/**
+	 * Get the TaxonomyTerm related to the current tag GET parameter.
+	 */
+	public function CurrentTag()
+	{
+		$tagID = $this->request->getVar('tag');
+
+		if (isset($tagID)) {
+			return TaxonomyTerm::get_by_id(TaxonomyTerm::class, (int)$tagID);
+		}
+	}
+
+	/**
+	 * Extract the available months based on the current query.
+	 * Only tag is respected. Pagination and months are ignored.
+	 */
+	public function AvailableMonths()
+	{
+		$params = $this->parseParams();
+
+		return DatedUpdateHolder::ExtractMonths(
+			$this->Updates($params['tag'], $params['from'], $params['to']),
+			Director::makeRelative($_SERVER['REQUEST_URI']),
+			$params['year'],
+			$params['month']
+		);
+	}
+
+	/**
+	 * Get the updates based on the current query.
+	 */
+	public function FilteredUpdates($pageSize = 20)
+	{
+		$params = $this->parseParams();
+
+		$items = $this->Updates(
+			$params['tag'],
+			$params['from'],
+			$params['to'],
+			$params['year'],
+			$params['month']
+		);
+
+		// Apply pagination
+		$list = PaginatedList::create($items, $this->getRequest());
+		$list->setPageLength($pageSize);
+		return $list;
+	}
+
+	/**
+	 * @return Form
+	 */
+	public function DateRangeForm()
+	{
+		$dateFromTitle = DBField::create_field('HTMLText', sprintf(
+			'%s <span class="field-note">%s</span>',
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.FROM_DATE', 'From date'),
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 30/12/2017)')
+		));
+		$dateToTitle = DBField::create_field('HTMLText', sprintf(
+			'%s <span class="field-note">%s</span>',
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.TO_DATE', 'To date'),
+			_t('CWP\\CWP\\PageTypes\\DatedUpdateHolder.DATE_EXAMPLE', '(example: 30/12/2017)')
+		));
+
+		$fields = FieldList::create(
+			DateField::create('from', $dateFromTitle),
+			DateField::create('to', $dateToTitle),
+			HiddenField::create('tag')
+		);
+
+		$actions = FieldList::create(
+			FormAction::create("doDateFilter")
+				->setTitle(_t(__CLASS__ . '.Filter', 'Filter'))
+				->addExtraClass('btn btn-primary primary'),
+			FormAction::create("doDateReset")
+				->setTitle(_t(__CLASS__ . '.Clear', 'Clear'))
+				->addExtraClass('btn')
+		);
+
+		$form = Form::create($this, 'DateRangeForm', $fields, $actions);
+		$form->loadDataFrom($this->request->getVars());
+		$form->setFormMethod('get');
+
+		// Add any locally stored form messages before returning
+		if ($formMessage = $this->getRequest()->getSession()->get(self::TEMP_FORM_MESSAGE)) {
+			$form->setMessage($formMessage, ValidationResult::TYPE_WARNING);
+			$this->getRequest()->getSession()->clear(self::TEMP_FORM_MESSAGE);
+		}
+
+		return $form;
+	}
+
+	public function doDateFilter()
+	{
+		$params = $this->parseParams();
+
+		// Build the link - keep the tag, but reset month, year and pagination.
+		$link = HTTP::setGetVar('from', $params['from'], $this->AbsoluteLink(), '&');
+		$link = HTTP::setGetVar('to', $params['to'], $link, '&');
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
+
+		$this->redirect($link);
+	}
+
+	public function doDateReset()
+	{
+		$params = $this->parseParams(false);
+
+		// Reset the link - only include the tag.
+		$link = $this->AbsoluteLink();
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
+
+		$this->redirect($link);
+	}
+
+	public function rss()
+	{
+		$rss = RSSFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('rss'),
+			$this->getSubscriptionTitle()
+		);
+		return $rss->outputToBrowser();
+	}
+
+	public function atom()
+	{
+		$atom = CwpAtomFeed::create(
+			$this->Updates()->sort('Created DESC')->limit(20),
+			$this->Link('atom'),
+			$this->getSubscriptionTitle()
+		);
+		return $atom->outputToBrowser();
+	}
 }

src/Extensions/TaxonomyTermExtension.php

Indentation +11 added lines, -11 removed lines

@@ -10,17 +10,17 @@
 class TaxonomyTermExtension extends DataExtension
 {
 
-    private static $api_access = true;
+	private static $api_access = true;
 
-    private static $belongs_many_many = array(
-        'Pages' => BasePage::class
-    );
+	private static $belongs_many_many = array(
+		'Pages' => BasePage::class
+	);
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        $pagesGridField = $fields->dataFieldByName('Pages');
-        if ($pagesGridField) {
-            $pagesGridField->getConfig()->removeComponentsByType(GridFieldAddNewButton::class);
-        }
-    }
+	public function updateCMSFields(FieldList $fields)
+	{
+		$pagesGridField = $fields->dataFieldByName('Pages');
+		if ($pagesGridField) {
+			$pagesGridField->getConfig()->removeComponentsByType(GridFieldAddNewButton::class);
+		}
+	}
 }