silverstripe / cwp

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

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

src/Tasks/CleanupGeneratedPdfBuildTask.php

Indentation +16 added lines, -16 removed lines

@@ -7,24 +7,24 @@
 
 class CleanupGeneratedPdfBuildTask extends BuildTask
 {
-    protected $title = 'Cleanup generated PDFs';
+	protected $title = 'Cleanup generated PDFs';
 
-    protected $description = 'Removes generated PDFs on the site, forcing a regeneration of all exports to PDF '
-        . 'when users go to download them. This is most useful when templates have been changed so users should '
-        . 'receive a new copy';
+	protected $description = 'Removes generated PDFs on the site, forcing a regeneration of all exports to PDF '
+		. 'when users go to download them. This is most useful when templates have been changed so users should '
+		. 'receive a new copy';
 
-    public function run($request)
-    {
-        $path = sprintf('%s/%s', BASE_PATH, BasePage::config()->generated_pdf_path);
-        if (!file_exists($path)) {
-            return false;
-        }
+	public function run($request)
+	{
+		$path = sprintf('%s/%s', BASE_PATH, BasePage::config()->generated_pdf_path);
+		if (!file_exists($path)) {
+			return false;
+		}
 
-        exec(sprintf('if [ "$(ls -A %s 2> /dev/null)" != "" ]; then rm %s/*; fi', $path, $path), $output, $return_val);
+		exec(sprintf('if [ "$(ls -A %s 2> /dev/null)" != "" ]; then rm %s/*; fi', $path, $path), $output, $return_val);
 
-        // output any errors
-        if ($return_val != 0) {
-            user_error(sprintf('%s failed: ', get_class($this)) . implode("\n", $output), E_USER_ERROR);
-        }
-    }
+		// output any errors
+		if ($return_val != 0) {
+			user_error(sprintf('%s failed: ', get_class($this)) . implode("\n", $output), E_USER_ERROR);
+		}
+	}
 }

src/Model/QuickLink.php

Indentation +116 added lines, -116 removed lines

@@ -11,120 +11,120 @@
 
 class Quicklink extends DataObject
 {
-    private static $db = [
-        'Name' => 'Varchar(255)',
-        'ExternalLink' => 'Varchar(255)',
-        'SortOrder' => 'Int',
-    ];
-
-    private static $has_one = [
-        'Parent' => BaseHomePage::class,
-        'InternalLink' => SiteTree::class,
-    ];
-
-    private static $summary_fields = [
-        'Name' => 'Name',
-        'InternalLink.Title' => 'Internal Link',
-        'ExternalLink' => 'External Link',
-    ];
-
-    private static $table_name = 'Quicklink';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Name'] = _t('Quicklink.NameLabel', 'Name');
-        $labels['ExternalLink'] = _t('Quicklink.ExternalLinkLabel', 'External Link');
-        $labels['SortOrder'] = _t('Quicklink.SortOrderLabel', 'Sort Order');
-        $labels['ParentID'] = _t('Quicklink.ParentRelationLabel', 'Parent');
-        $labels['InternalLinkID'] = _t('Quicklink.InternalLinkLabel', 'Internal Link');
-
-        return $labels;
-    }
-
-    public function getLink()
-    {
-        if ($this->ExternalLink) {
-            $url = parse_url($this->ExternalLink);
-
-            // if no scheme set in the link, default to http
-            if (!isset($url['scheme'])) {
-                return 'http://' . $this->ExternalLink;
-            }
-
-            return $this->ExternalLink;
-        } elseif ($this->InternalLinkID) {
-            return $this->InternalLink()->Link();
-        }
-    }
-
-    public function canCreate($member = null, $context = [])
-    {
-        return $this->Parent()->canCreate($member, $context);
-    }
-
-    public function canEdit($member = null)
-    {
-        return $this->Parent()->canEdit($member);
-    }
-
-    public function canDelete($member = null)
-    {
-        return $this->Parent()->canDelete($member);
-    }
-
-    public function canView($member = null)
-    {
-        return $this->Parent()->canView($member);
-    }
-
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        $fields->removeByName('ParentID');
-
-        $externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
-
-        $fields->removeByName('ExternalLink');
-        $fields->removeByName('InternalLinkID');
-        $fields->removeByName('SortOrder');
-        $externalLinkField->addExtraClass('noBorder');
-
-        $fields->addFieldToTab('Root.Main', CompositeField::create(
-            array(
-                TreeDropdownField::create(
-                    'InternalLinkID',
-                    $this->fieldLabel('InternalLinkID'),
-                    SiteTree::class
-                ),
-                $externalLinkField,
-                $wrap = CompositeField::create(
-                    $extraLabel = LiteralField::create(
-                        'NoteOverride',
-                        _t(
-                            __CLASS__ . '.Note',
-                            // @todo remove the HTML from this translation
-                            '<div class="message good notice">Note:  If you specify an External Link, '
-                            . 'the Internal Link will be ignored.</div>'
-                        )
-                    )
-                )
-            )
-        ));
-        $fields->insertBefore(
-            LiteralField::create(
-                'Note',
-                _t(
-                    __CLASS__ . '.Note2',
-                    // @todo remove the HTML from this translation
-                    '<p>Use this to specify a link to a page either on this site '
-                    . '(Internal Link) or another site (External Link).</p>'
-                )
-            ),
-            'Name'
-        );
-
-        return $fields;
-    }
+	private static $db = [
+		'Name' => 'Varchar(255)',
+		'ExternalLink' => 'Varchar(255)',
+		'SortOrder' => 'Int',
+	];
+
+	private static $has_one = [
+		'Parent' => BaseHomePage::class,
+		'InternalLink' => SiteTree::class,
+	];
+
+	private static $summary_fields = [
+		'Name' => 'Name',
+		'InternalLink.Title' => 'Internal Link',
+		'ExternalLink' => 'External Link',
+	];
+
+	private static $table_name = 'Quicklink';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Name'] = _t('Quicklink.NameLabel', 'Name');
+		$labels['ExternalLink'] = _t('Quicklink.ExternalLinkLabel', 'External Link');
+		$labels['SortOrder'] = _t('Quicklink.SortOrderLabel', 'Sort Order');
+		$labels['ParentID'] = _t('Quicklink.ParentRelationLabel', 'Parent');
+		$labels['InternalLinkID'] = _t('Quicklink.InternalLinkLabel', 'Internal Link');
+
+		return $labels;
+	}
+
+	public function getLink()
+	{
+		if ($this->ExternalLink) {
+			$url = parse_url($this->ExternalLink);
+
+			// if no scheme set in the link, default to http
+			if (!isset($url['scheme'])) {
+				return 'http://' . $this->ExternalLink;
+			}
+
+			return $this->ExternalLink;
+		} elseif ($this->InternalLinkID) {
+			return $this->InternalLink()->Link();
+		}
+	}
+
+	public function canCreate($member = null, $context = [])
+	{
+		return $this->Parent()->canCreate($member, $context);
+	}
+
+	public function canEdit($member = null)
+	{
+		return $this->Parent()->canEdit($member);
+	}
+
+	public function canDelete($member = null)
+	{
+		return $this->Parent()->canDelete($member);
+	}
+
+	public function canView($member = null)
+	{
+		return $this->Parent()->canView($member);
+	}
+
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		$fields->removeByName('ParentID');
+
+		$externalLinkField = $fields->fieldByName('Root.Main.ExternalLink');
+
+		$fields->removeByName('ExternalLink');
+		$fields->removeByName('InternalLinkID');
+		$fields->removeByName('SortOrder');
+		$externalLinkField->addExtraClass('noBorder');
+
+		$fields->addFieldToTab('Root.Main', CompositeField::create(
+			array(
+				TreeDropdownField::create(
+					'InternalLinkID',
+					$this->fieldLabel('InternalLinkID'),
+					SiteTree::class
+				),
+				$externalLinkField,
+				$wrap = CompositeField::create(
+					$extraLabel = LiteralField::create(
+						'NoteOverride',
+						_t(
+							__CLASS__ . '.Note',
+							// @todo remove the HTML from this translation
+							'<div class="message good notice">Note:  If you specify an External Link, '
+							. 'the Internal Link will be ignored.</div>'
+						)
+					)
+				)
+			)
+		));
+		$fields->insertBefore(
+			LiteralField::create(
+				'Note',
+				_t(
+					__CLASS__ . '.Note2',
+					// @todo remove the HTML from this translation
+					'<p>Use this to specify a link to a page either on this site '
+					. '(Internal Link) or another site (External Link).</p>'
+				)
+			),
+			'Name'
+		);
+
+		return $fields;
+	}
 }

src/Search/CwpSearchPageController.php

Indentation +20 added lines, -20 removed lines

@@ -11,25 +11,25 @@
  */
 class CwpSearchPageController extends PageController
 {
-    /**
-     * Create the dummy search record for this page
-     *
-     * @return CwpSearchPage
-     */
-    protected function generateSearchRecord()
-    {
-        $searchPage = CwpSearchPage::create();
-        $searchPage->URLSegment = 'search';
-        $searchPage->Title = _t('SearchForm.SearchResults', 'Search Results');
-        $searchPage->ID = -1;
-        return $searchPage;
-    }
+	/**
+	 * Create the dummy search record for this page
+	 *
+	 * @return CwpSearchPage
+	 */
+	protected function generateSearchRecord()
+	{
+		$searchPage = CwpSearchPage::create();
+		$searchPage->URLSegment = 'search';
+		$searchPage->Title = _t('SearchForm.SearchResults', 'Search Results');
+		$searchPage->ID = -1;
+		return $searchPage;
+	}
 
-    public function __construct($dataRecord = null)
-    {
-        if (!$dataRecord) {
-            $dataRecord = $this->generateSearchRecord();
-        }
-        parent::__construct($dataRecord);
-    }
+	public function __construct($dataRecord = null)
+	{
+		if (!$dataRecord) {
+			$dataRecord = $this->generateSearchRecord();
+		}
+		parent::__construct($dataRecord);
+	}
 }

src/Search/CwpSearchEngine.php

Indentation +134 added lines, -134 removed lines

@@ -16,138 +16,138 @@
  */
 class CwpSearchEngine
 {
-    use Configurable;
-    use Extensible;
-    use Injectable;
-
-    /**
-     * Default search options
-     *
-     * @var array
-     * @config
-     */
-    private static $search_options = [
-        'hl' => 'true',
-    ];
-
-    /**
-     * Additional search options to send to search when spellcheck
-     * is included
-     *
-     * @var array
-     * @config
-     */
-    private static $spellcheck_options = [
-        'spellcheck' => 'true',
-        'spellcheck.collate' => 'true',
-        // spellcheck.dictionary can also be configured to use '_spellcheck'
-        // dictionary when indexing fields under the _spellcheckText column
-        'spellcheck.dictionary' => 'default',
-    ];
-
-    /**
-     * Build a SearchQuery for a new search
-     *
-     * @param string $keywords
-     * @param array $classes
-     * @return SearchQuery
-     */
-    protected function getSearchQuery($keywords, $classes)
-    {
-        $query = new SearchQuery();
-        $query->classes = $classes;
-        $query->search($keywords);
-        $query->exclude('SiteTree_ShowInSearch', 0);
-        $query->exclude('File_ShowInSearch', 0);
-
-        // Artificially lower the amount of results to prevent too high resource usage.
-        // on subsequent canView check loop.
-        $query->limit(100);
-        return $query;
-    }
-
-    /**
-     * Get solr search options for this query
-     *
-     * @param bool $spellcheck True if we should include spellcheck support
-     * @return array
-     */
-    protected function getSearchOptions($spellcheck)
-    {
-        $options = $this->config()->search_options;
-        if ($spellcheck) {
-            $options = array_merge($options, $this->config()->spellcheck_options);
-        }
-        return $options;
-    }
-
-    /**
-     * Get results for a search term
-     *
-     * @param string $keywords
-     * @param array $classes
-     * @param SolrIndex $searchIndex
-     * @param int $limit Max number of results for this page
-     * @param int $start Skip this number of records
-     * @param bool $spellcheck True to enable spellcheck
-     * @return CwpSearchResult
-     */
-    protected function getResult($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $spellcheck = false)
-    {
-        // Prepare options
-        $query = $this->getSearchQuery($keywords, $classes);
-        $options = $this->getSearchOptions($spellcheck);
-
-        // Get results
-        $solrResult = $searchIndex->search(
-            $query,
-            $start,
-            $limit,
-            $options
-        );
-
-        return CwpSearchResult::create($keywords, $solrResult);
-    }
-
-    /**
-     * Get a CwpSearchResult for a given criterea
-     *
-     * @param string $keywords
-     * @param array $classes
-     * @param SolrIndex $searchIndex
-     * @param int $limit Max number of results for this page
-     * @param int $start Skip this number of records
-     * @param bool $followSuggestions True to enable suggested searches to be returned immediately
-     * @return CwpSearchResult|null
-     */
-    public function search($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $followSuggestions = false)
-    {
-        if (empty($keywords)) {
-            return null;
-        }
-
-        try {
-            // Begin search
-            $result = $this->getResult($keywords, $classes, $searchIndex, $limit, $start, true);
-
-            // Return results if we don't need to refine this any further
-            if (!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
-                return $result;
-            }
-
-            // Perform new search with the suggested terms
-            $suggested = $result->getSuggestion();
-            $newResult = $this->getResult($suggested, $classes, $searchIndex, $limit, $start, false);
-            $newResult->setOriginal($keywords);
-
-            // Compare new results to the original query
-            if ($newResult->hasResults()) {
-                return $newResult;
-            } else {
-                return $result;
-            }
-        } catch (Exception $e) {
-            Injector::inst()->get(LoggerInterface::class)->warning($e);
-        }
-    }
+	use Configurable;
+	use Extensible;
+	use Injectable;
+
+	/**
+	 * Default search options
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $search_options = [
+		'hl' => 'true',
+	];
+
+	/**
+	 * Additional search options to send to search when spellcheck
+	 * is included
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $spellcheck_options = [
+		'spellcheck' => 'true',
+		'spellcheck.collate' => 'true',
+		// spellcheck.dictionary can also be configured to use '_spellcheck'
+		// dictionary when indexing fields under the _spellcheckText column
+		'spellcheck.dictionary' => 'default',
+	];
+
+	/**
+	 * Build a SearchQuery for a new search
+	 *
+	 * @param string $keywords
+	 * @param array $classes
+	 * @return SearchQuery
+	 */
+	protected function getSearchQuery($keywords, $classes)
+	{
+		$query = new SearchQuery();
+		$query->classes = $classes;
+		$query->search($keywords);
+		$query->exclude('SiteTree_ShowInSearch', 0);
+		$query->exclude('File_ShowInSearch', 0);
+
+		// Artificially lower the amount of results to prevent too high resource usage.
+		// on subsequent canView check loop.
+		$query->limit(100);
+		return $query;
+	}
+
+	/**
+	 * Get solr search options for this query
+	 *
+	 * @param bool $spellcheck True if we should include spellcheck support
+	 * @return array
+	 */
+	protected function getSearchOptions($spellcheck)
+	{
+		$options = $this->config()->search_options;
+		if ($spellcheck) {
+			$options = array_merge($options, $this->config()->spellcheck_options);
+		}
+		return $options;
+	}
+
+	/**
+	 * Get results for a search term
+	 *
+	 * @param string $keywords
+	 * @param array $classes
+	 * @param SolrIndex $searchIndex
+	 * @param int $limit Max number of results for this page
+	 * @param int $start Skip this number of records
+	 * @param bool $spellcheck True to enable spellcheck
+	 * @return CwpSearchResult
+	 */
+	protected function getResult($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $spellcheck = false)
+	{
+		// Prepare options
+		$query = $this->getSearchQuery($keywords, $classes);
+		$options = $this->getSearchOptions($spellcheck);
+
+		// Get results
+		$solrResult = $searchIndex->search(
+			$query,
+			$start,
+			$limit,
+			$options
+		);
+
+		return CwpSearchResult::create($keywords, $solrResult);
+	}
+
+	/**
+	 * Get a CwpSearchResult for a given criterea
+	 *
+	 * @param string $keywords
+	 * @param array $classes
+	 * @param SolrIndex $searchIndex
+	 * @param int $limit Max number of results for this page
+	 * @param int $start Skip this number of records
+	 * @param bool $followSuggestions True to enable suggested searches to be returned immediately
+	 * @return CwpSearchResult|null
+	 */
+	public function search($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $followSuggestions = false)
+	{
+		if (empty($keywords)) {
+			return null;
+		}
+
+		try {
+			// Begin search
+			$result = $this->getResult($keywords, $classes, $searchIndex, $limit, $start, true);
+
+			// Return results if we don't need to refine this any further
+			if (!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
+				return $result;
+			}
+
+			// Perform new search with the suggested terms
+			$suggested = $result->getSuggestion();
+			$newResult = $this->getResult($suggested, $classes, $searchIndex, $limit, $start, false);
+			$newResult->setOriginal($keywords);
+
+			// Compare new results to the original query
+			if ($newResult->hasResults()) {
+				return $newResult;
+			} else {
+				return $result;
+			}
+		} catch (Exception $e) {
+			Injector::inst()->get(LoggerInterface::class)->warning($e);
+		}
+	}
 }