silverstripe / cwp

code/extensions/CustomSiteConfig.php

Spacing +18 added lines, -18 removed lines

@@ -32,11 +32,11 @@ 
 			'Root.Main', 
 			$gaCode = TextField::create(
 				'GACode', 
-				_t('CwpConfig.GaField','Google Analytics account')
+				_t('CwpConfig.GaField', 'Google Analytics account')
 			)
 		);
 		$gaCode->setRightTitle(
-			_t('CwpConfig.GaFieldDesc','Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)')
+			_t('CwpConfig.GaFieldDesc', 'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)')
 		);
 
 		$fields->findOrMakeTab(
@@ -48,7 +48,7 @@ 
 			'Root.SocialMedia', 
 			$facebookURL = TextField::create(
 				'FacebookURL', 
-				_t('CwpConfig.FbField','Facebook UID or username')
+				_t('CwpConfig.FbField', 'Facebook UID or username')
 			)
 		);
 		$facebookURL->setRightTitle(
@@ -62,22 +62,22 @@ 
 			'Root.SocialMedia', 
 			$twitterUsername = TextField::create(
 				'TwitterUsername', 
-				_t('CwpConfig.TwitterField','Twitter username')
+				_t('CwpConfig.TwitterField', 'Twitter username')
 			)
 		);
 		$twitterUsername->setRightTitle(
-			_t('CwpConfig.TwitterFieldDesc','Twitter username (eg, http://twitter.com/<strong>username</strong>)')
+			_t('CwpConfig.TwitterFieldDesc', 'Twitter username (eg, http://twitter.com/<strong>username</strong>)')
 		);
 
 		$fields->addFieldToTab(
 			'Root.SocialMedia', 
 			$addThisID = TextField::create(
 				'AddThisProfileID', 
-				_t('CwpConfig.AddThisField','AddThis Profile ID')
+				_t('CwpConfig.AddThisField', 'AddThis Profile ID')
 			)
 		);
 		$addThisID->setRightTitle(
-			_t('CwpConfig.AddThisFieldDesc','Profile ID to be used all across the site (in the format <strong>ra-XXXXXXXXXXXXXXXX</strong>)')
+			_t('CwpConfig.AddThisFieldDesc', 'Profile ID to be used all across the site (in the format <strong>ra-XXXXXXXXXXXXXXXX</strong>)')
 		);
 
 		$fields->findOrMakeTab(
@@ -89,7 +89,7 @@ 
 			'Root.LogosIcons',
 			 $logoField = UploadField::create(
 			 	'Logo', 
-			 	_t('CwpConfig.LogoUploadField','Logo, to appear in the top left')
+			 	_t('CwpConfig.LogoUploadField', 'Logo, to appear in the top left')
 			 )
 		);
 		$logoField->getValidator()->setAllowedExtensions(array('jpg', 'jpeg', 'png', 'gif'));
@@ -112,7 +112,7 @@ 
 			'Root.LogosIcons',
 			 $footerLogoField = UploadField::create(
 			 	'FooterLogo', 
-			 	_t('CwpConfig.FooterLogoField','Footer logo, to appear in the footer')
+			 	_t('CwpConfig.FooterLogoField', 'Footer logo, to appear in the footer')
 			 )
 		);
 		$footerLogoField->getValidator()->setAllowedExtensions(array('jpg', 'jpeg', 'png', 'gif'));
@@ -122,7 +122,7 @@ 
 			'Root.LogosIcons',
 			 $footerLogoRetinaField = UploadField::create(
 			 	'FooterLogoRetina', 
-			 	_t('CwpConfig.FooterLogoRetinaField','High resolution footer logo (recommended twice the height and width of the standard footer logo)')
+			 	_t('CwpConfig.FooterLogoRetinaField', 'High resolution footer logo (recommended twice the height and width of the standard footer logo)')
 			 )
 		);
 		$footerLogoRetinaField->getValidator()->setAllowedExtensions(array('jpg', 'jpeg', 'png', 'gif'));
@@ -132,18 +132,18 @@ 
 			'Root.LogosIcons',
 			 $footerLink = TextField::create(
 			 	'FooterLogoLink', 
-			 	_t('CwpConfig.FooterLogoLinkField','Footer Logo link')
+			 	_t('CwpConfig.FooterLogoLinkField', 'Footer Logo link')
 			 )
 		);
 		$footerLink->setRightTitle(
-			_t('CwpConfig.FooterLogoLinkDesc','Please include the protocol (ie, http:// or https://) unless it is an internal link.')
+			_t('CwpConfig.FooterLogoLinkDesc', 'Please include the protocol (ie, http:// or https://) unless it is an internal link.')
 		);
 
 		$fields->addFieldToTab(
 			'Root.LogosIcons',
 			 TextField::create(
 			 	'FooterLogoDescription', 
-			 	_t('CwpConfig.FooterLogoDescField','Footer Logo description')
+			 	_t('CwpConfig.FooterLogoDescField', 'Footer Logo description')
 			 )
 		);
 
@@ -151,7 +151,7 @@ 
 			'Root.LogosIcons',
 			 $favIconField = UploadField::create(
 			 	'FavIcon', 
-			 	_t('CwpConfig.FavIconField','Favicon, in .ico format, dimensions of 16x16, 32x32, or 48x48')
+			 	_t('CwpConfig.FavIconField', 'Favicon, in .ico format, dimensions of 16x16, 32x32, or 48x48')
 			 )
 		);
 		$favIconField->getValidator()->setAllowedExtensions(array('ico'));
@@ -161,7 +161,7 @@ 
 			'Root.LogosIcons',
 			 $atIcon144 = UploadField::create(
 			 	'AppleTouchIcon144', 
-			 	_t('CwpConfig.AppleIconField144','Apple Touch Web Clip and Windows 8 Tile Icon (dimensions of 144x144, PNG format)')
+			 	_t('CwpConfig.AppleIconField144', 'Apple Touch Web Clip and Windows 8 Tile Icon (dimensions of 144x144, PNG format)')
 			 )
 		);
 		$atIcon144->getValidator()->setAllowedExtensions(array('png'));
@@ -171,7 +171,7 @@ 
 			'Root.LogosIcons',
 			 $atIcon114 = UploadField::create(
 			 	'AppleTouchIcon114', 
-			 	_t('CwpConfig.AppleIconField114','Apple Touch Web Clip Icon (dimensions of 114x114, PNG format)')
+			 	_t('CwpConfig.AppleIconField114', 'Apple Touch Web Clip Icon (dimensions of 114x114, PNG format)')
 			 )
 		);
 		$atIcon114->getValidator()->setAllowedExtensions(array('png'));
@@ -181,7 +181,7 @@ 
 			'Root.LogosIcons',
 			 $atIcon72 = UploadField::create(
 			 	'AppleTouchIcon72', 
-			 	_t('CwpConfig.AppleIconField72','Apple Touch Web Clip Icon (dimensions of 72x72, PNG format)')
+			 	_t('CwpConfig.AppleIconField72', 'Apple Touch Web Clip Icon (dimensions of 72x72, PNG format)')
 			 )
 		);
 		$atIcon72->getValidator()->setAllowedExtensions(array('png'));
@@ -191,7 +191,7 @@ 
 			'Root.LogosIcons',
 			 $atIcon57 = UploadField::create(
 			 	'AppleTouchIcon57', 
-			 	_t('CwpConfig.AppleIconField57','Apple Touch Web Clip Icon (dimensions of 57x57, PNG format)')
+			 	_t('CwpConfig.AppleIconField57', 'Apple Touch Web Clip Icon (dimensions of 57x57, PNG format)')
 			 )
 		);
 		$atIcon57->getValidator()->setAllowedExtensions(array('png'));

code/model/CarouselItem.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
 			CompositeField::create(
 				LabelField::create(
 					"LabelArchive",
-					_t('CwpCarousel.ArchivedField',"Archive this carousel item?")
+					_t('CwpCarousel.ArchivedField', "Archive this carousel item?")
 				)->addExtraClass("left"),
 				CheckboxField::create('Archived', '')
 			)->addExtraClass("field special")
@@ -72,12 +72,12 @@ 
 		return $this->Parent()->canView($member);
 	}
 
-	public function ImageThumb(){
+	public function ImageThumb() {
 	   return $this->Image()->SetWidth(50);
 	}
 
-	public function ArchivedReadable(){
-		if($this->Archived == 1) return _t('GridField.Archived', 'Archived');
+	public function ArchivedReadable() {
+		if ($this->Archived == 1) return _t('GridField.Archived', 'Archived');
 		return _t('GridField.Live', 'Live');
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -77,7 +77,9 @@
 	}
 
 	public function ArchivedReadable(){
-		if($this->Archived == 1) return _t('GridField.Archived', 'Archived');
+		if($this->Archived == 1) {
+			return _t('GridField.Archived', 'Archived');
+		}
 		return _t('GridField.Live', 'Live');
 	}
 }

code/pagetypes/EventPage.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 
 	static $icon = 'cwp/images/icons/sitetree_images/event_page.png';
 
-	public $pageIcon =  'images/icons/sitetree_images/event_page.png';
+	public $pageIcon = 'images/icons/sitetree_images/event_page.png';
 
 	private static $singular_name = 'Event Page';
 
@@ -35,15 +35,15 @@ 
 	 * Add the default for the Date being the current day.
 	 */
 	public function populateDefaults() {
-		if(!isset($this->Date) || $this->Date === null) {
+		if (!isset($this->Date) || $this->Date === null) {
 			$this->Date = SS_Datetime::now()->Format('Y-m-d');
 		}
 
-		if(!isset($this->StartTime) || $this->StartTime === null) {
+		if (!isset($this->StartTime) || $this->StartTime === null) {
 			$this->StartTime = '09:00:00';
 		}
 
-		if(!isset($this->EndTime) || $this->EndTime === null) {
+		if (!isset($this->EndTime) || $this->EndTime === null) {
 			$this->EndTime = '17:00:00';
 		}
 

code/pagetypes/DatedUpdatePage.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	public function populateDefaults() {
 		parent::populateDefaults();
 
-		if(!isset($this->Date) || $this->Date === null) {
+		if (!isset($this->Date) || $this->Date === null) {
 			$this->Date = SS_Datetime::now()->Format('Y-m-d 09:00:00');
 		}
 	}
@@ -53,7 +53,7 @@ 
 		);
 		$abstractField->setAttribute('maxlength', '160');
 		$abstractField->setRightTitle(
-			_t('DateUpdatePage.AbstractDesc','The abstract is used as a summary on the listing pages. It is limited to 160 characters.')
+			_t('DateUpdatePage.AbstractDesc', 'The abstract is used as a summary on the listing pages. It is limited to 160 characters.')
 		);
 		$abstractField->setRows(6);
 

code/pagetypes/NewsPage.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		'FeaturedImage' => 'Image'
 	);
 
-	public $pageIcon =  'images/icons/sitetree_images/news.png';
+	public $pageIcon = 'images/icons/sitetree_images/news.png';
 
 	public function fieldLabels($includerelations = true) {
 		$labels = parent::fieldLabels($includerelations);

code/pagetypes/BaseHomePage.php

Spacing +15 added lines, -15 removed lines

@@ -55,7 +55,7 @@ 
 			'Root.Main', 
 			TreeDropdownField::create(
 				'LearnMorePageID', 
-				_t('BaseHomePage.LearnMoreLink','Page to link the "Learn More" button to:'), 
+				_t('BaseHomePage.LearnMoreLink', 'Page to link the "Learn More" button to:'), 
 				'SiteTree'
 			), 
 			'Metadata'
@@ -70,7 +70,7 @@ 
 		);
 		$gridConfig = $gridField->getConfig();
 		$gridConfig->getComponentByType('GridFieldAddNewButton')->setButtonName(
-			_t('BaseHomePage.AddNewButton','Add new')
+			_t('BaseHomePage.AddNewButton', 'Add new')
 		);
 		$gridConfig->removeComponentsByType('GridFieldAddExistingAutocompleter');
 		$gridConfig->removeComponentsByType('GridFieldDeleteAction');
@@ -89,7 +89,7 @@ 
 		);
 		$gridConfig = $gridField->getConfig();
 		$gridConfig->getComponentByType('GridFieldAddNewButton')->setButtonName(
-			_t('BaseHomePage.AddNewButton','Add new')
+			_t('BaseHomePage.AddNewButton', 'Add new')
 		);
 		$gridConfig->removeComponentsByType('GridFieldAddExistingAutocompleter');
 		$gridConfig->removeComponentsByType('GridFieldDeleteAction');
@@ -105,25 +105,25 @@ 
 			'Root.Features', 
 			ToggleCompositeField::create('FeatureOne', _t('SiteTree.FeatureOne', 'Feature One'),
 				array(
-					TextField::create('FeatureOneTitle', _t('BaseHomePage.Title','Title')),
+					TextField::create('FeatureOneTitle', _t('BaseHomePage.Title', 'Title')),
 					$dropdownField = DropdownField::create(
 						'FeatureOneCategory',
-						_t('BaseHomePage.FeatureCategoryDropdown','Category icon'),
+						_t('BaseHomePage.FeatureCategoryDropdown', 'Category icon'),
 						singleton('BaseHomePage')->dbObject('FeatureOneCategory')->enumValues()
 					),
 					HTMLEditorField::create(
 						'FeatureOneContent',
-						_t('BaseHomePage.FeatureContentFieldLabel','Content')
+						_t('BaseHomePage.FeatureContentFieldLabel', 'Content')
 					),
 					TextField::create(
 						'FeatureOneButtonText',
-						_t('BaseHomePage.FeatureButtonText','Button text')
+						_t('BaseHomePage.FeatureButtonText', 'Button text')
 					),
 					TreeDropdownField::create(
 						'FeatureOneLinkID',
-						_t('BaseHomePage.FeatureLink','Page to link to'),
+						_t('BaseHomePage.FeatureLink', 'Page to link to'),
 						'SiteTree'
-					)->setDescription(_t('BaseHomePage.ButtonTextRequired','Button text must be filled in'))
+					)->setDescription(_t('BaseHomePage.ButtonTextRequired', 'Button text must be filled in'))
 				)
 			)->setHeadingLevel(3)
 		);
@@ -131,25 +131,25 @@ 
 
 		$fields->addFieldToTab('Root.Features', ToggleCompositeField::create('FeatureTwo', _t('SiteTree.FeatureTwo', 'Feature Two'),
 			array(
-				TextField::create('FeatureTwoTitle', _t('BaseHomePage.Title','Title')),
+				TextField::create('FeatureTwoTitle', _t('BaseHomePage.Title', 'Title')),
 				$dropdownField = DropdownField::create(
 					'FeatureTwoCategory', 
-					_t('BaseHomePage.FeatureCategoryDropdown','Category icon'),
+					_t('BaseHomePage.FeatureCategoryDropdown', 'Category icon'),
 					singleton('BaseHomePage')->dbObject('FeatureTwoCategory')->enumValues()
 				),
 				HTMLEditorField::create(
 					'FeatureTwoContent', 
-					_t('BaseHomePage.FeatureContentFieldLabel','Content')
+					_t('BaseHomePage.FeatureContentFieldLabel', 'Content')
 				),
 				TextField::create(
 					'FeatureTwoButtonText',
-					_t('BaseHomePage.FeatureButtonText','Button text')
+					_t('BaseHomePage.FeatureButtonText', 'Button text')
 				),
 				TreeDropdownField::create(
 					'FeatureTwoLinkID',
-					_t('BaseHomePage.FeatureLink','Page to link to'),
+					_t('BaseHomePage.FeatureLink', 'Page to link to'),
 					'SiteTree'
-				)->setDescription(_t('BaseHomePage.ButtonTextRequired','Button text must be filled in'))
+				)->setDescription(_t('BaseHomePage.ButtonTextRequired', 'Button text must be filled in'))
 			)
 			)->setHeadingLevel(3)
 		);

code/pagetypes/FooterHolder.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	public function redirectionLink() {
 		$childPage = $this->Children()->first();
 
-		if($childPage) {
+		if ($childPage) {
 			// If we're linking to another redirectorpage then just return the URLSegment, to prevent a cycle of redirector
 			// pages from causing an infinite loop.  Instead, they will cause a 30x redirection loop in the browser, but
 			// this can be handled sufficiently gracefully by the browser.

_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');
 }

code/pagetypes/BasePage.php

Spacing +30 added lines, -30 removed lines

@@ -60,7 +60,7 @@ 
 		$baseName = sprintf('%s-%s', $this->URLSegment, $this->ID);
 
 		$folderPath = Config::inst()->get('BasePage', 'generated_pdf_path');
-		if($folderPath[0] != '/') $folderPath = BASE_PATH . '/' . $folderPath;
+		if ($folderPath[0] != '/') $folderPath = BASE_PATH . '/' . $folderPath;
 
 		return sprintf('%s/%s.pdf', $folderPath, $baseName);
 	}
@@ -69,11 +69,11 @@ 
 	 * Build pdf link for template.
 	 */
 	public function PdfLink() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if (!Config::inst()->get('BasePage', 'pdf_export')) return false;
 
 		$path = $this->getPdfFilename();
 
-		if((Versioned::current_stage() == 'Live') && file_exists($path)) {
+		if ((Versioned::current_stage() == 'Live') && file_exists($path)) {
 			return Director::baseURL() . preg_replace('#^/#', '', Director::makeRelative($path));
 		} else {
 			return $this->Link('downloadpdf');
@@ -94,7 +94,7 @@ 
 	 */
 	public function onAfterPublish(&$original) {
 		$filepath = $this->getPdfFilename();
-		if(file_exists($filepath)) {
+		if (file_exists($filepath)) {
 			unlink($filepath);
 		}
 	}
@@ -106,10 +106,10 @@ 
 	 * @return boolean
 	 */
 	public function doUnpublish() {
-		if(!parent::doUnpublish()) return false;
+		if (!parent::doUnpublish()) return false;
 
 		$filepath = $this->getPdfFilename();
-		if(file_exists($filepath)) {
+		if (file_exists($filepath)) {
 			unlink($filepath);
 		}
 
@@ -135,20 +135,20 @@ 
 
 		$fields->findOrMakeTab(
 			'Root.RelatedPages',
-			_t('BasePage.RelatedPages','Related pages')
+			_t('BasePage.RelatedPages', 'Related pages')
 		);
 		$fields->addFieldToTab(
 			'Root.RelatedPages',
 			GridField::create(
 				'RelatedPages',
-				_t('BasePage.RelatedPages','Related pages'),
+				_t('BasePage.RelatedPages', 'Related pages'),
 				$this->RelatedPages(),
 				$components
 			)
 		);
 
 		// Taxonomies - Unless they have their own 'Tags' field (such as in Blog, etc)
-		if(!$this->has_many('Tags') && !$this->many_many('Tags')) {
+		if (!$this->has_many('Tags') && !$this->many_many('Tags')) {
 			$components = GridFieldConfig_RelationEditor::create();
 			$components->removeComponentsByType('GridFieldAddNewButton');
 			$components->removeComponentsByType('GridFieldEditButton');
@@ -158,8 +158,8 @@ 
 
 			$dataColumns = $components->getComponentByType('GridFieldDataColumns');
 			$dataColumns->setDisplayFields(array(
-				'Name' => _t('BasePage.Term','Term'),
-				'TaxonomyName' => _t('BasePage.Taxonomy','Taxonomy')
+				'Name' => _t('BasePage.Term', 'Term'),
+				'TaxonomyName' => _t('BasePage.Taxonomy', 'Taxonomy')
 			));
 
 			$fields->findOrMakeTab('Root.Tags', _t('BasePage.TagsTabTitle', 'Tags'));
@@ -167,7 +167,7 @@ 
 				'Root.Tags',
 				TreeMultiselectField::create(
 					'Terms',
-					_t('BasePage.Terms','Terms'),
+					_t('BasePage.Terms', 'Terms'),
 					'TaxonomyTerm'
 				)->setDescription(_t('BasePage.TermsDescription', 'Click to search for additional terms'))
 			);
@@ -184,7 +184,7 @@ 
 	 */
 	function getAvailableTranslations() {
 
-		if(!class_exists('Translatable')){
+		if (!class_exists('Translatable')) {
 			return false;
 		}
 
@@ -224,11 +224,11 @@ 
 			$translations->push(new ArrayData(array(
 				'LangName' => $nativeLangName,
 				'Link' => $link,
-				'Current' => (Translatable::get_current_locale()==$loc)
+				'Current' => (Translatable::get_current_locale() == $loc)
 			)));
 		}
 
-		if ($translations->count()>1) return $translations;
+		if ($translations->count() > 1) return $translations;
 		else return null;
 	}
 
@@ -274,13 +274,13 @@ 
 	 * Serve the page rendered as PDF.
 	 */
 	public function downloadpdf() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if (!Config::inst()->get('BasePage', 'pdf_export')) return false;
 
 		// We only allow producing live pdf. There is no way to secure the draft files.
 		Versioned::reading_stage('Live');
 
 		$path = $this->dataRecord->getPdfFilename();
-		if(!file_exists($path)) {
+		if (!file_exists($path)) {
 			$this->generatePDF();
 		}
 
@@ -291,20 +291,20 @@ 
 	 * Render the page as PDF using wkhtmltopdf.
 	 */
 	public function generatePDF() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if (!Config::inst()->get('BasePage', 'pdf_export')) return false;
 
 		$binaryPath = Config::inst()->get('BasePage', 'wkhtmltopdf_binary');
-		if(!$binaryPath || !is_executable($binaryPath)) {
-			if(defined('WKHTMLTOPDF_BINARY') && is_executable(WKHTMLTOPDF_BINARY)) {
+		if (!$binaryPath || !is_executable($binaryPath)) {
+			if (defined('WKHTMLTOPDF_BINARY') && is_executable(WKHTMLTOPDF_BINARY)) {
 				$binaryPath = WKHTMLTOPDF_BINARY;
 			}
 		}
 
-		if(!$binaryPath) {
+		if (!$binaryPath) {
 			user_error('Neither WKHTMLTOPDF_BINARY nor BasePage.wkhtmltopdf_binary are defined', E_USER_ERROR);
 		}
 
-		if(Versioned::get_reading_mode() == 'Stage.Stage') {
+		if (Versioned::get_reading_mode() == 'Stage.Stage') {
 			user_error('Generating PDFs on draft is not supported', E_USER_ERROR);
 		}
 
@@ -316,7 +316,7 @@ 
 		$footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
 
 		// make sure the work directory exists
-		if(!file_exists(dirname($pdfFile))) Filesystem::makeFolder(dirname($pdfFile));
+		if (!file_exists(dirname($pdfFile))) Filesystem::makeFolder(dirname($pdfFile));
 
 		// Force http protocol on CWP - fetching from localhost without using the proxy, SSL terminates on gateway.
 		if (defined('CWP_ENVIRONMENT')) {
@@ -351,7 +351,7 @@ 
 		unlink($footerFile);
 
 		// output any errors
-		if($return_val != 0) {
+		if ($return_val != 0) {
 			user_error('wkhtmltopdf failed: ' . implode("\n", $output), E_USER_ERROR);
 		}
 
@@ -363,9 +363,9 @@ 
 	 * Site search form
 	 */
 	public function SearchForm() {
-		$searchText =  _t('SearchForm.SEARCH', 'Search');
+		$searchText = _t('SearchForm.SEARCH', 'Search');
 
-		if($this->getRequest()->getVar('Search')) {
+		if ($this->getRequest()->getVar('Search')) {
 			$searchText = $this->getRequest()->getVar('Search');
 		}
 
@@ -415,7 +415,7 @@ 
 			'Results' => $results ? $results->getResults() : '',
 			'Title' => _t('SearchForm.SearchResults', 'Search Results')
 		));
-		if($results) {
+		if ($results) {
 			$response = $response->customise($results);
 		}
 		
@@ -449,8 +449,8 @@ 
 		$themeDir = SSViewer::get_theme_folder();
 
 		return array(
-			THIRDPARTY_DIR .'/jquery/jquery.js',
-			THIRDPARTY_DIR .'/jquery-ui/jquery-ui.js',
+			THIRDPARTY_DIR . '/jquery/jquery.js',
+			THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js',
 			"$themeDir/js/lib/modernizr.js",
 			"$themeDir/js/bootstrap-transition.2.3.1.js",
 			'themes/module_bootstrap/js/bootstrap-collapse.js',
@@ -486,7 +486,7 @@ 
 
 		// Ensure we only include styles when theme is enabled (except when running certain tests)
 		$theme = Config::inst()->get('SSViewer', 'theme');
-		if($theme) {
+		if ($theme) {
 			// Include base scripts that are needed on all pages
 			Requirements::combine_files('scripts.js', $this->getBaseScripts());
 

Braces +23 added lines, -8 removed lines

@@ -60,7 +60,9 @@ 
 		$baseName = sprintf('%s-%s', $this->URLSegment, $this->ID);
 
 		$folderPath = Config::inst()->get('BasePage', 'generated_pdf_path');
-		if($folderPath[0] != '/') $folderPath = BASE_PATH . '/' . $folderPath;
+		if($folderPath[0] != '/') {
+			$folderPath = BASE_PATH . '/' . $folderPath;
+		}
 
 		return sprintf('%s/%s.pdf', $folderPath, $baseName);
 	}
@@ -69,7 +71,9 @@ 
 	 * Build pdf link for template.
 	 */
 	public function PdfLink() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
+			return false;
+		}
 
 		$path = $this->getPdfFilename();
 
@@ -106,7 +110,9 @@ 
 	 * @return boolean
 	 */
 	public function doUnpublish() {
-		if(!parent::doUnpublish()) return false;
+		if(!parent::doUnpublish()) {
+			return false;
+		}
 
 		$filepath = $this->getPdfFilename();
 		if(file_exists($filepath)) {
@@ -228,8 +234,11 @@ 
 			)));
 		}
 
-		if ($translations->count()>1) return $translations;
-		else return null;
+		if ($translations->count()>1) {
+			return $translations;
+		} else {
+			return null;
+		}
 	}
 
 }
@@ -274,7 +283,9 @@ 
 	 * Serve the page rendered as PDF.
 	 */
 	public function downloadpdf() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
+			return false;
+		}
 
 		// We only allow producing live pdf. There is no way to secure the draft files.
 		Versioned::reading_stage('Live');
@@ -291,7 +302,9 @@ 
 	 * Render the page as PDF using wkhtmltopdf.
 	 */
 	public function generatePDF() {
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
+			return false;
+		}
 
 		$binaryPath = Config::inst()->get('BasePage', 'wkhtmltopdf_binary');
 		if(!$binaryPath || !is_executable($binaryPath)) {
@@ -316,7 +329,9 @@ 
 		$footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
 
 		// make sure the work directory exists
-		if(!file_exists(dirname($pdfFile))) Filesystem::makeFolder(dirname($pdfFile));
+		if(!file_exists(dirname($pdfFile))) {
+			Filesystem::makeFolder(dirname($pdfFile));
+		}
 
 		// Force http protocol on CWP - fetching from localhost without using the proxy, SSL terminates on gateway.
 		if (defined('CWP_ENVIRONMENT')) {