silverstripe / cwp

_config.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 // default to the binary being in the usual path on Linux
-if(!defined('WKHTMLTOPDF_BINARY')) {
+if (!defined('WKHTMLTOPDF_BINARY')) {
 	define('WKHTMLTOPDF_BINARY', '/usr/local/bin/wkhtmltopdf_12');
 }

tasks/CleanupGeneratedPdf.php

Spacing +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
 
 	public function run($request) {
 		$path = sprintf('%s/%s', BASE_PATH, BasePage::config()->generated_pdf_path);
-		if(!file_exists($path)) return false;
+		if (!file_exists($path)) return false;
 
 		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) {
+		if ($return_val != 0) {
 			user_error(sprintf('%s failed: ', get_class($this)) . implode("\n", $output), E_USER_ERROR);
 		}
 	}

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
 	public function run($request) {
 		$path = sprintf('%s/%s', BASE_PATH, BasePage::config()->generated_pdf_path);
-		if(!file_exists($path)) return false;
+		if(!file_exists($path)) {
+			return false;
+		}
 
 		exec(sprintf('if [ "$(ls -A %s 2> /dev/null)" != "" ]; then rm %s/*; fi', $path, $path), $output, $return_val);
 

code/model/QuickLink.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 			$url = parse_url($this->ExternalLink);
 
 			// if no scheme set in the link, default to http
-			if(!isset($url['scheme'])) {
+			if (!isset($url['scheme'])) {
 				return 'http://' . $this->ExternalLink;
 			}
 
@@ -72,7 +72,7 @@ 
 		$fields->removeByName('SortOrder');
 		$externalLinkField->addExtraClass('noBorder');
 
-		$fields->addFieldToTab('Root.Main',CompositeField::create(
+		$fields->addFieldToTab('Root.Main', CompositeField::create(
 			array(
 				TreeDropdownField::create(
 					'InternalLinkID', 
@@ -83,7 +83,7 @@ 
 				$wrap = CompositeField::create(
 					$extraLabel = LiteralField::create(
 						'NoteOverride', 
-						_t('Quicklink.Note','<div class="message good notice">Note:  If you specify an External Link, the Internal Link will be ignored.</div>')
+						_t('Quicklink.Note', '<div class="message good notice">Note:  If you specify an External Link, the Internal Link will be ignored.</div>')
 					)
 				)
 			)

code/pagetypes/SitemapPage.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 	);
 
 	public function Page($link) {
-		if($link instanceof SS_HTTPRequest) {
+		if ($link instanceof SS_HTTPRequest) {
 			Deprecation::notice('2.0', 'Using page() as a url handler is deprecated. Use showpage() action instead');
 			return $this->showpage($link);
 		}
@@ -28,18 +28,18 @@ 
 
 	public function showpage($request) {
 		$id = (int) $request->param('ID');
-		if(!$id) {
+		if (!$id) {
 			return false;
 		}
 		$page = SiteTree::get()->byId($id);
 
 		// does the page exist?
-		if(!($page && $page->exists())) {
+		if (!($page && $page->exists())) {
 			return $this->httpError(404);
 		}
 
 		// can the page be viewed?
-		if(!$page->canView()) {
+		if (!$page->canView()) {
 			return $this->httpError(403);
 		}
 
@@ -49,7 +49,7 @@ 
 			'Children' => $page->Children()
 		));
 
-		if($request->isAjax()) {
+		if ($request->isAjax()) {
 			return $viewer->renderWith('SitemapNodeChildren');
 		} else {
 			return $viewer;

code/pagetypes/EventHolder.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 	private static $icon = 'cwp/images/icons/sitetree_images/event_holder.png';
 
-	public $pageIcon =  'images/icons/sitetree_images/event_holder.png';
+	public $pageIcon = 'images/icons/sitetree_images/event_holder.png';
 
 	private static $singular_name = 'Event Holder';
 
@@ -58,7 +58,7 @@ 
 	public function getUpdateName() {
 		$params = $this->parseParams();
 		if ($params['upcomingOnly']) {
-			return _t('EventHolder.Upcoming','Upcoming events');
+			return _t('EventHolder.Upcoming', 'Upcoming events');
 		}
 
 		return 'Events';

code/pagetypes/NewsHolder.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	private static $icon = 'cwp/images/icons/sitetree_images/news_listing.png';
 
-	public $pageIcon =  'images/icons/sitetree_images/news_listing.png';
+	public $pageIcon = 'images/icons/sitetree_images/news_listing.png';
 
 	private static $singular_name = 'News Holder';
 

code/pagetypes/DatedUpdateHolder.php

Braces +30 added lines, -10 removed lines

@@ -313,13 +313,25 @@ 
 		$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 ($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($tag)) {
+			$tag = (int)$tag;
+		}
 		if (isset($from)) {
 			$from = urldecode($from);
 			$parser = new SS_Datetime;
@@ -332,8 +344,12 @@ 
 			$parser->setValue($to);
 			$to = $parser->Format('Y-m-d');
 		}
-		if (isset($year)) $year = (int)$year;
-		if (isset($month)) $month = (int)$month;
+		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)) {
@@ -499,7 +515,9 @@ 
 		// 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, '&');
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
 
 		$this->redirect($link);
 	}
@@ -509,7 +527,9 @@ 
 
 		// Reset the link - only include the tag.
 		$link = $this->AbsoluteLink();
-		if (isset($params['tag'])) $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		if (isset($params['tag'])) {
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
+		}
 
 		$this->redirect($link);
 	}

Spacing +16 added lines, -16 removed lines

@@ -86,8 +86,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("%d-%d-01 00:00:00", $year, $monthNumber);
 			$endDate = date('Y-m-d H:i:s', strtotime("{$beginDate} +1 month"));
@@ -159,7 +159,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.
@@ -238,7 +238,7 @@ 
 	public function getMetaTitle() {
 		$title = $this->data()->getTitle();
 		$filter = $this->FilterDescription();
-		if($filter) {
+		if ($filter) {
 			$title = "{$title} - {$filter}";
 		}
 
@@ -309,13 +309,13 @@ 
 		$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 ($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($tag)) $tag = (int) $tag;
 		if (isset($from)) {
 			$from = urldecode($from);
 			$parser = new SS_Datetime;
@@ -328,8 +328,8 @@ 
 			$parser->setValue($to);
 			$to = $parser->Format('Y-m-d');
 		}
-		if (isset($year)) $year = (int)$year;
-		if (isset($month)) $month = (int)$month;
+		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)) {
@@ -337,13 +337,13 @@ 
 		}
 
 		// Flip the dates if the order is wrong.
-		if (isset($to) && isset($from) && strtotime($from)>strtotime($to)) {
+		if (isset($to) && isset($from) && strtotime($from) > strtotime($to)) {
 			list($to, $from) = array($from, $to);
 
 			if ($produceErrorMessages) {
 				Session::setFormMessage(
 					'Form_DateRangeForm',
-					_t('DateUpdateHolder.FilterAppliedMessage','Filter has been applied with the dates reversed.'),
+					_t('DateUpdateHolder.FilterAppliedMessage', 'Filter has been applied with the dates reversed.'),
 					'warning'
 				);
 			}
@@ -354,7 +354,7 @@ 
 			if ($produceErrorMessages) {
 				Session::setFormMessage(
 					'Form_DateRangeForm',
-					_t('DateUpdateHolder.DateRangeFilterMessage','Filtered by a single date.'),
+					_t('DateUpdateHolder.DateRangeFilterMessage', 'Filtered by a single date.'),
 					'warning'
 				);
 			}
@@ -410,7 +410,7 @@ 
 		$tagID = $this->request->getVar('tag');
 
 		if (isset($tagID)) {
-			return TaxonomyTerm::get_by_id('TaxonomyTerm', (int)$tagID);
+			return TaxonomyTerm::get_by_id('TaxonomyTerm', (int) $tagID);
 		}
 	}
 

code/extensions/CwpWorkflowDefinitionExtension.php

Spacing +2 added lines, -2 removed lines

@@ -14,10 +14,10 @@
 	private static $create_default_workflow = true;
 
 	public function requireDefaultRecords() {
-		if(Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) {
+		if (Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) {
 			// Only proceed if a definition using this template has not been created yet
 			$definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
-			if($definition && $definition->exists()) return;
+			if ($definition && $definition->exists()) return;
 
 			//generate from the template, which happens after we write the definition
 			$definition = WorkflowDefinition::create();

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 		if(Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) {
 			// Only proceed if a definition using this template has not been created yet
 			$definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
-			if($definition && $definition->exists()) return;
+			if($definition && $definition->exists()) {
+				return;
+			}
 
 			//generate from the template, which happens after we write the definition
 			$definition = WorkflowDefinition::create();

code/extensions/SynonymValidator.php

Spacing +11 added lines, -11 removed lines

@@ -25,8 +25,8 @@ 
 	 * @return mixed
 	 */
 	public function php($data) {
-		foreach($this->fieldNames as $fieldName) {
-			if(empty($data[$fieldName])) {
+		foreach ($this->fieldNames as $fieldName) {
+			if (empty($data[$fieldName])) {
 				return;
 			}
 
@@ -41,7 +41,7 @@ 
 	 * @param mixed $value
 	 */
 	protected function validateField($fieldName, $value) {
-		if(!$this->validateValue($value)) {
+		if (!$this->validateValue($value)) {
 			$this->validationError(
 				$fieldName,
 				_t(
@@ -66,15 +66,15 @@ 
 		);
 
 		// strip comments (lines beginning with "#")
-		$lines = array_filter($lines, function ($line) {
+		$lines = array_filter($lines, function($line) {
 			$line = trim($line);
 
 			return !empty($line) && $line[0] !== '#';
 		});
 
 		// validate each line
-		foreach($lines as $line) {
-			if(!$this->validateLine($line)) {
+		foreach ($lines as $line) {
+			if (!$this->validateLine($line)) {
 				return false;
 			}
 		}
@@ -95,8 +95,8 @@ 
 		$parts = explode(',', $line);
 		$parts = array_filter($parts);
 
-		foreach($parts as $part) {
-			if(!$this->validatePart($part)) {
+		foreach ($parts as $part) {
+			if (!$this->validatePart($part)) {
 				return false;
 			}
 		}
@@ -112,11 +112,11 @@ 
 	 * @return bool
 	 */
 	protected function validatePart($part) {
-		if(strpos($part, '=>') !== false) {
+		if (strpos($part, '=>') !== false) {
 			$subs = explode('=>', $part);
 			$subs = array_filter($subs);
 
-			foreach($subs as $sub) {
+			foreach ($subs as $sub) {
 				if (!$this->validateNoSpaces($sub)) {
 					return false;
 				}
@@ -138,7 +138,7 @@ 
 		$value = trim($value);
 
 		// does the value contain 1 or more whitespace characters?
-		if(preg_match('/\s+/', $value)) {
+		if (preg_match('/\s+/', $value)) {
 			return false;
 		}