silverstripe / cwp

code/search/CwpSearchResult.php

Spacing +7 added lines, -7 removed lines

@@ -54,11 +54,11 @@ 
 	 */
 	public function __construct($terms = '', ArrayData $results = null) {
 		$this->query = $terms;
-		if($results) {
+		if ($results) {
 			// Clean up the results.
 			$matches = $results->Matches;
-			foreach($matches as $result) {
-				if(!$result->canView()) {
+			foreach ($matches as $result) {
+				if (!$result->canView()) {
 					$matches->remove($result);
 				}
 			}
@@ -177,12 +177,12 @@ 
 	 * @return string|null
 	 */
 	protected function getLink($terms, $format = null) {
-		if(!$terms) {
+		if (!$terms) {
 			return null;
 		}
-		$link = 'search/SearchForm?Search='.rawurlencode($terms);
-		if($format) {
-			$link .= '&format='.rawurlencode($format);
+		$link = 'search/SearchForm?Search=' . rawurlencode($terms);
+		if ($format) {
+			$link .= '&format=' . rawurlencode($format);
 		}
 		return $link;
 	}

code/search/CwpSearchPage.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 	private static $hide_ancestor = 'CwpSearchPage';
 	
 	public function canViewStage($stage = 'Live', $member = null) {
-		if(Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) {
+		if (Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) {
 			return true;
 		}
 		
@@ -37,7 +37,7 @@ 
 	}
 	
 	public function __construct($dataRecord = null) {
-		if(!$dataRecord) {
+		if (!$dataRecord) {
 			$dataRecord = $this->generateSearchRecord();
 		}
 		parent::__construct($dataRecord);

code/search/CwpSearchEngine.php

Spacing +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	protected function getSearchOptions($spellcheck) {
 		$options = $this->config()->search_options;
-		if($spellcheck) {
+		if ($spellcheck) {
 			$options = array_merge($options, $this->config()->spellcheck_options);
 		}
 		return $options;
@@ -103,7 +103,7 @@ 
 	 * @return CwpSearchResult|null
 	 */
 	public function search($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $followSuggestions = false) {
-		if(empty($keywords)) {
+		if (empty($keywords)) {
 			return null;
 		}
 
@@ -112,7 +112,7 @@ 
 			$result = $this->getResult($keywords, $classes, $searchIndex, $limit, $start, true);
 			
 			// Return results if we don't need to refine this any further
-			if(!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
+			if (!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) {
 				return $result;
 			}
 			
@@ -122,13 +122,13 @@ 
 			$newResult->setOriginal($keywords);
 
 			// Compare new results to the original query
-			if($newResult->hasResults()) {
+			if ($newResult->hasResults()) {
 				return $newResult;
 			} else {
 				return $result;
 			}
 
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			SS_Log::log($e, SS_Log::WARN);
 		}
 		

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/extensions/CwpCommentingExtension.php

Spacing +4 added lines, -4 removed lines

@@ -10,22 +10,22 @@
 		$fields = $form->Fields();
 
 		// Set field names and descriptions
-		if($nameField = $fields->dataFieldByName('Name')) {
+		if ($nameField = $fields->dataFieldByName('Name')) {
 			$nameField
 				->setTitle('Name')
 				->setDescription('(required)');
 		}
 
-		if($emailField = $fields->dataFieldByName('Email')) {
+		if ($emailField = $fields->dataFieldByName('Email')) {
 			$emailField
 				->setTitle('Email')
 				->setDescription('will not be published (required)');
 		}
 
-		if($urlField = $fields->dataFieldByName('URL')) {
+		if ($urlField = $fields->dataFieldByName('URL')) {
 			$urlField
 				->setTitle('Your website (optional)')
-				->setAttribute('placeholder','http://');
+				->setAttribute('placeholder', 'http://');
 		}
 	}
 }

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);