silverstripe / cwp

src/PageTypes/DatedUpdateHolderController.php

Indentation +356 added lines, -356 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -159,7 +159,7 @@ 
         }
 
         if (isset($tag)) {
-            $tag = (int)$tag;
+            $tag = (int) $tag;
         }
         if (isset($from)) {
             $from = urldecode($from);
@@ -174,10 +174,10 @@ 
             $to = $parser->Format('y-MM-dd');
         }
         if (isset($year)) {
-            $year = (int)$year;
+            $year = (int) $year;
         }
         if (isset($month)) {
-            $month = (int)$month;
+            $month = (int) $month;
         }
 
         // If only "To" has been provided filter by single date. Normalise by swapping with "From".
@@ -259,7 +259,7 @@ 
         $tagID = $this->request->getVar('tag');
 
         if (isset($tagID)) {
-            return TaxonomyTerm::get_by_id(TaxonomyTerm::class, (int)$tagID);
+            return TaxonomyTerm::get_by_id(TaxonomyTerm::class, (int) $tagID);
         }
     }
 

src/PageTypes/BasePage.php

Indentation +236 added lines, -236 removed lines

@@ -28,240 +28,240 @@
 
 class BasePage extends SiteTree
 {
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
-
-    /**
-     * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
-     *
-     * {@inheritDoc}
-     */
-    private static $hide_ancestor = BasePage::class;
-
-    /**
-     * @config
-     * @var bool
-     */
-    private static $pdf_export = false;
-
-    /**
-     * Domain to generate PDF's from, DOES not include protocol
-     * i.e. google.com not http://google.com
-     * @config
-     * @var string
-     */
-    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();
-     *
-     * @config
-     * @var string|null
-     */
-    private static $wkhtmltopdf_binary = null;
-
-    /**
-     * Where to store generated PDF files
-     *
-     * @config
-     * @var string
-     */
-    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';
-
-    /**
-     * @config
-     * @var string
-     */
-    private 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';
-
-    /**
-     * 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 = $this->config()->get('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 (!$this->config()->get('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->config()->get('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;
-    }
-
-    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'));
-
-            /** @var GridFieldDataColumns $dataColumns */
-            $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-            $dataColumns->setDisplayFields([
-                'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
-                'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
-            ]);
-
-            $fields->findOrMakeTab(
-                'Root.RelatedPages',
-                _t(__CLASS__ . '.RelatedPages', 'Related pages')
-            );
-            $fields->addFieldToTab(
-                'Root.RelatedPages',
-                GridField::create(
-                    'RelatedPages',
-                    _t(__CLASS__ . '.RelatedPages', 'Related pages'),
-                    $this->RelatedPages(),
-                    $components
-                )
-            );
-
-            // Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
-            $hasMany = $this->hasMany();
-            $manyMany = $this->manyMany();
-            if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
-                $components = GridFieldConfig_RelationEditor::create();
-                $components->removeComponentsByType(GridFieldAddNewButton::class);
-                $components->removeComponentsByType(GridFieldEditButton::class);
-
-                /** @var GridFieldAddExistingAutocompleter $autoCompleter */
-                $autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
-                $autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
-
-                /** @var GridFieldDataColumns $dataColumns */
-                $dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
-                $dataColumns->setDisplayFields([
-                    'Name' => _t(__CLASS__ . '.Term', 'Term'),
-                    'TaxonomyName' => _t(__CLASS__ . '.Taxonomy', 'Taxonomy')
-                ]);
-
-                $fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
-                $fields->addFieldToTab(
-                    'Root.Tags',
-                    TreeMultiselectField::create(
-                        'Terms',
-                        _t(__CLASS__ . '.Terms', 'Terms'),
-                        TaxonomyTerm::class
-                    )->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
-                );
-            }
-        });
-        return parent::getCMSFields();
-    }
-
-    /**
-     * Returns the native language name for the selected locale/language, empty string if Fluent is not available
-     *
-     * @return string
-     */
-    public function getSelectedLanguage()
-    {
-        if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
-            return '';
-        }
-
-        /** @var ArrayData $information */
-        $information = $this->LocaleInformation(FluentState::singleton()->getLocale());
-
-        return $information->LanguageNative;
-    }
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/page.png';
+
+	/**
+	 * Hide this page type from the CMS. hide_ancestor is slightly misnamed, should really be just "hide"
+	 *
+	 * {@inheritDoc}
+	 */
+	private static $hide_ancestor = BasePage::class;
+
+	/**
+	 * @config
+	 * @var bool
+	 */
+	private static $pdf_export = false;
+
+	/**
+	 * Domain to generate PDF's from, DOES not include protocol
+	 * i.e. google.com not http://google.com
+	 * @config
+	 * @var string
+	 */
+	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();
+	 *
+	 * @config
+	 * @var string|null
+	 */
+	private static $wkhtmltopdf_binary = null;
+
+	/**
+	 * Where to store generated PDF files
+	 *
+	 * @config
+	 * @var string
+	 */
+	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';
+
+	/**
+	 * @config
+	 * @var string
+	 */
+	private 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';
+
+	/**
+	 * 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 = $this->config()->get('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 (!$this->config()->get('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->config()->get('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;
+	}
+
+	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'));
+
+			/** @var GridFieldDataColumns $dataColumns */
+			$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+			$dataColumns->setDisplayFields([
+				'Title' => _t(__CLASS__ . '.ColumnTitle', 'Title'),
+				'ClassName' => _t(__CLASS__ . '.ColumnPageType', 'Page Type')
+			]);
+
+			$fields->findOrMakeTab(
+				'Root.RelatedPages',
+				_t(__CLASS__ . '.RelatedPages', 'Related pages')
+			);
+			$fields->addFieldToTab(
+				'Root.RelatedPages',
+				GridField::create(
+					'RelatedPages',
+					_t(__CLASS__ . '.RelatedPages', 'Related pages'),
+					$this->RelatedPages(),
+					$components
+				)
+			);
+
+			// Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
+			$hasMany = $this->hasMany();
+			$manyMany = $this->manyMany();
+			if (!isset($hasMany['Tags']) && !isset($manyMany['Tags'])) {
+				$components = GridFieldConfig_RelationEditor::create();
+				$components->removeComponentsByType(GridFieldAddNewButton::class);
+				$components->removeComponentsByType(GridFieldEditButton::class);
+
+				/** @var GridFieldAddExistingAutocompleter $autoCompleter */
+				$autoCompleter = $components->getComponentByType(GridFieldAddExistingAutocompleter::class);
+				$autoCompleter->setResultsFormat('$Name ($TaxonomyName)');
+
+				/** @var GridFieldDataColumns $dataColumns */
+				$dataColumns = $components->getComponentByType(GridFieldDataColumns::class);
+				$dataColumns->setDisplayFields([
+					'Name' => _t(__CLASS__ . '.Term', 'Term'),
+					'TaxonomyName' => _t(__CLASS__ . '.Taxonomy', 'Taxonomy')
+				]);
+
+				$fields->findOrMakeTab('Root.Tags', _t(__CLASS__ . '.TagsTabTitle', 'Tags'));
+				$fields->addFieldToTab(
+					'Root.Tags',
+					TreeMultiselectField::create(
+						'Terms',
+						_t(__CLASS__ . '.Terms', 'Terms'),
+						TaxonomyTerm::class
+					)->setDescription(_t(__CLASS__ . '.TermsDescription', 'Click to search for additional terms'))
+				);
+			}
+		});
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * Returns the native language name for the selected locale/language, empty string if Fluent is not available
+	 *
+	 * @return string
+	 */
+	public function getSelectedLanguage()
+	{
+		if (!class_exists(Locale::class) || !$this->hasMethod('Locales')) {
+			return '';
+		}
+
+		/** @var ArrayData $information */
+		$information = $this->LocaleInformation(FluentState::singleton()->getLocale());
+
+		return $information->LanguageNative;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
 
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             // Related Pages
             $components = GridFieldConfig_RelationEditor::create();
             $components->removeComponentsByType(GridFieldAddNewButton::class);

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

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     {
         //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').'/';
+            $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') . '/';