Passed
Push — 1 ( b7f5c3...181950 )
by Robbie
02:19
created
code/pagetypes/BasePage.php 1 patch
Braces   +23 added lines, -8 removed lines patch added patch discarded remove patch
@@ -66,7 +66,9 @@  discard block
 block discarded – undo
66 66
 		$baseName = sprintf('%s-%s', $this->URLSegment, $this->ID);
67 67
 
68 68
 		$folderPath = Config::inst()->get('BasePage', 'generated_pdf_path');
69
-		if($folderPath[0] != '/') $folderPath = BASE_PATH . '/' . $folderPath;
69
+		if($folderPath[0] != '/') {
70
+			$folderPath = BASE_PATH . '/' . $folderPath;
71
+		}
70 72
 
71 73
 		return sprintf('%s/%s.pdf', $folderPath, $baseName);
72 74
 	}
@@ -75,7 +77,9 @@  discard block
 block discarded – undo
75 77
 	 * Build pdf link for template.
76 78
 	 */
77 79
 	public function PdfLink() {
78
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
80
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
81
+			return false;
82
+		}
79 83
 
80 84
 		$path = $this->getPdfFilename();
81 85
 
@@ -112,7 +116,9 @@  discard block
 block discarded – undo
112 116
 	 * @return boolean
113 117
 	 */
114 118
 	public function doUnpublish() {
115
-		if(!parent::doUnpublish()) return false;
119
+		if(!parent::doUnpublish()) {
120
+			return false;
121
+		}
116 122
 
117 123
 		$filepath = $this->getPdfFilename();
118 124
 		if(file_exists($filepath)) {
@@ -245,8 +251,11 @@  discard block
 block discarded – undo
245 251
 			)));
246 252
 		}
247 253
 
248
-		if ($translations->count()>1) return $translations;
249
-		else return null;
254
+		if ($translations->count()>1) {
255
+			return $translations;
256
+		} else {
257
+			return null;
258
+		}
250 259
 	}
251 260
 
252 261
 	/**
@@ -308,7 +317,9 @@  discard block
 block discarded – undo
308 317
 	 * Serve the page rendered as PDF.
309 318
 	 */
310 319
 	public function downloadpdf() {
311
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
320
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
321
+			return false;
322
+		}
312 323
 
313 324
 		// We only allow producing live pdf. There is no way to secure the draft files.
314 325
 		Versioned::reading_stage('Live');
@@ -356,7 +367,9 @@  discard block
 block discarded – undo
356 367
 	 * Render the page as PDF using wkhtmltopdf.
357 368
 	 */
358 369
 	public function generatePDF() {
359
-		if(!Config::inst()->get('BasePage', 'pdf_export')) return false;
370
+		if(!Config::inst()->get('BasePage', 'pdf_export')) {
371
+			return false;
372
+		}
360 373
 
361 374
 		$binaryPath = Config::inst()->get('BasePage', 'wkhtmltopdf_binary');
362 375
 		if(!$binaryPath || !is_executable($binaryPath)) {
@@ -381,7 +394,9 @@  discard block
 block discarded – undo
381 394
 		$footerFile = str_replace('.pdf', '_pdffooter.html', $pdfFile);
382 395
 
383 396
 		// make sure the work directory exists
384
-		if(!file_exists(dirname($pdfFile))) Filesystem::makeFolder(dirname($pdfFile));
397
+		if(!file_exists(dirname($pdfFile))) {
398
+			Filesystem::makeFolder(dirname($pdfFile));
399
+		}
385 400
 
386 401
 		//decide the domain to use in generation
387 402
 		$pdf_base_url = $this->getPDFBaseURL();
Please login to merge, or discard this patch.
code/pagetypes/DatedUpdateHolder.php 1 patch
Braces   +30 added lines, -10 removed lines patch added patch discarded remove patch
@@ -313,13 +313,25 @@  discard block
 block discarded – undo
313 313
 		$year = $this->request->getVar('year');
314 314
 		$month = $this->request->getVar('month');
315 315
 
316
-		if ($tag=='') $tag = null;
317
-		if ($from=='') $from = null;
318
-		if ($to=='') $to = null;
319
-		if ($year=='') $year = null;
320
-		if ($month=='') $month = null;
316
+		if ($tag=='') {
317
+			$tag = null;
318
+		}
319
+		if ($from=='') {
320
+			$from = null;
321
+		}
322
+		if ($to=='') {
323
+			$to = null;
324
+		}
325
+		if ($year=='') {
326
+			$year = null;
327
+		}
328
+		if ($month=='') {
329
+			$month = null;
330
+		}
321 331
 
322
-		if (isset($tag)) $tag = (int)$tag;
332
+		if (isset($tag)) {
333
+			$tag = (int)$tag;
334
+		}
323 335
 		if (isset($from)) {
324 336
 			$from = urldecode($from);
325 337
 			$parser = new SS_Datetime;
@@ -332,8 +344,12 @@  discard block
 block discarded – undo
332 344
 			$parser->setValue($to);
333 345
 			$to = $parser->Format('Y-m-d');
334 346
 		}
335
-		if (isset($year)) $year = (int)$year;
336
-		if (isset($month)) $month = (int)$month;
347
+		if (isset($year)) {
348
+			$year = (int)$year;
349
+		}
350
+		if (isset($month)) {
351
+			$month = (int)$month;
352
+		}
337 353
 
338 354
 		// If only "To" has been provided filter by single date. Normalise by swapping with "From".
339 355
 		if (isset($to) && !isset($from)) {
@@ -499,7 +515,9 @@  discard block
 block discarded – undo
499 515
 		// Build the link - keep the tag, but reset month, year and pagination.
500 516
 		$link = HTTP::setGetVar('from', $params['from'], $this->AbsoluteLink(), '&');
501 517
 		$link = HTTP::setGetVar('to', $params['to'], $link, '&');
502
-		if (isset($params['tag'])) $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
518
+		if (isset($params['tag'])) {
519
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
520
+		}
503 521
 
504 522
 		$this->redirect($link);
505 523
 	}
@@ -509,7 +527,9 @@  discard block
 block discarded – undo
509 527
 
510 528
 		// Reset the link - only include the tag.
511 529
 		$link = $this->AbsoluteLink();
512
-		if (isset($params['tag'])) $link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
530
+		if (isset($params['tag'])) {
531
+			$link = HTTP::setGetVar('tag', $params['tag'], $link, '&');
532
+		}
513 533
 
514 534
 		$this->redirect($link);
515 535
 	}
Please login to merge, or discard this patch.
code/extensions/CwpWorkflowDefinitionExtension.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,9 @@
 block discarded – undo
17 17
 		if(Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) {
18 18
 			// Only proceed if a definition using this template has not been created yet
19 19
 			$definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First();
20
-			if($definition && $definition->exists()) return;
20
+			if($definition && $definition->exists()) {
21
+				return;
22
+			}
21 23
 
22 24
 			//generate from the template, which happens after we write the definition
23 25
 			$definition = WorkflowDefinition::create();
Please login to merge, or discard this patch.