silverstripe / cwp

src/PageTypes/NewsPage.php

Indentation +39 added lines, -39 removed lines

@@ -9,55 +9,55 @@
 
 class NewsPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an item of news';
+	private static $description = 'Describes an item of news';
 
-    private static $default_parent = 'NewsHolderPage';
+	private static $default_parent = 'NewsHolderPage';
 
-    private static $can_be_root = false;
+	private static $can_be_root = false;
 
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/news.png';
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/news.png';
 
-    private static $singular_name = 'News Page';
+	private static $singular_name = 'News Page';
 
-    private static $plural_name = 'News Pages';
+	private static $plural_name = 'News Pages';
 
-    private static $db = [
-        'Author' => 'Varchar(255)',
-    ];
+	private static $db = [
+		'Author' => 'Varchar(255)',
+	];
 
-    private static $has_one = [
-        'FeaturedImage' => Image::class,
-    ];
+	private static $has_one = [
+		'FeaturedImage' => Image::class,
+	];
 
-    private static $table_name = 'NewsPage';
+	private static $table_name = 'NewsPage';
 
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Author'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.AuthorFieldLabel', 'Author');
-        $labels['FeaturedImageID'] = _t(
-            'CWP\\CWP\\PageTypes\\DateUpdatePage.FeaturedImageFieldLabel',
-            'Featured Image'
-        );
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Author'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.AuthorFieldLabel', 'Author');
+		$labels['FeaturedImageID'] = _t(
+			'CWP\\CWP\\PageTypes\\DateUpdatePage.FeaturedImageFieldLabel',
+			'Featured Image'
+		);
 
-        return $labels;
-    }
+		return $labels;
+	}
 
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldToTab(
-                'Root.Main',
-                TextField::create('Author', $this->fieldLabel('Author')),
-                'Abstract'
-            );
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldToTab(
+				'Root.Main',
+				TextField::create('Author', $this->fieldLabel('Author')),
+				'Abstract'
+			);
 
-            $fields->addFieldToTab(
-                'Root.Main',
-                UploadField::create('FeaturedImage', $this->fieldLabel('FeaturedImageID')),
-                'Abstract'
-            );
-        });
-        return parent::getCMSFields();
-    }
+			$fields->addFieldToTab(
+				'Root.Main',
+				UploadField::create('FeaturedImage', $this->fieldLabel('FeaturedImageID')),
+				'Abstract'
+			);
+		});
+		return parent::getCMSFields();
+	}
 }

tests/Tasks/CleanupGeneratedPdfDailyTaskTest.php

Indentation +17 added lines, -17 removed lines

@@ -9,26 +9,26 @@
 
 class CleanupGeneratedPdfDailyTaskTest extends SapphireTest
 {
-    /**
-     * @var CleanupGeneratedPdfDailyTask
-     */
-    protected $task;
+	/**
+	 * @var CleanupGeneratedPdfDailyTask
+	 */
+	protected $task;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        if (!interface_exists(CronTask::class)) {
-            $this->markTestSkipped('Test class requires the silverstripe/crontask module to be installed');
-        }
+		if (!interface_exists(CronTask::class)) {
+			$this->markTestSkipped('Test class requires the silverstripe/crontask module to be installed');
+		}
 
-        $this->task = new CleanupGeneratedPdfDailyTask();
-    }
+		$this->task = new CleanupGeneratedPdfDailyTask();
+	}
 
-    public function testCronScheduleIsConfigurable()
-    {
-        Config::modify()->set(CleanupGeneratedPdfDailyTask::class, 'schedule', '* 1 2 3 *');
+	public function testCronScheduleIsConfigurable()
+	{
+		Config::modify()->set(CleanupGeneratedPdfDailyTask::class, 'schedule', '* 1 2 3 *');
 
-        $this->assertSame('* 1 2 3 *', $this->task->getSchedule());
-    }
+		$this->assertSame('* 1 2 3 *', $this->task->getSchedule());
+	}
 }

src/Tasks/CleanupGeneratedPdfDailyTask.php

Indentation +33 added lines, -33 removed lines

@@ -7,7 +7,7 @@ 
 use SilverStripe\CronTask\Interfaces\CronTask;
 
 if (!interface_exists(CronTask::class)) {
-    return;
+	return;
 }
 
 /**
@@ -15,36 +15,36 @@ 
  */
 class CleanupGeneratedPdfDailyTask implements CronTask
 {
-    use Configurable;
-
-    /**
-     * The cron schedule for this task (default: midnight every day)
-     *
-     * @config
-     * @var string
-     */
-    private static $schedule = '0 0 * * *';
-
-    /**
-     * Whether this task is enabled (default false)
-     *
-     * @config
-     * @return bool
-     */
-    private static $enabled = false;
-
-    public function getSchedule()
-    {
-        return $this->config()->get('schedule');
-    }
-
-    public function process()
-    {
-        if (!$this->config()->get('enabled')) {
-            return;
-        }
-
-        $task = Injector::inst()->create(CleanupGeneratedPdfBuildTask::class);
-        $task->run(null);
-    }
+	use Configurable;
+
+	/**
+	 * The cron schedule for this task (default: midnight every day)
+	 *
+	 * @config
+	 * @var string
+	 */
+	private static $schedule = '0 0 * * *';
+
+	/**
+	 * Whether this task is enabled (default false)
+	 *
+	 * @config
+	 * @return bool
+	 */
+	private static $enabled = false;
+
+	public function getSchedule()
+	{
+		return $this->config()->get('schedule');
+	}
+
+	public function process()
+	{
+		if (!$this->config()->get('enabled')) {
+			return;
+		}
+
+		$task = Injector::inst()->create(CleanupGeneratedPdfBuildTask::class);
+		$task->run(null);
+	}
 }

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()->get('generated_pdf_path'));
-        if (!file_exists($path)) {
-            return false;
-        }
+	public function run($request)
+	{
+		$path = sprintf('%s/%s', BASE_PATH, BasePage::config()->get('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/PageTypes/SitemapPageController.php

Indentation +38 added lines, -38 removed lines

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

src/PageTypes/BaseHomePage.php

Indentation +133 added lines, -133 removed lines

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

src/PageTypes/EventHolderController.php

Indentation +41 added lines, -41 removed lines

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

src/Model/QuickLink.php

Indentation +113 added lines, -113 removed lines

@@ -11,117 +11,117 @@
 
 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(__CLASS__ . '.NameLabel', 'Name');
-        $labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
-        $labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
-        $labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
-        $labels['InternalLinkID'] = _t(__CLASS__ . '.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',
-                        sprintf('<div class="message good notice">%s</div>', _t(
-                            __CLASS__ . '.Note',
-                            'Note: If you specify an External Link, the Internal Link will be ignored.'
-                        ))
-                    )
-                )
-            )
-        ));
-        $fields->insertBefore(
-            'Name',
-            LiteralField::create(
-                'Note',
-                sprintf('<p>%s</p>', _t(
-                    __CLASS__ . '.Note2',
-                    'Use this to specify a link to a page either on this site '
-                        . '(Internal Link) or another site (External Link).'
-                ))
-            )
-        );
-
-        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(__CLASS__ . '.NameLabel', 'Name');
+		$labels['ExternalLink'] = _t(__CLASS__ . '.ExternalLinkLabel', 'External Link');
+		$labels['SortOrder'] = _t(__CLASS__ . '.SortOrderLabel', 'Sort Order');
+		$labels['ParentID'] = _t(__CLASS__ . '.ParentRelationLabel', 'Parent');
+		$labels['InternalLinkID'] = _t(__CLASS__ . '.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',
+						sprintf('<div class="message good notice">%s</div>', _t(
+							__CLASS__ . '.Note',
+							'Note: If you specify an External Link, the Internal Link will be ignored.'
+						))
+					)
+				)
+			)
+		));
+		$fields->insertBefore(
+			'Name',
+			LiteralField::create(
+				'Note',
+				sprintf('<p>%s</p>', _t(
+					__CLASS__ . '.Note2',
+					'Use this to specify a link to a page either on this site '
+						. '(Internal Link) or another site (External Link).'
+				))
+			)
+		);
+
+		return $fields;
+	}
 }

src/PageTypes/BasePageController.php

Indentation +153 added lines, -153 removed lines

@@ -13,163 +13,163 @@
 
 class BasePageController extends ContentController
 {
-    private static $allowed_actions = [
-        'downloadpdf',
-    ];
-
-    /**
-     * Serve the page rendered as PDF.
-     */
-    public function downloadpdf()
-    {
-        if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
-            return false;
-        }
-
-        // We only allow producing live pdf. There is no way to secure the draft files.
-        Versioned::set_stage(Versioned::LIVE);
-
-        $path = $this->dataRecord->getPdfFilename();
-        if (!file_exists($path)) {
-            $this->generatePDF();
-        }
-
-        return HTTPRequest::send_file(file_get_contents($path), basename($path), 'application/pdf');
-    }
-
-    /*
+	private static $allowed_actions = [
+		'downloadpdf',
+	];
+
+	/**
+	 * Serve the page rendered as PDF.
+	 */
+	public function downloadpdf()
+	{
+		if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
+			return false;
+		}
+
+		// We only allow producing live pdf. There is no way to secure the draft files.
+		Versioned::set_stage(Versioned::LIVE);
+
+		$path = $this->dataRecord->getPdfFilename();
+		if (!file_exists($path)) {
+			$this->generatePDF();
+		}
+
+		return HTTPRequest::send_file(file_get_contents($path), basename($path), 'application/pdf');
+	}
+
+	/*
     * This will return either pdf_base_url from YML, CWP_SECURE_DOMAIN
     * from _ss_environment, or blank. In that order of importance.
     */
-    public function getPDFBaseURL()
-    {
-        //if base url YML is defined in YML, use that
-        if (Config::inst()->get(BasePage::class, 'pdf_base_url')) {
-            $pdfBaseUrl = Config::inst()->get(BasePage::class, 'pdf_base_url').'/';
-            //otherwise, if we are CWP use the secure domain
-        } elseif (Environment::getEnv('CWP_SECURE_DOMAIN')) {
-            $pdfBaseUrl = Environment::getEnv('CWP_SECURE_DOMAIN') . '/';
-            //or if neither, leave blank
-        } else {
-            $pdfBaseUrl = '';
-        }
-        return $pdfBaseUrl;
-    }
-
-    /*
+	public function getPDFBaseURL()
+	{
+		//if base url YML is defined in YML, use that
+		if (Config::inst()->get(BasePage::class, 'pdf_base_url')) {
+			$pdfBaseUrl = Config::inst()->get(BasePage::class, 'pdf_base_url').'/';
+			//otherwise, if we are CWP use the secure domain
+		} elseif (Environment::getEnv('CWP_SECURE_DOMAIN')) {
+			$pdfBaseUrl = Environment::getEnv('CWP_SECURE_DOMAIN') . '/';
+			//or if neither, leave blank
+		} else {
+			$pdfBaseUrl = '';
+		}
+		return $pdfBaseUrl;
+	}
+
+	/*
     * Don't use the proxy if the pdf domain is the CWP secure domain
     * Or if we aren't on a CWP server
     */
-    public function getPDFProxy($pdfBaseUrl)
-    {
-        if (!Environment::getEnv('CWP_SECURE_DOMAIN')
-            || $pdfBaseUrl == Environment::getEnv('CWP_SECURE_DOMAIN') . '/'
-        ) {
-            $proxy = '';
-        } else {
-            $proxy = ' --proxy ' . Environment::getEnv('SS_OUTBOUND_PROXY')
-                . ':' . Environment::getEnv('SS_OUTBOUND_PROXY_PORT');
-        }
-        return $proxy;
-    }
-
-    /**
-     * Render the page as PDF using wkhtmltopdf.
-     */
-    public function generatePDF()
-    {
-        if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
-            return false;
-        }
-
-        $binaryPath = Config::inst()->get(BasePage::class, 'wkhtmltopdf_binary');
-        if (!$binaryPath || !is_executable($binaryPath)) {
-            if (Environment::getEnv('WKHTMLTOPDF_BINARY')
-                && is_executable(Environment::getEnv('WKHTMLTOPDF_BINARY'))
-            ) {
-                $binaryPath = Environment::getEnv('WKHTMLTOPDF_BINARY');
-            }
-        }
-
-        if (!$binaryPath) {
-            user_error('Neither WKHTMLTOPDF_BINARY nor BasePage.wkhtmltopdf_binary are defined', E_USER_ERROR);
-        }
-
-        if (Versioned::get_reading_mode() == 'Stage.Stage') {
-            user_error('Generating PDFs on draft is not supported', E_USER_ERROR);
-        }
-
-        set_time_limit(60);
-
-        // prepare the paths
-        $pdfFile = $this->dataRecord->getPdfFilename();
-        $bodyFile = str_replace('.pdf', '_pdf.html', $pdfFile);
-        $footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
-
-        // make sure the work directory exists
-        if (!file_exists(dirname($pdfFile))) {
-            Filesystem::makeFolder(dirname($pdfFile));
-        }
-
-        //decide the domain to use in generation
-        $pdfBaseUrl = $this->getPDFBaseURL();
-
-        // Force http protocol on CWP - fetching from localhost without using the proxy, SSL terminates on gateway.
-        if (Environment::getEnv('CWP_ENVIRONMENT')) {
-            Config::modify()->set(Director::class, 'alternate_protocol', 'http');
-            //only set alternate protocol if CWP_SECURE_DOMAIN is defined OR pdf_base_url is
-            if ($pdfBaseUrl) {
-                Config::modify()->set(Director::class, 'alternate_base_url', 'http://' . $pdfBaseUrl);
-            }
-        }
-
-        $bodyViewer = $this->getViewer('pdf');
-
-        // write the output of this page to HTML, ready for conversion to PDF
-        file_put_contents($bodyFile, $bodyViewer->process($this));
-
-        // get the viewer for the current template with _pdffooter
-        $footerViewer = $this->getViewer('pdffooter');
-
-        // write the output of the footer template to HTML, ready for conversion to PDF
-        file_put_contents($footerFile, $footerViewer->process($this));
-
-        //decide what the proxy should look like
-        $proxy = $this->getPDFProxy($pdfBaseUrl);
-
-        // finally, generate the PDF
-        $command = $binaryPath . $proxy . ' --outline -B 40pt -L 20pt -R 20pt -T 20pt --encoding utf-8 '
-            . '--orientation Portrait --disable-javascript --quiet --print-media-type ';
-        $retVal = 0;
-        $output = array();
-        exec(
-            $command . " --footer-html \"$footerFile\" \"$bodyFile\" \"$pdfFile\" &> /dev/stdout",
-            $output,
-            $retVal
-        );
-
-        // remove temporary file
-        unlink($bodyFile);
-        unlink($footerFile);
-
-        // output any errors
-        if ($retVal != 0) {
-            user_error('wkhtmltopdf failed: ' . implode("\n", $output), E_USER_ERROR);
-        }
-
-        // serve the generated file
-        return HTTPRequest::send_file(file_get_contents($pdfFile), basename($pdfFile), 'application/pdf');
-    }
-
-    /**
-     * Provide current year.
-     */
-    public function CurrentDatetime()
-    {
-        return DBDatetime::now();
-    }
-
-    public function getRSSLink()
-    {
-    }
+	public function getPDFProxy($pdfBaseUrl)
+	{
+		if (!Environment::getEnv('CWP_SECURE_DOMAIN')
+			|| $pdfBaseUrl == Environment::getEnv('CWP_SECURE_DOMAIN') . '/'
+		) {
+			$proxy = '';
+		} else {
+			$proxy = ' --proxy ' . Environment::getEnv('SS_OUTBOUND_PROXY')
+				. ':' . Environment::getEnv('SS_OUTBOUND_PROXY_PORT');
+		}
+		return $proxy;
+	}
+
+	/**
+	 * Render the page as PDF using wkhtmltopdf.
+	 */
+	public function generatePDF()
+	{
+		if (!Config::inst()->get(BasePage::class, 'pdf_export')) {
+			return false;
+		}
+
+		$binaryPath = Config::inst()->get(BasePage::class, 'wkhtmltopdf_binary');
+		if (!$binaryPath || !is_executable($binaryPath)) {
+			if (Environment::getEnv('WKHTMLTOPDF_BINARY')
+				&& is_executable(Environment::getEnv('WKHTMLTOPDF_BINARY'))
+			) {
+				$binaryPath = Environment::getEnv('WKHTMLTOPDF_BINARY');
+			}
+		}
+
+		if (!$binaryPath) {
+			user_error('Neither WKHTMLTOPDF_BINARY nor BasePage.wkhtmltopdf_binary are defined', E_USER_ERROR);
+		}
+
+		if (Versioned::get_reading_mode() == 'Stage.Stage') {
+			user_error('Generating PDFs on draft is not supported', E_USER_ERROR);
+		}
+
+		set_time_limit(60);
+
+		// prepare the paths
+		$pdfFile = $this->dataRecord->getPdfFilename();
+		$bodyFile = str_replace('.pdf', '_pdf.html', $pdfFile);
+		$footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
+
+		// make sure the work directory exists
+		if (!file_exists(dirname($pdfFile))) {
+			Filesystem::makeFolder(dirname($pdfFile));
+		}
+
+		//decide the domain to use in generation
+		$pdfBaseUrl = $this->getPDFBaseURL();
+
+		// Force http protocol on CWP - fetching from localhost without using the proxy, SSL terminates on gateway.
+		if (Environment::getEnv('CWP_ENVIRONMENT')) {
+			Config::modify()->set(Director::class, 'alternate_protocol', 'http');
+			//only set alternate protocol if CWP_SECURE_DOMAIN is defined OR pdf_base_url is
+			if ($pdfBaseUrl) {
+				Config::modify()->set(Director::class, 'alternate_base_url', 'http://' . $pdfBaseUrl);
+			}
+		}
+
+		$bodyViewer = $this->getViewer('pdf');
+
+		// write the output of this page to HTML, ready for conversion to PDF
+		file_put_contents($bodyFile, $bodyViewer->process($this));
+
+		// get the viewer for the current template with _pdffooter
+		$footerViewer = $this->getViewer('pdffooter');
+
+		// write the output of the footer template to HTML, ready for conversion to PDF
+		file_put_contents($footerFile, $footerViewer->process($this));
+
+		//decide what the proxy should look like
+		$proxy = $this->getPDFProxy($pdfBaseUrl);
+
+		// finally, generate the PDF
+		$command = $binaryPath . $proxy . ' --outline -B 40pt -L 20pt -R 20pt -T 20pt --encoding utf-8 '
+			. '--orientation Portrait --disable-javascript --quiet --print-media-type ';
+		$retVal = 0;
+		$output = array();
+		exec(
+			$command . " --footer-html \"$footerFile\" \"$bodyFile\" \"$pdfFile\" &> /dev/stdout",
+			$output,
+			$retVal
+		);
+
+		// remove temporary file
+		unlink($bodyFile);
+		unlink($footerFile);
+
+		// output any errors
+		if ($retVal != 0) {
+			user_error('wkhtmltopdf failed: ' . implode("\n", $output), E_USER_ERROR);
+		}
+
+		// serve the generated file
+		return HTTPRequest::send_file(file_get_contents($pdfFile), basename($pdfFile), 'application/pdf');
+	}
+
+	/**
+	 * Provide current year.
+	 */
+	public function CurrentDatetime()
+	{
+		return DBDatetime::now();
+	}
+
+	public function getRSSLink()
+	{
+	}
 }