silverstripe / cwp

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

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->addFieldToTab(
                 'Root.Main',
                 $dateTimeField = DatetimeField::create('Date', $this->fieldLabel('Date')),

src/PageTypes/BasePage.php

Indentation +286 added lines, -286 removed lines

@@ -29,296 +29,296 @@
 
 class BasePage extends SiteTree
 {
-    private static $icon = 'cwp/images/icons/sitetree_images/page.png';
+	private static $icon = '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;
+	/**
+	 * 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 $pdf_export = false;
+	private static $pdf_export = false;
 
-    /*
+	/*
     *Domain to generate PDF's from, DOES not include protocol
     *i.e. google.com not http://google.com
     */
-    private static $pdf_base_url = "";
-
-    /**
-     * Allow custom overriding of the path to the WKHTMLTOPDF binary, in cases
-     * where multiple versions of the binary are available to choose from. This
-     * should be the full path to the binary (e.g. /usr/local/bin/wkhtmltopdf)
-     * @see BasePage_Controller::generatePDF();
-     */
-    private static $wkhtmltopdf_binary = null;
-
-    private static $generated_pdf_path = 'assets/_generated_pdfs';
-
-    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';
-
-    public static $related_pages_title = 'Related pages';
-
-    private static $many_many = [
-        'Terms' => TaxonomyTerm::class,
-        'RelatedPages' => BasePage::class,
-    ];
-
-    private static $many_many_extraFields = [
-        'RelatedPages' => [
-            'SortOrder' => 'Int',
-        ],
-    ];
-
-    private static $plural_name = 'Base Pages';
-
-    public $pageIcon = 'images/icons/sitetree_images/page.png';
-
-    /**
-     * Get the footer holder.
-     */
-    public function getFooter()
-    {
-        return FooterHolder::get_one(FooterHolder::class);
-    }
-
-    /**
-     * Return the full filename of the pdf file, including path & extension
-     */
-    public function getPdfFilename()
-    {
-        $baseName = sprintf('%s-%s', $this->URLSegment, $this->ID);
-
-        $folderPath = Config::inst()->get(BasePage::class, 'generated_pdf_path');
-        if ($folderPath[0] != '/') {
-            $folderPath = BASE_PATH . '/' . $folderPath;
-        }
-
-        return sprintf('%s/%s.pdf', $folderPath, $baseName);
-    }
-
-    /**
-     * Build pdf link for template.
-     */
-    public function PdfLink()
-    {
-        if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
-            return false;
-        }
-
-        $path = $this->getPdfFilename();
-
-        if ((Versioned::get_stage() === Versioned::LIVE) && file_exists($path)) {
-            return Director::baseURL() . preg_replace('#^/#', '', Director::makeRelative($path));
-        }
-        return $this->Link('downloadpdf');
-    }
-
-    public function RelatedPages()
-    {
-        return $this->getManyManyComponents('RelatedPages')->sort('SortOrder');
-    }
-
-    public function RelatedPagesTitle()
-    {
-        return $this->stat('related_pages_title');
-    }
-
-    /**
-     * Remove linked pdf when publishing the page,
-     * as it would be out of date.
-     */
-    public function onAfterPublish()
-    {
-        $filepath = $this->getPdfFilename();
-        if (file_exists($filepath)) {
-            unlink($filepath);
-        }
-    }
-
-    /**
-     * Remove linked pdf when unpublishing the page,
-     * so it's no longer valid.
-     *
-     * @return boolean
-     */
-    public function doUnpublish()
-    {
-        if (!parent::doUnpublish()) {
-            return false;
-        }
-
-        $filepath = $this->getPdfFilename();
-        if (file_exists($filepath)) {
-            unlink($filepath);
-        }
-
-        return true;
-    }
-
-    /**
-     * @deprecated 2.0.0 remove with other deprecations
-     * @todo Remove once CWP moves to 3.3 core (which includes this in SiteTree)
-     * @return self
-     */
-    public function doRestoreToStage()
-    {
-        $this->invokeWithExtensions('onBeforeRestoreToStage', $this);
-        $result = parent::doRestoreToStage();
-        $this->invokeWithExtensions('onAfterRestoreToStage', $this);
-
-        return $result;
-    }
-
-    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 GridFieldSortableRows('SortOrder'));
-
-            $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-            $dataColumns->setDisplayFields([
-                'Title' => _t('BasePage.ColumnTitle', 'Title'),
-                'ClassName' => _t('BasePage.ColumnPageType', 'Page Type')
-            ]);
-
-            $fields->findOrMakeTab(
-                'Root.RelatedPages',
-                _t('BasePage.RelatedPages', 'Related pages')
-            );
-            $fields->addFieldToTab(
-                'Root.RelatedPages',
-                GridField::create(
-                    'RelatedPages',
-                    _t('BasePage.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);
-
-                $autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
-                $autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
-
-                $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-                $dataColumns->setDisplayFields([
-                    'Name' => _t('BasePage.Term', 'Term'),
-                    'TaxonomyName' => _t('BasePage.Taxonomy', 'Taxonomy')
-                ]);
-
-                $fields->findOrMakeTab('Root.Tags', _t('BasePage.TagsTabTitle', 'Tags'));
-                $fields->addFieldToTab(
-                    'Root.Tags',
-                    TreeMultiselectField::create(
-                        'Terms',
-                        _t('BasePage.Terms', 'Terms'),
-                        TaxonomyTerm::class
-                    )->setDescription(_t('BasePage.TermsDescription', 'Click to search for additional terms'))
-                );
-            }
-        });
-        return parent::getCMSFields();
-    }
-
-    /**
-     * Provides data for translation navigation.
-     * Collects all site translations, marks the current one, and redirects
-     * to the translated home page if a. there is a translated homepage and b. the
-     * translation of the specific page is not available.
-     * @todo re-implement with Fluent
-     */
-    public function getAvailableTranslations()
-    {
-        if (!class_exists('Translatable')) {
-            return false;
-        }
-
-        $translations = new ArrayList();
-        $globalTranslations = Translatable::get_existing_content_languages();
-
-        foreach ($globalTranslations as $loc => $langName) {
-            // Find out the language name in native language.
-            $nativeLangName = i18n::get_language_name($loc, true);
-            if (!$nativeLangName) {
-                $nativeLangName = i18n::get_language_name(i18n::get_lang_from_locale($loc), true);
-            }
-            if (!$nativeLangName) {
-                // Fall back to the locale name.
-                $nativeLangName = $langName;
-            }
-
-            // Eliminate the part in brackets (e.g. [mandarin])
-            $nativeLangName = preg_replace('/ *[\(\[].*$/', '', $nativeLangName);
-
-            // Find out the link to the translated page.
-            $link = null;
-            $page = $this->getTranslation($loc);
-            if ($page) {
-                $link = $page->Link();
-            }
-            if (!$link) {
-                // Fall back to the home page
-                $link = Translatable::get_homepage_link_by_locale($loc);
-            }
-            if (!$link) {
-                continue;
-            }
-
-            // Assemble the table for the switcher.
-            $translations->push(new ArrayData(array(
-                'Locale' => i18n::convert_rfc1766($loc),
-                'LangName' => $nativeLangName,
-                'Link' => $link,
-                'Current' => (Translatable::get_current_locale()==$loc)
-            )));
-        }
-
-        if ($translations->count()>1) {
-            return $translations;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the native language name for the selected locale/language, empty string if Translatable is not available
-     *
-     * @return string
-     * @todo re-implement with Fluent
-     */
-    public function getSelectedLanguage()
-    {
-        if (!class_exists('Translatable')) {
-            return '';
-        }
-
-        $language = explode('_', Translatable::get_current_locale());
-        $languageCode = array_shift($language);
-        $nativeName = i18n::get_language_name($languageCode, true);
-
-        return $nativeName;
-    }
+	private static $pdf_base_url = "";
+
+	/**
+	 * Allow custom overriding of the path to the WKHTMLTOPDF binary, in cases
+	 * where multiple versions of the binary are available to choose from. This
+	 * should be the full path to the binary (e.g. /usr/local/bin/wkhtmltopdf)
+	 * @see BasePage_Controller::generatePDF();
+	 */
+	private static $wkhtmltopdf_binary = null;
+
+	private static $generated_pdf_path = 'assets/_generated_pdfs';
+
+	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';
+
+	public static $related_pages_title = 'Related pages';
+
+	private static $many_many = [
+		'Terms' => TaxonomyTerm::class,
+		'RelatedPages' => BasePage::class,
+	];
+
+	private static $many_many_extraFields = [
+		'RelatedPages' => [
+			'SortOrder' => 'Int',
+		],
+	];
+
+	private static $plural_name = 'Base Pages';
+
+	public $pageIcon = 'images/icons/sitetree_images/page.png';
+
+	/**
+	 * Get the footer holder.
+	 */
+	public function getFooter()
+	{
+		return FooterHolder::get_one(FooterHolder::class);
+	}
+
+	/**
+	 * Return the full filename of the pdf file, including path & extension
+	 */
+	public function getPdfFilename()
+	{
+		$baseName = sprintf('%s-%s', $this->URLSegment, $this->ID);
+
+		$folderPath = Config::inst()->get(BasePage::class, 'generated_pdf_path');
+		if ($folderPath[0] != '/') {
+			$folderPath = BASE_PATH . '/' . $folderPath;
+		}
+
+		return sprintf('%s/%s.pdf', $folderPath, $baseName);
+	}
+
+	/**
+	 * Build pdf link for template.
+	 */
+	public function PdfLink()
+	{
+		if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
+			return false;
+		}
+
+		$path = $this->getPdfFilename();
+
+		if ((Versioned::get_stage() === Versioned::LIVE) && file_exists($path)) {
+			return Director::baseURL() . preg_replace('#^/#', '', Director::makeRelative($path));
+		}
+		return $this->Link('downloadpdf');
+	}
+
+	public function RelatedPages()
+	{
+		return $this->getManyManyComponents('RelatedPages')->sort('SortOrder');
+	}
+
+	public function RelatedPagesTitle()
+	{
+		return $this->stat('related_pages_title');
+	}
+
+	/**
+	 * Remove linked pdf when publishing the page,
+	 * as it would be out of date.
+	 */
+	public function onAfterPublish()
+	{
+		$filepath = $this->getPdfFilename();
+		if (file_exists($filepath)) {
+			unlink($filepath);
+		}
+	}
+
+	/**
+	 * Remove linked pdf when unpublishing the page,
+	 * so it's no longer valid.
+	 *
+	 * @return boolean
+	 */
+	public function doUnpublish()
+	{
+		if (!parent::doUnpublish()) {
+			return false;
+		}
+
+		$filepath = $this->getPdfFilename();
+		if (file_exists($filepath)) {
+			unlink($filepath);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @deprecated 2.0.0 remove with other deprecations
+	 * @todo Remove once CWP moves to 3.3 core (which includes this in SiteTree)
+	 * @return self
+	 */
+	public function doRestoreToStage()
+	{
+		$this->invokeWithExtensions('onBeforeRestoreToStage', $this);
+		$result = parent::doRestoreToStage();
+		$this->invokeWithExtensions('onAfterRestoreToStage', $this);
+
+		return $result;
+	}
+
+	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 GridFieldSortableRows('SortOrder'));
+
+			$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+			$dataColumns->setDisplayFields([
+				'Title' => _t('BasePage.ColumnTitle', 'Title'),
+				'ClassName' => _t('BasePage.ColumnPageType', 'Page Type')
+			]);
+
+			$fields->findOrMakeTab(
+				'Root.RelatedPages',
+				_t('BasePage.RelatedPages', 'Related pages')
+			);
+			$fields->addFieldToTab(
+				'Root.RelatedPages',
+				GridField::create(
+					'RelatedPages',
+					_t('BasePage.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);
+
+				$autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
+				$autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
+
+				$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+				$dataColumns->setDisplayFields([
+					'Name' => _t('BasePage.Term', 'Term'),
+					'TaxonomyName' => _t('BasePage.Taxonomy', 'Taxonomy')
+				]);
+
+				$fields->findOrMakeTab('Root.Tags', _t('BasePage.TagsTabTitle', 'Tags'));
+				$fields->addFieldToTab(
+					'Root.Tags',
+					TreeMultiselectField::create(
+						'Terms',
+						_t('BasePage.Terms', 'Terms'),
+						TaxonomyTerm::class
+					)->setDescription(_t('BasePage.TermsDescription', 'Click to search for additional terms'))
+				);
+			}
+		});
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * Provides data for translation navigation.
+	 * Collects all site translations, marks the current one, and redirects
+	 * to the translated home page if a. there is a translated homepage and b. the
+	 * translation of the specific page is not available.
+	 * @todo re-implement with Fluent
+	 */
+	public function getAvailableTranslations()
+	{
+		if (!class_exists('Translatable')) {
+			return false;
+		}
+
+		$translations = new ArrayList();
+		$globalTranslations = Translatable::get_existing_content_languages();
+
+		foreach ($globalTranslations as $loc => $langName) {
+			// Find out the language name in native language.
+			$nativeLangName = i18n::get_language_name($loc, true);
+			if (!$nativeLangName) {
+				$nativeLangName = i18n::get_language_name(i18n::get_lang_from_locale($loc), true);
+			}
+			if (!$nativeLangName) {
+				// Fall back to the locale name.
+				$nativeLangName = $langName;
+			}
+
+			// Eliminate the part in brackets (e.g. [mandarin])
+			$nativeLangName = preg_replace('/ *[\(\[].*$/', '', $nativeLangName);
+
+			// Find out the link to the translated page.
+			$link = null;
+			$page = $this->getTranslation($loc);
+			if ($page) {
+				$link = $page->Link();
+			}
+			if (!$link) {
+				// Fall back to the home page
+				$link = Translatable::get_homepage_link_by_locale($loc);
+			}
+			if (!$link) {
+				continue;
+			}
+
+			// Assemble the table for the switcher.
+			$translations->push(new ArrayData(array(
+				'Locale' => i18n::convert_rfc1766($loc),
+				'LangName' => $nativeLangName,
+				'Link' => $link,
+				'Current' => (Translatable::get_current_locale()==$loc)
+			)));
+		}
+
+		if ($translations->count()>1) {
+			return $translations;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Returns the native language name for the selected locale/language, empty string if Translatable is not available
+	 *
+	 * @return string
+	 * @todo re-implement with Fluent
+	 */
+	public function getSelectedLanguage()
+	{
+		if (!class_exists('Translatable')) {
+			return '';
+		}
+
+		$language = explode('_', Translatable::get_current_locale());
+		$languageCode = array_shift($language);
+		$nativeName = i18n::get_language_name($languageCode, true);
+
+		return $nativeName;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -184,7 +184,7 @@ 
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             // Related Pages
             $components = GridFieldConfig_RelationEditor::create();
             $components->removeComponentsByType(GridFieldAddNewButton::class);
@@ -292,11 +292,11 @@ 
                 'Locale' => i18n::convert_rfc1766($loc),
                 'LangName' => $nativeLangName,
                 'Link' => $link,
-                'Current' => (Translatable::get_current_locale()==$loc)
+                'Current' => (Translatable::get_current_locale() == $loc)
             )));
         }
 
-        if ($translations->count()>1) {
+        if ($translations->count() > 1) {
             return $translations;
         } else {
             return null;

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/EventPage.php

Indentation +60 added lines, -60 removed lines

@@ -12,83 +12,83 @@
 
 class EventPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an event occurring on a specific date.';
+	private static $description = 'Describes an event occurring on a specific date.';
 
-    private static $default_parent = EventHolder::class;
+	private static $default_parent = EventHolder::class;
 
-    private static $can_be_root = false;
+	private static $can_be_root = false;
 
-    private static $icon = 'cwp/images/icons/sitetree_images/event_page.png';
+	private static $icon = 'cwp/images/icons/sitetree_images/event_page.png';
 
-    public $pageIcon =  'images/icons/sitetree_images/event_page.png';
+	public $pageIcon =  'images/icons/sitetree_images/event_page.png';
 
-    private static $singular_name = 'Event Page';
+	private static $singular_name = 'Event Page';
 
-    private static $plural_name = 'Event Pages';
+	private static $plural_name = 'Event Pages';
 
-    private static $db = [
-        'StartTime' => 'Time',
-        'EndTime' => 'Time',
-        'Location' => 'Text',
-    ];
+	private static $db = [
+		'StartTime' => 'Time',
+		'EndTime' => 'Time',
+		'Location' => 'Text',
+	];
 
-    private static $table_name = 'EventPage';
+	private static $table_name = 'EventPage';
 
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['StartTime'] = _t('DateUpdatePage.StartTimeFieldLabel', 'Start Time');
-        $labels['EndTime'] = _t('DateUpdatePage.EndTimeFieldLabel', 'End Time');
-        $labels['Location'] = _t('DateUpdatePage.LocationFieldLabel', 'Location');
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['StartTime'] = _t('DateUpdatePage.StartTimeFieldLabel', 'Start Time');
+		$labels['EndTime'] = _t('DateUpdatePage.EndTimeFieldLabel', 'End Time');
+		$labels['Location'] = _t('DateUpdatePage.LocationFieldLabel', 'Location');
 
-        return $labels;
-    }
+		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');
-        }
+	/**
+	 * 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->StartTime) || $this->StartTime === null) {
+			$this->StartTime = '09:00:00';
+		}
 
-        if (!isset($this->EndTime) || $this->EndTime === null) {
-            $this->EndTime = '17:00:00';
-        }
+		if (!isset($this->EndTime) || $this->EndTime === null) {
+			$this->EndTime = '17:00:00';
+		}
 
-        parent::populateDefaults();
-    }
+		parent::populateDefaults();
+	}
 
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('Date');
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('Date');
 
-            $dateTimeFields = array();
+			$dateTimeFields = array();
 
-            $dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
-            $dateTimeFields[] = $startTimeField = TimeField::create(
-                'StartTime',
-                '  ' . $this->fieldLabel('StartTime')
-            );
-            $dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
+			$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();
-    }
+			$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);
-    }
+	public function NiceLocation()
+	{
+		return nl2br(Convert::raw2xml($this->Location), true);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 
     private static $icon = 'cwp/images/icons/sitetree_images/event_page.png';
 
-    public $pageIcon =  'images/icons/sitetree_images/event_page.png';
+    public $pageIcon = 'images/icons/sitetree_images/event_page.png';
 
     private static $singular_name = 'Event Page';
 
@@ -66,7 +66,7 @@ 
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->removeByName('Date');
 
             $dateTimeFields = array();

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;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -134,8 +134,8 @@ 
 
         // Filter down to single month.
         if (isset($year) && isset($monthNumber)) {
-            $year = (int)$year;
-            $monthNumber = (int)$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"));
@@ -215,7 +215,7 @@ 
             // 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);
+                $active = (((int) $currentYear) == $year && ((int) $currentMonthNumber) == $monthNumber);
             }
 
             // Build the link - keep the tag and date filter, but reset the pagination.

src/PageTypes/SitemapPageController.php

Indentation +47 added lines, -47 removed lines

@@ -9,51 +9,51 @@
 
 class SitemapPageController extends PageController
 {
-    private static $allowed_actions = [
-        'showpage',
-    ];
-
-    private static $url_handlers = [
-        'page/$ID' => 'showpage',
-    ];
-
-    public function Page($link)
-    {
-        if ($link instanceof HTTPRequest) {
-            Deprecation::notice('2.0', 'Using page() as a url handler is deprecated. Use showpage() action instead');
-            return $this->showpage($link);
-        }
-        return parent::Page($link);
-    }
-
-    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('SitemapNodeChildren');
-        }
-
-        return $viewer;
-    }
+	private static $allowed_actions = [
+		'showpage',
+	];
+
+	private static $url_handlers = [
+		'page/$ID' => 'showpage',
+	];
+
+	public function Page($link)
+	{
+		if ($link instanceof HTTPRequest) {
+			Deprecation::notice('2.0', 'Using page() as a url handler is deprecated. Use showpage() action instead');
+			return $this->showpage($link);
+		}
+		return parent::Page($link);
+	}
+
+	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('SitemapNodeChildren');
+		}
+
+		return $viewer;
+	}
 }

src/PageTypes/EventHolder.php

Indentation +45 added lines, -45 removed lines

@@ -7,59 +7,59 @@
 
 class EventHolder extends DatedUpdateHolder
 {
-    private static $description = 'Container page for Event Pages, provides event filtering and pagination';
+	private static $description = 'Container page for Event Pages, provides event filtering and pagination';
 
-    private static $allowed_children = [
-        EventPage::class,
-    ];
+	private static $allowed_children = [
+		EventPage::class,
+	];
 
-    private static $default_child = EventPage::class;
+	private static $default_child = EventPage::class;
 
-    private static $update_name = 'Events';
+	private static $update_name = 'Events';
 
-    private static $update_class = EventPage::class;
+	private static $update_class = EventPage::class;
 
-    private static $icon = 'cwp/images/icons/sitetree_images/event_holder.png';
+	private static $icon = 'cwp/images/icons/sitetree_images/event_holder.png';
 
-    public $pageIcon = 'images/icons/sitetree_images/event_holder.png';
+	public $pageIcon = 'images/icons/sitetree_images/event_holder.png';
 
-    private static $singular_name = 'Event Holder';
+	private static $singular_name = 'Event Holder';
 
-    private static $plural_name = 'Event Holders';
+	private static $plural_name = 'Event Holders';
 
-    private static $table_name = 'EventHolder';
+	private static $table_name = 'EventHolder';
 
-    /**
-     * Find all site's news items, 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 $parentID The ID of the holder to extract the news items from.
-     * @param int $tagID The ID of the tag to filter the news items by.
-     * @param string $dateFrom The beginning of a date filter range.
-     * @param string $dateTo The end of the date filter range. If empty, only one day will be searched for.
-     * @param int $year Numeric value of the year to show.
-     * @param int $monthNumber Numeric value of the month to show.
-     *
-     * @returns DataList|PaginatedList
-     */
-    public static function AllUpdates(
-        $className = 'Events',
-        $parentID = null,
-        $tagID = null,
-        $dateFrom = null,
-        $dateTo = null,
-        $year = null,
-        $monthNumber = null
-    ) {
-        return parent::AllUpdates(
-            $className,
-            $parentID,
-            $tagID,
-            $dateFrom,
-            $dateTo,
-            $year,
-            $monthNumber
-        )->Sort('Date', 'ASC');
-    }
+	/**
+	 * Find all site's news items, 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 $parentID The ID of the holder to extract the news items from.
+	 * @param int $tagID The ID of the tag to filter the news items by.
+	 * @param string $dateFrom The beginning of a date filter range.
+	 * @param string $dateTo The end of the date filter range. If empty, only one day will be searched for.
+	 * @param int $year Numeric value of the year to show.
+	 * @param int $monthNumber Numeric value of the month to show.
+	 *
+	 * @returns DataList|PaginatedList
+	 */
+	public static function AllUpdates(
+		$className = 'Events',
+		$parentID = null,
+		$tagID = null,
+		$dateFrom = null,
+		$dateTo = null,
+		$year = null,
+		$monthNumber = null
+	) {
+		return parent::AllUpdates(
+			$className,
+			$parentID,
+			$tagID,
+			$dateFrom,
+			$dateTo,
+			$year,
+			$monthNumber
+		)->Sort('Date', 'ASC');
+	}
 }

src/Tasks/CleanupGeneratedPdfDailyTask.php

Indentation +5 added lines, -5 removed lines

@@ -7,9 +7,9 @@
 // @todo replace with QueuedJobs
 class CleanupGeneratedPdfDailyTask // extends DailyTask
 {
-    public function process()
-    {
-        $task = new CleanupGeneratedPdfBuildTask();
-        $task->run(null);
-    }
+	public function process()
+	{
+		$task = new CleanupGeneratedPdfBuildTask();
+		$task->run(null);
+	}
 }

src/Tasks/PopulateThemeSampleDataTask.php

Indentation +126 added lines, -126 removed lines

@@ -17,130 +17,130 @@
  */
 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)
-    {
-        $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(array(
-                'Title' => _t('EditableFormStep.TITLE_FIRST', 'First Page')
-            )),
-            EditableTextField::create(array(
-                'Title' => 'Name',
-                'Required' => true,
-                'RightTitle' => 'Please enter your first and last name'
-            )),
-            EditableEmailField::create(array(
-                'Title' => Email::class,
-                'Required' => true,
-                'Placeholder' => 'example@example.com'
-            )),
-            EditableTextField::create(array(
-                'Title' => 'Subject'
-            )),
-            EditableTextField::create(array(
-                'Title' => 'Message',
-                'Required' => true,
-                'Rows' => 5
-            ))
-        );
-
-        foreach ($fields as $field) {
-            $field->write();
-            $form->Fields()->add($field);
-            $field->publish('Stage', 'Live');
-        }
-
-        $form->publish('Stage', '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)
+	{
+		$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(array(
+				'Title' => _t('EditableFormStep.TITLE_FIRST', 'First Page')
+			)),
+			EditableTextField::create(array(
+				'Title' => 'Name',
+				'Required' => true,
+				'RightTitle' => 'Please enter your first and last name'
+			)),
+			EditableEmailField::create(array(
+				'Title' => Email::class,
+				'Required' => true,
+				'Placeholder' => 'example@example.com'
+			)),
+			EditableTextField::create(array(
+				'Title' => 'Subject'
+			)),
+			EditableTextField::create(array(
+				'Title' => 'Message',
+				'Required' => true,
+				'Rows' => 5
+			))
+		);
+
+		foreach ($fields as $field) {
+			$field->write();
+			$form->Fields()->add($field);
+			$field->publish('Stage', 'Live');
+		}
+
+		$form->publish('Stage', '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;
+	}
 }