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/EventPage.php

Spacing +5 added lines, -5 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';
 		}
 
@@ -51,7 +51,7 @@ 
 	}
 
 	public function getCMSFields() {
-		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+		$this->beforeUpdateCMSFields(function(FieldList $fields) {
 			$fields->removeByName('Date');
 
 			$dateTimeFields = array();

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/BasePage.php

Indentation +16 added lines, -16 removed lines

@@ -250,22 +250,22 @@
 	}
 
 	/**
-     * Returns the native language name for the selected locale/language, empty string if Translatable is not available
-     *
-     * @return string
-     */
-    public function getSelectedLanguage()
-    {
-        if (!class_exists('Translatable')) {
-            return '';
-        }
-
-        $language = explode('_', Translatable::get_current_locale());
-        $languageCode = array_shift($language);
-        $nativeName = i18n::get_language_name($languageCode, true);
-
-        return $nativeName;
-    }
+	 * Returns the native language name for the selected locale/language, empty string if Translatable is not available
+	 *
+	 * @return string
+	 */
+	public function getSelectedLanguage()
+	{
+		if (!class_exists('Translatable')) {
+			return '';
+		}
+
+		$language = explode('_', Translatable::get_current_locale());
+		$languageCode = array_shift($language);
+		$nativeName = i18n::get_language_name($languageCode, true);
+
+		return $nativeName;
+	}
 }
 
 class BasePage_Controller extends ContentController {

Spacing +34 added lines, -34 removed lines

@@ -66,7 +66,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);
 	}
@@ -75,11 +75,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');
@@ -100,7 +100,7 @@ 
 	 */
 	public function onAfterPublish(&$original) {
 		$filepath = $this->getPdfFilename();
-		if(file_exists($filepath)) {
+		if (file_exists($filepath)) {
 			unlink($filepath);
 		}
 	}
@@ -112,10 +112,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,7 +135,7 @@ 
 	}
 
 	public function getCMSFields() {
-		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+		$this->beforeUpdateCMSFields(function(FieldList $fields) {
 			// Related Pages
 			$components = GridFieldConfig_RelationEditor::create();
 			$components->removeComponentsByType('GridFieldAddNewButton');
@@ -151,20 +151,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');
@@ -174,8 +174,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'));
@@ -183,7 +183,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'))
 				);
@@ -200,7 +200,7 @@ 
 	 */
 	public function getAvailableTranslations() {
 
-		if(!class_exists('Translatable')){
+		if (!class_exists('Translatable')) {
 			return false;
 		}
 
@@ -241,11 +241,11 @@ 
 				'Locale' => i18n::convert_rfc1766($loc),
 				'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;
 	}
 
@@ -308,13 +308,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();
 		}
 
@@ -327,11 +327,11 @@ 
 	*/
 	public function getPDFBaseURL() {
 		//if base url YML is defined in YML, use that
-		if(Config::inst()->get('BasePage', 'pdf_base_url')){
-			$pdf_base_url = Config::inst()->get('BasePage', 'pdf_base_url').'/';
+		if (Config::inst()->get('BasePage', 'pdf_base_url')) {
+			$pdf_base_url = Config::inst()->get('BasePage', 'pdf_base_url') . '/';
 		//otherwise, if we are CWP use the secure domain
-		} elseif (defined('CWP_SECURE_DOMAIN')){
-			$pdf_base_url = CWP_SECURE_DOMAIN.'/';
+		} elseif (defined('CWP_SECURE_DOMAIN')) {
+			$pdf_base_url = CWP_SECURE_DOMAIN . '/';
 		//or if neither, leave blank
 		} else {
 			$pdf_base_url = '';
@@ -344,7 +344,7 @@ 
 	* Or if we aren't on a CWP server
 	*/
 	public function getPDFProxy($pdf_base_url) {
-		if (!defined('CWP_SECURE_DOMAIN') || $pdf_base_url == CWP_SECURE_DOMAIN.'/') {
+		if (!defined('CWP_SECURE_DOMAIN') || $pdf_base_url == CWP_SECURE_DOMAIN . '/') {
  		 	$proxy = '';
 		} else {
 			$proxy = ' --proxy ' . SS_OUTBOUND_PROXY . ':' . SS_OUTBOUND_PROXY_PORT;
@@ -356,20 +356,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);
 		}
 
@@ -381,7 +381,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));
 
 		//decide the domain to use in generation
 		$pdf_base_url = $this->getPDFBaseURL();
@@ -391,8 +391,8 @@ 
 			Config::inst()->nest();
 			Config::inst()->update('Director', 'alternate_protocol', 'http');
 			//only set alternate protocol if CWP_SECURE_DOMAIN is defined OR pdf_base_url is
-			if($pdf_base_url){
-				Config::inst()->update('Director', 'alternate_base_url', 'http://'.$pdf_base_url);
+			if ($pdf_base_url) {
+				Config::inst()->update('Director', 'alternate_base_url', 'http://' . $pdf_base_url);
 			}
 		}
 
@@ -425,7 +425,7 @@ 
 		unlink($footerFile);
 
 		// output any errors
-		if($return_val != 0) {
+		if ($return_val != 0) {
 			user_error('wkhtmltopdf failed: ' . implode("\n", $output), E_USER_ERROR);
 		}
 
@@ -501,10 +501,10 @@ 
 
 		// Customise page
 		$response = $this->customise($properties);
-		if($results) {
+		if ($results) {
 			$response = $response
 				->customise($results)
-				->customise(array( 'Results' => $results->getResults() ));
+				->customise(array('Results' => $results->getResults()));
 		}
 
 		// Render

Braces +23 added lines, -8 removed lines

@@ -66,7 +66,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);
 	}
@@ -75,7 +77,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();
 
@@ -112,7 +116,9 @@ 
 	 * @return boolean
 	 */
 	public function doUnpublish() {
-		if(!parent::doUnpublish()) return false;
+		if(!parent::doUnpublish()) {
+			return false;
+		}
 
 		$filepath = $this->getPdfFilename();
 		if(file_exists($filepath)) {
@@ -245,8 +251,11 @@ 
 			)));
 		}
 
-		if ($translations->count()>1) return $translations;
-		else return null;
+		if ($translations->count()>1) {
+			return $translations;
+		} else {
+			return null;
+		}
 	}
 
 	/**
@@ -308,7 +317,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');
@@ -356,7 +367,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)) {
@@ -381,7 +394,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));
+		}
 
 		//decide the domain to use in generation
 		$pdf_base_url = $this->getPDFBaseURL();

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/FooterHolder.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 	);
 
 	public function getCMSFields() {
-		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+		$this->beforeUpdateCMSFields(function(FieldList $fields) {
 			$fields->removeByName('RedirectorDescHeader');
 			$fields->removeByName('RedirectionType');
 			$fields->removeByName('LinkToID');
@@ -34,7 +34,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.