silverstripe / cwp

code/pagetypes/BasePage.php

Spacing +37 added lines, -37 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);
 		}
 
@@ -152,20 +152,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');
@@ -175,8 +175,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'));
@@ -184,7 +184,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'))
 			);
@@ -201,7 +201,7 @@ 
 	 */
 	function getAvailableTranslations() {
 
-		if(!class_exists('Translatable')){
+		if (!class_exists('Translatable')) {
 			return false;
 		}
 
@@ -241,11 +241,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;
 	}
 
@@ -291,13 +291,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();
 		}
 
@@ -310,11 +310,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 = '';
@@ -327,7 +327,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;
@@ -339,20 +339,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);
 		}
 
@@ -364,7 +364,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();
@@ -374,8 +374,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);
 			}
 		}
 
@@ -408,7 +408,7 @@ 
 		unlink($footerFile);
 
 		// output any errors
-		if($return_val != 0) {
+		if ($return_val != 0) {
 			user_error('wkhtmltopdf failed: ' . implode("\n", $output), E_USER_ERROR);
 		}
 
@@ -420,9 +420,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');
 		}
 
@@ -472,7 +472,7 @@ 
 			'Results' => $results ? $results->getResults() : '',
 			'Title' => _t('SearchForm.SearchResults', 'Search Results')
 		));
-		if($results) {
+		if ($results) {
 			$response = $response->customise($results);
 		}
 		
@@ -506,8 +506,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',
@@ -543,7 +543,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

@@ -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;
+		}
 	}
 
 }
@@ -291,7 +300,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');
@@ -339,7 +350,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)) {
@@ -364,7 +377,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/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.