silverstripe / cwp

tests/Tasks/PopulateThemeSampleDataTaskTest.php

Indentation +42 added lines, -42 removed lines

@@ -10,46 +10,46 @@
 
 class PopulateThemeSampleDataTaskTest extends SapphireTest
 {
-    protected $usesDatabase = true;
-
-    /**
-     * Ensure that the "contact" user form is only created once
-     */
-    public function testOnlyCreateContactFormOnce()
-    {
-        $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()
+	{
+		$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/PageTypes/BasePageController.php

Indentation +345 added lines, -345 removed lines

@@ -22,355 +22,355 @@
 
 class BasePageController extends ContentController
 {
-    private static $allowed_actions = [
-        'downloadpdf',
-        'SearchForm',
-        'results',
-    ];
-
-    /**
-     * How many search results should be shown per-page?
-     * @var int
-     */
-    public static $results_per_page = 10;
-
-    public static $search_index_class = CwpSolrIndex::class;
-
-    /**
-     * If spelling suggestions for searches are given, enable
-     * suggested searches to be followed immediately
-     *
-     * @config
-     * @var bool
-     */
-    private static $search_follow_suggestions = true;
-
-    /**
-     * Which classes should be queried when searching?
-     * @var array
-     */
-    public static $classes_to_search = [
-        [
-            'class' => 'Page',
-            'includeSubclasses' => true,
-        ]
-    ];
-
-    /**
-     * Serve the page rendered as PDF.
-     */
-    public function downloadpdf()
-    {
-        if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
-            return false;
-        }
-
-        // We only allow producing live pdf. There is no way to secure the draft files.
-        Versioned::set_stage(Versioned::LIVE);
-
-        $path = $this->dataRecord->getPdfFilename();
-        if (!file_exists($path)) {
-            $this->generatePDF();
-        }
-
-        return HTTPRequest::send_file(file_get_contents($path), basename($path), 'application/pdf');
-    }
-
-    /*
+	private static $allowed_actions = [
+		'downloadpdf',
+		'SearchForm',
+		'results',
+	];
+
+	/**
+	 * How many search results should be shown per-page?
+	 * @var int
+	 */
+	public static $results_per_page = 10;
+
+	public static $search_index_class = CwpSolrIndex::class;
+
+	/**
+	 * If spelling suggestions for searches are given, enable
+	 * suggested searches to be followed immediately
+	 *
+	 * @config
+	 * @var bool
+	 */
+	private static $search_follow_suggestions = true;
+
+	/**
+	 * Which classes should be queried when searching?
+	 * @var array
+	 */
+	public static $classes_to_search = [
+		[
+			'class' => 'Page',
+			'includeSubclasses' => true,
+		]
+	];
+
+	/**
+	 * Serve the page rendered as PDF.
+	 */
+	public function downloadpdf()
+	{
+		if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
+			return false;
+		}
+
+		// We only allow producing live pdf. There is no way to secure the draft files.
+		Versioned::set_stage(Versioned::LIVE);
+
+		$path = $this->dataRecord->getPdfFilename();
+		if (!file_exists($path)) {
+			$this->generatePDF();
+		}
+
+		return HTTPRequest::send_file(file_get_contents($path), basename($path), 'application/pdf');
+	}
+
+	/*
     * This will return either pdf_base_url from YML, CWP_SECURE_DOMAIN
     * from _ss_environment, or blank. In that order of importance.
     */
-    public function getPDFBaseURL()
-    {
-        //if base url YML is defined in YML, use that
-        if (Config::inst()->get(BasePage::class, 'pdf_base_url')) {
-            $pdfBaseUrl = Config::inst()->get(BasePage::class, 'pdf_base_url').'/';
-            //otherwise, if we are CWP use the secure domain
-        } elseif (Environment::getEnv('CWP_SECURE_DOMAIN')) {
-            $pdfBaseUrl = Environment::getEnv('CWP_SECURE_DOMAIN') . '/';
-            //or if neither, leave blank
-        } else {
-            $pdfBaseUrl = '';
-        }
-        return $pdfBaseUrl;
-    }
-
-    /*
+	public function getPDFBaseURL()
+	{
+		//if base url YML is defined in YML, use that
+		if (Config::inst()->get(BasePage::class, 'pdf_base_url')) {
+			$pdfBaseUrl = Config::inst()->get(BasePage::class, 'pdf_base_url').'/';
+			//otherwise, if we are CWP use the secure domain
+		} elseif (Environment::getEnv('CWP_SECURE_DOMAIN')) {
+			$pdfBaseUrl = Environment::getEnv('CWP_SECURE_DOMAIN') . '/';
+			//or if neither, leave blank
+		} else {
+			$pdfBaseUrl = '';
+		}
+		return $pdfBaseUrl;
+	}
+
+	/*
     * Don't use the proxy if the pdf domain is the CWP secure domain
     * Or if we aren't on a CWP server
     */
-    public function getPDFProxy($pdfBaseUrl)
-    {
-        if (!defined('CWP_SECURE_DOMAIN') || $pdfBaseUrl == CWP_SECURE_DOMAIN.'/') {
-            $proxy = '';
-        } else {
-            $proxy = ' --proxy ' . SS_OUTBOUND_PROXY . ':' . SS_OUTBOUND_PROXY_PORT;
-        }
-        return $proxy;
-    }
-
-    /**
-     * Render the page as PDF using wkhtmltopdf.
-     */
-    public function generatePDF()
-    {
-        if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
-            return false;
-        }
-
-        $binaryPath = Config::inst()->get(BasePage::class, 'wkhtmltopdf_binary');
-        if (!$binaryPath || !is_executable($binaryPath)) {
-            if (defined('WKHTMLTOPDF_BINARY') && is_executable(WKHTMLTOPDF_BINARY)) {
-                $binaryPath = WKHTMLTOPDF_BINARY;
-            }
-        }
-
-        if (!$binaryPath) {
-            user_error('Neither WKHTMLTOPDF_BINARY nor BasePage.wkhtmltopdf_binary are defined', E_USER_ERROR);
-        }
-
-        if (Versioned::get_reading_mode() == 'Stage.Stage') {
-            user_error('Generating PDFs on draft is not supported', E_USER_ERROR);
-        }
-
-        set_time_limit(60);
-
-        // prepare the paths
-        $pdfFile = $this->dataRecord->getPdfFilename();
-        $bodyFile = str_replace('.pdf', '_pdf.html', $pdfFile);
-        $footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
-
-        // make sure the work directory exists
-        if (!file_exists(dirname($pdfFile))) {
-            Filesystem::makeFolder(dirname($pdfFile));
-        }
-
-        //decide the domain to use in generation
-        $pdfBaseUrl = $this->getPDFBaseURL();
-
-        // Force http protocol on CWP - fetching from localhost without using the proxy, SSL terminates on gateway.
-        if (defined('CWP_ENVIRONMENT')) {
-            Config::inst()->nest();
-            Config::inst()->update(Director::class, 'alternate_protocol', 'http');
-            //only set alternate protocol if CWP_SECURE_DOMAIN is defined OR pdf_base_url is
-            if ($pdfBaseUrl) {
-                Config::inst()->update(Director::class, 'alternate_base_url', 'http://'.$pdfBaseUrl);
-            }
-        }
-
-        $bodyViewer = $this->getViewer('pdf');
-
-        // write the output of this page to HTML, ready for conversion to PDF
-        file_put_contents($bodyFile, $bodyViewer->process($this));
-
-        // get the viewer for the current template with _pdffooter
-        $footerViewer = $this->getViewer('pdffooter');
-
-        // write the output of the footer template to HTML, ready for conversion to PDF
-        file_put_contents($footerFile, $footerViewer->process($this));
-
-        if (defined('CWP_ENVIRONMENT')) {
-            Config::inst()->unnest();
-        }
-
-        //decide what the proxy should look like
-        $proxy = $this->getPDFProxy($pdfBaseUrl);
-
-        // finally, generate the PDF
-        $command = $binaryPath . $proxy . ' --outline -B 40pt -L 20pt -R 20pt -T 20pt --encoding utf-8 '
-            . '--orientation Portrait --disable-javascript --quiet --print-media-type ';
-        $retVal = 0;
-        $output = array();
-        exec(
-            $command . " --footer-html \"$footerFile\" \"$bodyFile\" \"$pdfFile\" &> /dev/stdout",
-            $output,
-            $retVal
-        );
-
-        // remove temporary file
-        unlink($bodyFile);
-        unlink($footerFile);
-
-        // output any errors
-        if ($retVal != 0) {
-            user_error('wkhtmltopdf failed: ' . implode("\n", $output), E_USER_ERROR);
-        }
-
-        // serve the generated file
-        return HTTPRequest::send_file(file_get_contents($pdfFile), basename($pdfFile), 'application/pdf');
-    }
-
-    /**
-     * Site search form
-     */
-    public function SearchForm()
-    {
-        $searchText = $this->getRequest()->getVar('Search');
-
-        $fields = FieldList::create(
-            TextField::create('Search', false, $searchText)
-        );
-        $actions = FieldList::create(
-            FormAction::create('results', _t('SearchForm.GO', 'Go'))
-        );
-
-        $form = SearchForm::create($this, SearchForm::class, $fields, $actions);
-        $form->setFormAction('search/SearchForm');
-
-        return $form;
-    }
-
-    /**
-     * Get search form with _header suffix
-     *
-     * @return SearchForm
-     */
-    public function HeaderSearchForm()
-    {
-        return $this->SearchForm()->setTemplate('SearchForm_header');
-    }
-
-    /**
-     * Process and render search results.
-     *
-     * @param array $data The raw request data submitted by user
-     * @param SearchForm $form The form instance that was submitted
-     * @param HTTPRequest $request Request generated for this action
-     * @return DBHTMLText
-     */
-    public function results($data, $form, $request)
-    {
-        // Check parameters for terms, pagination, and if we should follow suggestions
-        $keywords = empty($data['Search']) ? '' : $data['Search'];
-        $start = isset($data['start']) ? $data['start'] : 0;
-        $suggestions = isset($data['suggestions'])
-            ? $data['suggestions']
-            : $this->config()->search_follow_suggestions;
-
-        $results = CwpSearchEngine::create()
-            ->search(
-                $keywords,
-                $this->getClassesToSearch(),
-                $this->getSearchIndex(),
-                $this->getSearchPageSize(),
-                $start,
-                $suggestions
-            );
-
-        // Customise content with these results
-        $properties = array(
-            'MetaTitle' => _t('CWP_Search.MetaTitle', 'Search {keywords}', array('keywords' => $keywords)),
-            'NoSearchResults' => _t('CWP_Search.NoResult', 'Sorry, your search query did not return any results.'),
-            'EmptySearch' => _t('CWP_Search.EmptySearch', 'Search field empty, please enter your search query.'),
-            'PdfLink' => '',
-            'Title' => _t('SearchForm.SearchResults', 'Search Results'),
-        );
-        $this->extend('updateSearchResults', $results, $properties);
-
-        // Customise page
-        $response = $this->customise($properties);
-        if ($results) {
-            $response = $response
-                ->customise($results)
-                ->customise(array( 'Results' => $results->getResults() ));
-        }
-
-        // Render
-        $templates = $this->getResultsTemplate($request);
-        return $response->renderWith($templates);
-    }
-
-    /**
-     * Select the template to render search results with
-     *
-     * @param HTTPRequest $request
-     * @return array
-     */
-    protected function getResultsTemplate($request)
-    {
-        $templates = array('Page_results', 'Page');
-        if ($request->getVar('format') == 'rss') {
-            array_unshift($templates, 'Page_results_rss');
-        }
-        if ($request->getVar('format') == 'atom') {
-            array_unshift($templates, 'Page_results_atom');
-        }
-        return $templates;
-    }
-
-    /**
-     * Provide scripts as needed by the *default* theme.
-     * Override this function if you are using a custom theme based on the *default*.
-     *
-     * @deprecated 1.6..2.0 Use "starter" theme instead
-     */
-    public function getBaseScripts()
-    {
-        $scripts = array();
-        $this->extend('updateBaseScripts', $scripts);
-        return $scripts;
-    }
-
-    /**
-     * Provide stylesheets, as needed by the *default* theme assumed by this recipe.
-     * Override this function if you are using a custom theme based on the *default*.
-     *
-     * @deprecated 1.6..2.0 Use "starter" theme instead
-     */
-    public function getBaseStyles()
-    {
-        $styles = array();
-        $this->extend('updateBaseStyles', $styles);
-        return $styles;
-    }
-
-    /**
-     * Provide current year.
-     */
-    public function CurrentDatetime()
-    {
-        return DBDatetime::now();
-    }
-
-    public function getRSSLink()
-    {
-    }
-
-    /**
-     * Get the search index registered for this application
-     *
-     * @return CwpSearchIndex
-     */
-    protected function getSearchIndex()
-    {
-        // Will be a service name in 2.0 and returned via injector
-        /** @var CwpSearchIndex $index */
-        $index = null;
-        if (self::$search_index_class) {
-            $index = Injector::inst()->get(self::$search_index_class);
-        }
-        return $index;
-    }
-
-    /**
-     * Gets the list of configured classes to search
-     *
-     * @return array
-     */
-    protected function getClassesToSearch()
-    {
-        // Will be private static config in 2.0
-        return self::$classes_to_search;
-    }
-
-    /**
-     * Get page size for search
-     *
-     * @return int
-     */
-    protected function getSearchPageSize()
-    {
-        // Will be private static config in 2.0
-        return self::$results_per_page;
-    }
+	public function getPDFProxy($pdfBaseUrl)
+	{
+		if (!defined('CWP_SECURE_DOMAIN') || $pdfBaseUrl == CWP_SECURE_DOMAIN.'/') {
+			$proxy = '';
+		} else {
+			$proxy = ' --proxy ' . SS_OUTBOUND_PROXY . ':' . SS_OUTBOUND_PROXY_PORT;
+		}
+		return $proxy;
+	}
+
+	/**
+	 * Render the page as PDF using wkhtmltopdf.
+	 */
+	public function generatePDF()
+	{
+		if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
+			return false;
+		}
+
+		$binaryPath = Config::inst()->get(BasePage::class, 'wkhtmltopdf_binary');
+		if (!$binaryPath || !is_executable($binaryPath)) {
+			if (defined('WKHTMLTOPDF_BINARY') && is_executable(WKHTMLTOPDF_BINARY)) {
+				$binaryPath = WKHTMLTOPDF_BINARY;
+			}
+		}
+
+		if (!$binaryPath) {
+			user_error('Neither WKHTMLTOPDF_BINARY nor BasePage.wkhtmltopdf_binary are defined', E_USER_ERROR);
+		}
+
+		if (Versioned::get_reading_mode() == 'Stage.Stage') {
+			user_error('Generating PDFs on draft is not supported', E_USER_ERROR);
+		}
+
+		set_time_limit(60);
+
+		// prepare the paths
+		$pdfFile = $this->dataRecord->getPdfFilename();
+		$bodyFile = str_replace('.pdf', '_pdf.html', $pdfFile);
+		$footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
+
+		// make sure the work directory exists
+		if (!file_exists(dirname($pdfFile))) {
+			Filesystem::makeFolder(dirname($pdfFile));
+		}
+
+		//decide the domain to use in generation
+		$pdfBaseUrl = $this->getPDFBaseURL();
+
+		// Force http protocol on CWP - fetching from localhost without using the proxy, SSL terminates on gateway.
+		if (defined('CWP_ENVIRONMENT')) {
+			Config::inst()->nest();
+			Config::inst()->update(Director::class, 'alternate_protocol', 'http');
+			//only set alternate protocol if CWP_SECURE_DOMAIN is defined OR pdf_base_url is
+			if ($pdfBaseUrl) {
+				Config::inst()->update(Director::class, 'alternate_base_url', 'http://'.$pdfBaseUrl);
+			}
+		}
+
+		$bodyViewer = $this->getViewer('pdf');
+
+		// write the output of this page to HTML, ready for conversion to PDF
+		file_put_contents($bodyFile, $bodyViewer->process($this));
+
+		// get the viewer for the current template with _pdffooter
+		$footerViewer = $this->getViewer('pdffooter');
+
+		// write the output of the footer template to HTML, ready for conversion to PDF
+		file_put_contents($footerFile, $footerViewer->process($this));
+
+		if (defined('CWP_ENVIRONMENT')) {
+			Config::inst()->unnest();
+		}
+
+		//decide what the proxy should look like
+		$proxy = $this->getPDFProxy($pdfBaseUrl);
+
+		// finally, generate the PDF
+		$command = $binaryPath . $proxy . ' --outline -B 40pt -L 20pt -R 20pt -T 20pt --encoding utf-8 '
+			. '--orientation Portrait --disable-javascript --quiet --print-media-type ';
+		$retVal = 0;
+		$output = array();
+		exec(
+			$command . " --footer-html \"$footerFile\" \"$bodyFile\" \"$pdfFile\" &> /dev/stdout",
+			$output,
+			$retVal
+		);
+
+		// remove temporary file
+		unlink($bodyFile);
+		unlink($footerFile);
+
+		// output any errors
+		if ($retVal != 0) {
+			user_error('wkhtmltopdf failed: ' . implode("\n", $output), E_USER_ERROR);
+		}
+
+		// serve the generated file
+		return HTTPRequest::send_file(file_get_contents($pdfFile), basename($pdfFile), 'application/pdf');
+	}
+
+	/**
+	 * Site search form
+	 */
+	public function SearchForm()
+	{
+		$searchText = $this->getRequest()->getVar('Search');
+
+		$fields = FieldList::create(
+			TextField::create('Search', false, $searchText)
+		);
+		$actions = FieldList::create(
+			FormAction::create('results', _t('SearchForm.GO', 'Go'))
+		);
+
+		$form = SearchForm::create($this, SearchForm::class, $fields, $actions);
+		$form->setFormAction('search/SearchForm');
+
+		return $form;
+	}
+
+	/**
+	 * Get search form with _header suffix
+	 *
+	 * @return SearchForm
+	 */
+	public function HeaderSearchForm()
+	{
+		return $this->SearchForm()->setTemplate('SearchForm_header');
+	}
+
+	/**
+	 * Process and render search results.
+	 *
+	 * @param array $data The raw request data submitted by user
+	 * @param SearchForm $form The form instance that was submitted
+	 * @param HTTPRequest $request Request generated for this action
+	 * @return DBHTMLText
+	 */
+	public function results($data, $form, $request)
+	{
+		// Check parameters for terms, pagination, and if we should follow suggestions
+		$keywords = empty($data['Search']) ? '' : $data['Search'];
+		$start = isset($data['start']) ? $data['start'] : 0;
+		$suggestions = isset($data['suggestions'])
+			? $data['suggestions']
+			: $this->config()->search_follow_suggestions;
+
+		$results = CwpSearchEngine::create()
+			->search(
+				$keywords,
+				$this->getClassesToSearch(),
+				$this->getSearchIndex(),
+				$this->getSearchPageSize(),
+				$start,
+				$suggestions
+			);
+
+		// Customise content with these results
+		$properties = array(
+			'MetaTitle' => _t('CWP_Search.MetaTitle', 'Search {keywords}', array('keywords' => $keywords)),
+			'NoSearchResults' => _t('CWP_Search.NoResult', 'Sorry, your search query did not return any results.'),
+			'EmptySearch' => _t('CWP_Search.EmptySearch', 'Search field empty, please enter your search query.'),
+			'PdfLink' => '',
+			'Title' => _t('SearchForm.SearchResults', 'Search Results'),
+		);
+		$this->extend('updateSearchResults', $results, $properties);
+
+		// Customise page
+		$response = $this->customise($properties);
+		if ($results) {
+			$response = $response
+				->customise($results)
+				->customise(array( 'Results' => $results->getResults() ));
+		}
+
+		// Render
+		$templates = $this->getResultsTemplate($request);
+		return $response->renderWith($templates);
+	}
+
+	/**
+	 * Select the template to render search results with
+	 *
+	 * @param HTTPRequest $request
+	 * @return array
+	 */
+	protected function getResultsTemplate($request)
+	{
+		$templates = array('Page_results', 'Page');
+		if ($request->getVar('format') == 'rss') {
+			array_unshift($templates, 'Page_results_rss');
+		}
+		if ($request->getVar('format') == 'atom') {
+			array_unshift($templates, 'Page_results_atom');
+		}
+		return $templates;
+	}
+
+	/**
+	 * Provide scripts as needed by the *default* theme.
+	 * Override this function if you are using a custom theme based on the *default*.
+	 *
+	 * @deprecated 1.6..2.0 Use "starter" theme instead
+	 */
+	public function getBaseScripts()
+	{
+		$scripts = array();
+		$this->extend('updateBaseScripts', $scripts);
+		return $scripts;
+	}
+
+	/**
+	 * Provide stylesheets, as needed by the *default* theme assumed by this recipe.
+	 * Override this function if you are using a custom theme based on the *default*.
+	 *
+	 * @deprecated 1.6..2.0 Use "starter" theme instead
+	 */
+	public function getBaseStyles()
+	{
+		$styles = array();
+		$this->extend('updateBaseStyles', $styles);
+		return $styles;
+	}
+
+	/**
+	 * Provide current year.
+	 */
+	public function CurrentDatetime()
+	{
+		return DBDatetime::now();
+	}
+
+	public function getRSSLink()
+	{
+	}
+
+	/**
+	 * Get the search index registered for this application
+	 *
+	 * @return CwpSearchIndex
+	 */
+	protected function getSearchIndex()
+	{
+		// Will be a service name in 2.0 and returned via injector
+		/** @var CwpSearchIndex $index */
+		$index = null;
+		if (self::$search_index_class) {
+			$index = Injector::inst()->get(self::$search_index_class);
+		}
+		return $index;
+	}
+
+	/**
+	 * Gets the list of configured classes to search
+	 *
+	 * @return array
+	 */
+	protected function getClassesToSearch()
+	{
+		// Will be private static config in 2.0
+		return self::$classes_to_search;
+	}
+
+	/**
+	 * Get page size for search
+	 *
+	 * @return int
+	 */
+	protected function getSearchPageSize()
+	{
+		// Will be private static config in 2.0
+		return self::$results_per_page;
+	}
 }

src/PageTypes/FooterHolder.php

Indentation +42 added lines, -42 removed lines

@@ -14,54 +14,54 @@
 class FooterHolder extends RedirectorPage
 {
 
-    private static $description = 'Holder page that displays all child pages as links in the footer';
+	private static $description = 'Holder page that displays all child pages as links in the footer';
 
-    private static $singular_name = 'Footer Holder';
+	private static $singular_name = 'Footer Holder';
 
-    private static $plural_name = 'Footer Holders';
+	private static $plural_name = 'Footer Holders';
 
-    private static $defaults = [
-        'ShowInMenus' => 0,
-        'ShowInSearch' => 0,
-    ];
+	private static $defaults = [
+		'ShowInMenus' => 0,
+		'ShowInSearch' => 0,
+	];
 
-    private static $table_name = 'FooterHolder';
+	private static $table_name = 'FooterHolder';
 
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('RedirectorDescHeader');
-            $fields->removeByName('RedirectionType');
-            $fields->removeByName('LinkToID');
-            $fields->removeByName('ExternalURL');
-        });
-        return parent::getCMSFields();
-    }
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('RedirectorDescHeader');
+			$fields->removeByName('RedirectionType');
+			$fields->removeByName('LinkToID');
+			$fields->removeByName('ExternalURL');
+		});
+		return parent::getCMSFields();
+	}
 
-    /**
-     * Return the link to the first child page.
-     */
-    public function redirectionLink()
-    {
-        $childPage = $this->Children()->first();
+	/**
+	 * Return the link to the first child page.
+	 */
+	public function redirectionLink()
+	{
+		$childPage = $this->Children()->first();
 
-        if ($childPage) {
-            // If we're linking to another redirectorpage then just return the URLSegment, to prevent a cycle of
-            // redirector pages from causing an infinite loop.  Instead, they will cause a 30x redirection loop in
-            // the browser, but this can be handled sufficiently gracefully by the browser.
-            if ($childPage instanceof RedirectorPage) {
-                return $childPage->regularLink();
-            }
-            // For all other pages, just return the link of the page.
-            return $childPage->Link();
-        }
-    }
+		if ($childPage) {
+			// If we're linking to another redirectorpage then just return the URLSegment, to prevent a cycle of
+			// redirector pages from causing an infinite loop.  Instead, they will cause a 30x redirection loop in
+			// the browser, but this can be handled sufficiently gracefully by the browser.
+			if ($childPage instanceof RedirectorPage) {
+				return $childPage->regularLink();
+			}
+			// For all other pages, just return the link of the page.
+			return $childPage->Link();
+		}
+	}
 
-    public function syncLinkTracking()
-    {
-        // If we don't have anything to link to, then we have a broken link.
-        if (!$this->Children()) {
-            $this->HasBrokenLink = true;
-        }
-    }
+	public function syncLinkTracking()
+	{
+		// If we don't have anything to link to, then we have a broken link.
+		if (!$this->Children()) {
+			$this->HasBrokenLink = true;
+		}
+	}
 }

src/PageTypes/DatedUpdateHolderController.php

Indentation +332 added lines, -332 removed lines

@@ -32,347 +32,347 @@
  */
 class DatedUpdateHolderController extends PageController
 {
-    private static $allowed_actions = [
-        'rss',
-        'atom',
-        'DateRangeForm',
-    ];
-
-    private static $casting = [
-        'MetaTitle' => 'Text',
-        'FilterDescription' => 'Text',
-    ];
-
-    /**
-     * 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('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('DatedUpdateHolder.FILTER_BETWEEN', 'between') . ' '
-                        . date('j/m/Y', $from) . ' and ' . date('j/m/Y', $to);
-                } else {
-                    $filters[] = _t('DatedUpdateHolder.FILTER_ON', 'on') . ' ' . date('j/m/Y', $from);
-                }
-            } else {
-                $to = strtotime($params['to']);
-                $filters[] = _t('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('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) = array($from, $to);
-        }
-
-        // Flip the dates if the order is wrong.
-        if (isset($to) && isset($from) && strtotime($from)>strtotime($to)) {
-            list($to, $from) = array($from, $to);
-
-            if ($produceErrorMessages) {
-                // @todo replace
+	private static $allowed_actions = [
+		'rss',
+		'atom',
+		'DateRangeForm',
+	];
+
+	private static $casting = [
+		'MetaTitle' => 'Text',
+		'FilterDescription' => 'Text',
+	];
+
+	/**
+	 * 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('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('DatedUpdateHolder.FILTER_BETWEEN', 'between') . ' '
+						. date('j/m/Y', $from) . ' and ' . date('j/m/Y', $to);
+				} else {
+					$filters[] = _t('DatedUpdateHolder.FILTER_ON', 'on') . ' ' . date('j/m/Y', $from);
+				}
+			} else {
+				$to = strtotime($params['to']);
+				$filters[] = _t('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('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) = array($from, $to);
+		}
+
+		// Flip the dates if the order is wrong.
+		if (isset($to) && isset($from) && strtotime($from)>strtotime($to)) {
+			list($to, $from) = array($from, $to);
+
+			if ($produceErrorMessages) {
+				// @todo replace
 //                Session::setFormMessage(
 //                    'Form_DateRangeForm',
 //                    _t('DateUpdateHolder.FilterAppliedMessage', 'Filter has been applied with the dates reversed.'),
 //                    'warning'
 //                );
-            }
-        }
+			}
+		}
 
-        // Notify the user that filtering by single date is taking place.
-        if (isset($from) && !isset($to)) {
-            if ($produceErrorMessages) {
-                // @todo replace
+		// Notify the user that filtering by single date is taking place.
+		if (isset($from) && !isset($to)) {
+			if ($produceErrorMessages) {
+				// @todo replace
 //                Session::setFormMessage(
 //                    'Form_DateRangeForm',
 //                    _t('DateUpdateHolder.DateRangeFilterMessage', 'Filtered by a single date.'),
 //                    'warning'
 //                );
-            }
-        }
-
-        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('DatedUpdateHolder.FROM_DATE', 'From date'),
-            _t('DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
-        ));
-        $dateToTitle = DBField::create_field('HTMLText', sprintf(
-            '%s <span class="field-note">%s</span>',
-            _t('DatedUpdateHolder.TO_DATE', 'To date'),
-            _t('DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
-        ));
-
-        $fields = FieldList::create(
-            DateField::create('from', $dateFromTitle),
-            DateField::create('to', $dateToTitle),
-            HiddenField::create('tag')
-        );
-
-        $actions = FieldList::create(
-            FormAction::create("doDateFilter")->setTitle("Filter")->addExtraClass('btn btn-primary primary'),
-            FormAction::create("doDateReset")->setTitle("Clear")->addExtraClass('btn')
-        );
-
-        $form = Form::create($this, 'DateRangeForm', $fields, $actions);
-        $form->loadDataFrom($this->request->getVars());
-        $form->setFormMethod('get');
-
-        // Manually extract the message so we can clear it.
-        $form->ErrorMessage = $form->getMessage();
-        $form->ErrorMessageType = $form->getMessageType();
-        $form->clearMessage();
-
-        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();
-    }
+			}
+		}
+
+		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('DatedUpdateHolder.FROM_DATE', 'From date'),
+			_t('DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
+		));
+		$dateToTitle = DBField::create_field('HTMLText', sprintf(
+			'%s <span class="field-note">%s</span>',
+			_t('DatedUpdateHolder.TO_DATE', 'To date'),
+			_t('DatedUpdateHolder.DATE_EXAMPLE', '(example: 2017/12/30)')
+		));
+
+		$fields = FieldList::create(
+			DateField::create('from', $dateFromTitle),
+			DateField::create('to', $dateToTitle),
+			HiddenField::create('tag')
+		);
+
+		$actions = FieldList::create(
+			FormAction::create("doDateFilter")->setTitle("Filter")->addExtraClass('btn btn-primary primary'),
+			FormAction::create("doDateReset")->setTitle("Clear")->addExtraClass('btn')
+		);
+
+		$form = Form::create($this, 'DateRangeForm', $fields, $actions);
+		$form->loadDataFrom($this->request->getVars());
+		$form->setFormMethod('get');
+
+		// Manually extract the message so we can clear it.
+		$form->ErrorMessage = $form->getMessage();
+		$form->ErrorMessageType = $form->getMessageType();
+		$form->clearMessage();
+
+		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/PageTypes/EventHolderController.php

Indentation +41 added lines, -41 removed lines

@@ -19,53 +19,53 @@
  */
 class EventHolderController extends DatedUpdateHolderController
 {
-    public function getUpdateName()
-    {
-        $params = $this->parseParams();
-        if ($params['upcomingOnly']) {
-            return _t('EventHolder.Upcoming', 'Upcoming events');
-        }
+	public function getUpdateName()
+	{
+		$params = $this->parseParams();
+		if ($params['upcomingOnly']) {
+			return _t('EventHolder.Upcoming', 'Upcoming events');
+		}
 
-        return 'Events';
-    }
+		return 'Events';
+	}
 
-    /**
-     * Parse URL parameters.
-     *
-     * @param boolean $produceErrorMessages Set to false to omit session messages.
-     */
-    public function parseParams($produceErrorMessages = true)
-    {
-        $params = parent::parseParams($produceErrorMessages);
+	/**
+	 * Parse URL parameters.
+	 *
+	 * @param boolean $produceErrorMessages Set to false to omit session messages.
+	 */
+	public function parseParams($produceErrorMessages = true)
+	{
+		$params = parent::parseParams($produceErrorMessages);
 
-        // We need to set whether or not we're supposed to be displaying only upcoming events or all events.
-        $params['upcomingOnly'] = !($params['from'] || $params['to'] || $params['year'] || $params['month']);
+		// We need to set whether or not we're supposed to be displaying only upcoming events or all events.
+		$params['upcomingOnly'] = !($params['from'] || $params['to'] || $params['year'] || $params['month']);
 
-        return $params;
-    }
+		return $params;
+	}
 
-    /**
-     * Get the events based on the current query.
-     */
-    public function FilteredUpdates($pageSize = 20)
-    {
-        $params = $this->parseParams();
+	/**
+	 * Get the events 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']
-        );
+		$items = $this->Updates(
+			$params['tag'],
+			$params['from'],
+			$params['to'],
+			$params['year'],
+			$params['month']
+		);
 
-        if ($params['upcomingOnly']) {
-            $items = $items->filter(['Date:LessThan:Not' => DBDatetime::now()->Format('y-MM-dd')]);
-        }
+		if ($params['upcomingOnly']) {
+			$items = $items->filter(['Date:LessThan:Not' => DBDatetime::now()->Format('y-MM-dd')]);
+		}
 
-        // Apply pagination
-        $list = PaginatedList::create($items, $this->getRequest());
-        $list->setPageLength($pageSize);
-        return $list;
-    }
+		// Apply pagination
+		$list = PaginatedList::create($items, $this->getRequest());
+		$list->setPageLength($pageSize);
+		return $list;
+	}
 }

src/PageTypes/SitemapPage.php

Indentation +4 added lines, -4 removed lines

@@ -6,11 +6,11 @@
 
 class SitemapPage extends Page
 {
-    private static $description = 'Lists all pages on the site';
+	private static $description = 'Lists all pages on the site';
 
-    private static $singular_name = 'Sitemap Page';
+	private static $singular_name = 'Sitemap Page';
 
-    private static $plural_name = 'Sitemap Pages';
+	private static $plural_name = 'Sitemap Pages';
 
-    private static $table_name = 'SitemapPage';
+	private static $table_name = 'SitemapPage';
 }

src/PageTypes/DatedUpdatePage.php

Indentation +55 added lines, -55 removed lines

@@ -10,70 +10,70 @@
 
 class DatedUpdatePage extends Page
 {
-    /**
-     * Meant as an abstract base class.
-     *
-     * {@inheritDoc}
-     */
-    private static $hide_ancestor = DatedUpdatePage::class;
+	/**
+	 * Meant as an abstract base class.
+	 *
+	 * {@inheritDoc}
+	 */
+	private static $hide_ancestor = DatedUpdatePage::class;
 
-    private static $singular_name = 'Dated Update Page';
+	private static $singular_name = 'Dated Update Page';
 
-    private static $plural_name = 'Dated Update Pages';
+	private static $plural_name = 'Dated Update Pages';
 
-    private static $table_name = 'DatedUpdatePage';
+	private static $table_name = 'DatedUpdatePage';
 
-    private static $defaults = [
-        'ShowInMenus' => false,
-    ];
+	private static $defaults = [
+		'ShowInMenus' => false,
+	];
 
-    private static $db = [
-        'Abstract' => 'Text',
-        'Date' => 'Datetime',
-    ];
+	private static $db = [
+		'Abstract' => 'Text',
+		'Date' => 'Datetime',
+	];
 
-    /**
-     * Add the default for the Date being the current day.
-     */
-    public function populateDefaults()
-    {
-        parent::populateDefaults();
+	/**
+	 * Add the default for the Date being the current day.
+	 */
+	public function populateDefaults()
+	{
+		parent::populateDefaults();
 
-        if (!isset($this->Date) || $this->Date === null) {
-            $this->Date = DBDatetime::now()->Format('y-MM-dd 09:00:00');
-        }
-    }
+		if (!isset($this->Date) || $this->Date === null) {
+			$this->Date = DBDatetime::now()->Format('y-MM-dd 09:00:00');
+		}
+	}
 
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Date'] = _t('DateUpdatePage.DateLabel', 'Date');
-        $labels['Abstract'] = _t('DateUpdatePage.AbstractTextFieldLabel', 'Abstract');
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Date'] = _t('DateUpdatePage.DateLabel', 'Date');
+		$labels['Abstract'] = _t('DateUpdatePage.AbstractTextFieldLabel', 'Abstract');
 
-        return $labels;
-    }
+		return $labels;
+	}
 
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldToTab(
-                'Root.Main',
-                $dateTimeField = DatetimeField::create('Date', $this->fieldLabel('Date')),
-                'Content'
-            );
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldToTab(
+				'Root.Main',
+				$dateTimeField = DatetimeField::create('Date', $this->fieldLabel('Date')),
+				'Content'
+			);
 
-            $fields->addfieldToTab(
-                'Root.Main',
-                $abstractField = TextareaField::create('Abstract', $this->fieldLabel('Abstract')),
-                'Content'
-            );
-            $abstractField->setAttribute('maxlength', '160');
-            $abstractField->setRightTitle(_t(
-                'DateUpdatePage.AbstractDesc',
-                'The abstract is used as a summary on the listing pages. It is limited to 160 characters.'
-            ));
-            $abstractField->setRows(6);
-        });
-        return parent::getCMSFields();
-    }
+			$fields->addfieldToTab(
+				'Root.Main',
+				$abstractField = TextareaField::create('Abstract', $this->fieldLabel('Abstract')),
+				'Content'
+			);
+			$abstractField->setAttribute('maxlength', '160');
+			$abstractField->setRightTitle(_t(
+				'DateUpdatePage.AbstractDesc',
+				'The abstract is used as a summary on the listing pages. It is limited to 160 characters.'
+			));
+			$abstractField->setRows(6);
+		});
+		return parent::getCMSFields();
+	}
 }

src/PageTypes/BaseHomePageController.php

Indentation +15 added lines, -15 removed lines

@@ -6,20 +6,20 @@
 
 class BaseHomePageController extends PageController
 {
-    public function getNewsPage()
-    {
-        return NewsHolder::get_one(NewsHolder::class);
-    }
+	public function getNewsPage()
+	{
+		return NewsHolder::get_one(NewsHolder::class);
+	}
 
-    /**
-     * @param int $amount The amount of items to provide.
-     */
-    public function getNewsItems($amount = 2)
-    {
-        $newsHolder = $this->getNewsPage();
-        if ($newsHolder) {
-            $controller = NewsHolderController::create($newsHolder);
-            return $controller->Updates()->limit($amount);
-        }
-    }
+	/**
+	 * @param int $amount The amount of items to provide.
+	 */
+	public function getNewsItems($amount = 2)
+	{
+		$newsHolder = $this->getNewsPage();
+		if ($newsHolder) {
+			$controller = NewsHolderController::create($newsHolder);
+			return $controller->Updates()->limit($amount);
+		}
+	}
 }

src/PageTypes/DatedUpdateHolder.php

Indentation +243 added lines, -243 removed lines

@@ -17,247 +17,247 @@
 
 class DatedUpdateHolder extends Page
 {
-    /**
-     * Meant as an abstract base class.
-     *
-     * {@inheritDoc}
-     */
-    private static $hide_ancestor = DatedUpdateHolder::class;
-
-    private static $update_name = 'Updates';
-
-    private static $update_class = DatedUpdatePage::class;
-
-    private static $singular_name = 'Dated Update Holder';
-
-    private static $plural_name = 'Dated Update Holders';
-
-    private static $table_name = 'DatedUpdateHolder';
-
-    /**
-     * Find all distinct tags (TaxonomyTerms) associated with the DatedUpdatePages under this holder.
-     */
-    public function UpdateTags()
-    {
-        $siteTree = DataObject::getSchema()->tableName(SiteTree::class);
-        $taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
-
-        $tags = TaxonomyTerm::get()
-            ->innerJoin('BasePage_Terms', sprintf('"%s"."ID"="BasePage_Terms"."TaxonomyTermID"', $taxonomy))
-            ->innerJoin(
-                $siteTree,
-                sprintf(
-                    '"%s"."ID" = "BasePage_Terms"."BasePageID" AND "%s"."ParentID" = \'%d\'',
-                    $siteTree,
-                    $siteTree,
-                    $this->ID
-                )
-            )
-            ->sort('Name');
-
-        return $tags;
-    }
-
-    /**
-     * Wrapper to find all updates belonging to this holder, based on some filters.
-     */
-    public function Updates($tagID = null, $dateFrom = null, $dateTo = null, $year = null, $monthNumber = null)
-    {
-        $className = Config::inst()->get($this->ClassName, 'update_class');
-        return static::AllUpdates($className, $this->ID, $tagID, $dateFrom, $dateTo, $year, $monthNumber);
-    }
-
-    /**
-     * Find all site's updates, based on some filters.
-     * Omitting parameters will prevent relevant filters from being applied. The filters are ANDed together.
-     *
-     * @param string $className The name of the class to fetch.
-     * @param int|null $parentID The ID of the holder to extract the updates from.
-     * @param int|null $tagID The ID of the tag to filter the updates by.
-     * @param string|null $dateFrom The beginning of a date filter range.
-     * @param string|null $dateTo The end of the date filter range. If empty, only one day will be searched for.
-     * @param int|null $year Numeric value of the year to show.
-     * @param int|null $monthNumber Numeric value of the month to show.
-     *
-     * @returns DataList | PaginatedList
-     */
-    public static function AllUpdates(
-        $className = DatedUpdatePage::class,
-        $parentID = null,
-        $tagID = null,
-        $dateFrom = null,
-        $dateTo = null,
-        $year = null,
-        $monthNumber = null
-    ) {
-
-        $items = $className::get();
-        $dbTableName = DataObject::getSchema()->tableForField($className, 'Date');
-        if (!$dbTableName) {
-            $dbTableName = DatedUpdatePage::class;
-        }
-
-        // Filter by parent holder.
-        if (isset($parentID)) {
-            $items = $items->filter(['ParentID'=>$parentID]);
-        }
-
-        // Filter down to a single tag.
-        if (isset($tagID)) {
-            $taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
-            $tableName = DataObject::getSchema()->tableName($className);
-
-            $items = $items->innerJoin(
-                'BasePage_Terms',
-                sprintf('"%s"."ID" = "BasePage_Terms"."BasePageID"', $tableName)
-            )->innerJoin(
-                $taxonomy,
-                sprintf(
-                    '"BasePage_Terms"."TaxonomyTermID" = "%s"."ID" AND "TaxonomyTerm"."ID" = \'%d\'',
-                    $taxonomy,
-                    $tagID
-                )
-            );
-        }
-
-        // Filter by date
-        if (isset($dateFrom)) {
-            if (!isset($dateTo)) {
-                $dateTo = $dateFrom;
-            }
-
-            $items = $items->where([
-                sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql("$dateFrom 00:00:00")),
-                sprintf('"%s"."Date" <= \'%s\'', $dbTableName, Convert::raw2sql("$dateTo 23:59:59"))
-            ]);
-        }
-
-        // Filter down to single month.
-        if (isset($year) && isset($monthNumber)) {
-            $year = (int)$year;
-            $monthNumber = (int)$monthNumber;
-
-            $beginDate = sprintf("%04d-%02d-01 00:00:00", $year, $monthNumber);
-            $endDate = date('Y-m-d H:i:s', strtotime("{$beginDate} +1 month"));
-
-            $items = $items->where(array(
-                sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql($beginDate)),
-                sprintf('"%s"."Date" < \'%s\'', $dbTableName, Convert::raw2sql($endDate))
-            ));
-        }
-
-        // Unpaginated DataList.
-        return $items;
-    }
-
-    /**
-     * Produce an ArrayList of available months out of the updates contained in the DataList.
-     *
-     * Here is an example of the returned structure:
-     * ArrayList:
-     *   ArrayData:
-     *     YearName => 2013
-     *     Months => ArrayList:
-     *       MonthName => Jan
-     *       MonthNumber => 1
-     *       MonthLink => (page URL)year=2012&month=1
-     *       Active => true
-     *   ArrayData:
-     *     YearName => 2012
-     *     Months => ArrayList:
-     *     ...
-     *
-     * @param DataList $updates DataList DataList to extract months from.
-     * @param string $link Link used as abase to construct the MonthLink.
-     * @param int $currentYear Currently selected year, for computing the link active state.
-     * @param int $currentMonthNumber Currently selected month, for computing the link active state.
-     *
-     * @returns ArrayList
-     */
-    public static function ExtractMonths(
-        DataList $updates,
-        $link = null,
-        $currentYear = null,
-        $currentMonthNumber = null
-    ) {
-        // Set the link to current URL in the same way the HTTP::setGetVar does it.
-        if (!isset($link)) {
-            $link = Director::makeRelative($_SERVER['REQUEST_URI']);
-        }
-
-        $dates = $updates->dataQuery()
-            ->groupby('YEAR("Date")')
-            ->groupby('MONTH("Date")')
-            ->query()
-            ->setSelect([
-                'Year' => 'YEAR("Date")',
-                'Month' => 'MONTH("Date")',
-            ])
-            ->addWhere('"Date" IS NOT NULL')
-            ->setOrderBy([
-                'YEAR("Date")' => 'DESC',
-                'MONTH("Date")' => 'DESC',
-            ])
-            ->execute();
-
-        $years = [];
-        foreach ($dates as $date) {
-            $monthNumber = $date['Month'];
-            $year = $date['Year'];
-            $dateObj = new DateTime(implode('-', [$year, $monthNumber, 1]));
-            $monthName = $dateObj->Format('M');
-
-            // Set up the relevant year array, if not yet available.
-            if (!isset($years[$year])) {
-                $years[$year] = ['YearName'=>$year, 'Months' => []];
-            }
-
-            // Check if the currently processed month is the one that is selected via GET params.
-            $active = false;
-            if (isset($year) && isset($monthNumber)) {
-                $active = (((int)$currentYear)==$year && ((int)$currentMonthNumber)==$monthNumber);
-            }
-
-            // Build the link - keep the tag and date filter, but reset the pagination.
-            if ($active) {
-                // Allow clicking to deselect the month.
-                $link = HTTP::setGetVar('month', null, $link, '&');
-                $link = HTTP::setGetVar('year', null, $link, '&');
-            } else {
-                $link = HTTP::setGetVar('month', $monthNumber, $link, '&');
-                $link = HTTP::setGetVar('year', $year, $link, '&');
-            }
-            $link = HTTP::setGetVar('start', null, $link, '&');
-
-            $years[$year]['Months'][$monthNumber] = array(
-                'MonthName'=>$monthName,
-                'MonthNumber'=>$monthNumber,
-                'MonthLink'=>$link,
-                'Active'=>$active
-            );
-        }
-
-        // ArrayList will not recursively walk through the supplied array, so manually build nested ArrayLists.
-        foreach ($years as &$year) {
-            $year['Months'] = new ArrayList($year['Months']);
-        }
-
-        // Reverse the list so the most recent years appear first.
-        return new ArrayList($years);
-    }
-
-    public function getDefaultRSSLink()
-    {
-        return $this->Link('rss');
-    }
-
-    public function getDefaultAtomLink()
-    {
-        return $this->Link('atom');
-    }
-
-    public function getSubscriptionTitle()
-    {
-        return $this->Title;
-    }
+	/**
+	 * Meant as an abstract base class.
+	 *
+	 * {@inheritDoc}
+	 */
+	private static $hide_ancestor = DatedUpdateHolder::class;
+
+	private static $update_name = 'Updates';
+
+	private static $update_class = DatedUpdatePage::class;
+
+	private static $singular_name = 'Dated Update Holder';
+
+	private static $plural_name = 'Dated Update Holders';
+
+	private static $table_name = 'DatedUpdateHolder';
+
+	/**
+	 * Find all distinct tags (TaxonomyTerms) associated with the DatedUpdatePages under this holder.
+	 */
+	public function UpdateTags()
+	{
+		$siteTree = DataObject::getSchema()->tableName(SiteTree::class);
+		$taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
+
+		$tags = TaxonomyTerm::get()
+			->innerJoin('BasePage_Terms', sprintf('"%s"."ID"="BasePage_Terms"."TaxonomyTermID"', $taxonomy))
+			->innerJoin(
+				$siteTree,
+				sprintf(
+					'"%s"."ID" = "BasePage_Terms"."BasePageID" AND "%s"."ParentID" = \'%d\'',
+					$siteTree,
+					$siteTree,
+					$this->ID
+				)
+			)
+			->sort('Name');
+
+		return $tags;
+	}
+
+	/**
+	 * Wrapper to find all updates belonging to this holder, based on some filters.
+	 */
+	public function Updates($tagID = null, $dateFrom = null, $dateTo = null, $year = null, $monthNumber = null)
+	{
+		$className = Config::inst()->get($this->ClassName, 'update_class');
+		return static::AllUpdates($className, $this->ID, $tagID, $dateFrom, $dateTo, $year, $monthNumber);
+	}
+
+	/**
+	 * Find all site's updates, based on some filters.
+	 * Omitting parameters will prevent relevant filters from being applied. The filters are ANDed together.
+	 *
+	 * @param string $className The name of the class to fetch.
+	 * @param int|null $parentID The ID of the holder to extract the updates from.
+	 * @param int|null $tagID The ID of the tag to filter the updates by.
+	 * @param string|null $dateFrom The beginning of a date filter range.
+	 * @param string|null $dateTo The end of the date filter range. If empty, only one day will be searched for.
+	 * @param int|null $year Numeric value of the year to show.
+	 * @param int|null $monthNumber Numeric value of the month to show.
+	 *
+	 * @returns DataList | PaginatedList
+	 */
+	public static function AllUpdates(
+		$className = DatedUpdatePage::class,
+		$parentID = null,
+		$tagID = null,
+		$dateFrom = null,
+		$dateTo = null,
+		$year = null,
+		$monthNumber = null
+	) {
+
+		$items = $className::get();
+		$dbTableName = DataObject::getSchema()->tableForField($className, 'Date');
+		if (!$dbTableName) {
+			$dbTableName = DatedUpdatePage::class;
+		}
+
+		// Filter by parent holder.
+		if (isset($parentID)) {
+			$items = $items->filter(['ParentID'=>$parentID]);
+		}
+
+		// Filter down to a single tag.
+		if (isset($tagID)) {
+			$taxonomy = DataObject::getSchema()->tableName(TaxonomyTerm::class);
+			$tableName = DataObject::getSchema()->tableName($className);
+
+			$items = $items->innerJoin(
+				'BasePage_Terms',
+				sprintf('"%s"."ID" = "BasePage_Terms"."BasePageID"', $tableName)
+			)->innerJoin(
+				$taxonomy,
+				sprintf(
+					'"BasePage_Terms"."TaxonomyTermID" = "%s"."ID" AND "TaxonomyTerm"."ID" = \'%d\'',
+					$taxonomy,
+					$tagID
+				)
+			);
+		}
+
+		// Filter by date
+		if (isset($dateFrom)) {
+			if (!isset($dateTo)) {
+				$dateTo = $dateFrom;
+			}
+
+			$items = $items->where([
+				sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql("$dateFrom 00:00:00")),
+				sprintf('"%s"."Date" <= \'%s\'', $dbTableName, Convert::raw2sql("$dateTo 23:59:59"))
+			]);
+		}
+
+		// Filter down to single month.
+		if (isset($year) && isset($monthNumber)) {
+			$year = (int)$year;
+			$monthNumber = (int)$monthNumber;
+
+			$beginDate = sprintf("%04d-%02d-01 00:00:00", $year, $monthNumber);
+			$endDate = date('Y-m-d H:i:s', strtotime("{$beginDate} +1 month"));
+
+			$items = $items->where(array(
+				sprintf('"%s"."Date" >= \'%s\'', $dbTableName, Convert::raw2sql($beginDate)),
+				sprintf('"%s"."Date" < \'%s\'', $dbTableName, Convert::raw2sql($endDate))
+			));
+		}
+
+		// Unpaginated DataList.
+		return $items;
+	}
+
+	/**
+	 * Produce an ArrayList of available months out of the updates contained in the DataList.
+	 *
+	 * Here is an example of the returned structure:
+	 * ArrayList:
+	 *   ArrayData:
+	 *     YearName => 2013
+	 *     Months => ArrayList:
+	 *       MonthName => Jan
+	 *       MonthNumber => 1
+	 *       MonthLink => (page URL)year=2012&month=1
+	 *       Active => true
+	 *   ArrayData:
+	 *     YearName => 2012
+	 *     Months => ArrayList:
+	 *     ...
+	 *
+	 * @param DataList $updates DataList DataList to extract months from.
+	 * @param string $link Link used as abase to construct the MonthLink.
+	 * @param int $currentYear Currently selected year, for computing the link active state.
+	 * @param int $currentMonthNumber Currently selected month, for computing the link active state.
+	 *
+	 * @returns ArrayList
+	 */
+	public static function ExtractMonths(
+		DataList $updates,
+		$link = null,
+		$currentYear = null,
+		$currentMonthNumber = null
+	) {
+		// Set the link to current URL in the same way the HTTP::setGetVar does it.
+		if (!isset($link)) {
+			$link = Director::makeRelative($_SERVER['REQUEST_URI']);
+		}
+
+		$dates = $updates->dataQuery()
+			->groupby('YEAR("Date")')
+			->groupby('MONTH("Date")')
+			->query()
+			->setSelect([
+				'Year' => 'YEAR("Date")',
+				'Month' => 'MONTH("Date")',
+			])
+			->addWhere('"Date" IS NOT NULL')
+			->setOrderBy([
+				'YEAR("Date")' => 'DESC',
+				'MONTH("Date")' => 'DESC',
+			])
+			->execute();
+
+		$years = [];
+		foreach ($dates as $date) {
+			$monthNumber = $date['Month'];
+			$year = $date['Year'];
+			$dateObj = new DateTime(implode('-', [$year, $monthNumber, 1]));
+			$monthName = $dateObj->Format('M');
+
+			// Set up the relevant year array, if not yet available.
+			if (!isset($years[$year])) {
+				$years[$year] = ['YearName'=>$year, 'Months' => []];
+			}
+
+			// Check if the currently processed month is the one that is selected via GET params.
+			$active = false;
+			if (isset($year) && isset($monthNumber)) {
+				$active = (((int)$currentYear)==$year && ((int)$currentMonthNumber)==$monthNumber);
+			}
+
+			// Build the link - keep the tag and date filter, but reset the pagination.
+			if ($active) {
+				// Allow clicking to deselect the month.
+				$link = HTTP::setGetVar('month', null, $link, '&');
+				$link = HTTP::setGetVar('year', null, $link, '&');
+			} else {
+				$link = HTTP::setGetVar('month', $monthNumber, $link, '&');
+				$link = HTTP::setGetVar('year', $year, $link, '&');
+			}
+			$link = HTTP::setGetVar('start', null, $link, '&');
+
+			$years[$year]['Months'][$monthNumber] = array(
+				'MonthName'=>$monthName,
+				'MonthNumber'=>$monthNumber,
+				'MonthLink'=>$link,
+				'Active'=>$active
+			);
+		}
+
+		// ArrayList will not recursively walk through the supplied array, so manually build nested ArrayLists.
+		foreach ($years as &$year) {
+			$year['Months'] = new ArrayList($year['Months']);
+		}
+
+		// Reverse the list so the most recent years appear first.
+		return new ArrayList($years);
+	}
+
+	public function getDefaultRSSLink()
+	{
+		return $this->Link('rss');
+	}
+
+	public function getDefaultAtomLink()
+	{
+		return $this->Link('atom');
+	}
+
+	public function getSubscriptionTitle()
+	{
+		return $this->Title;
+	}
 }