Completed
Push — master ( b3aafe...e1584b )
by Mateusz
03:05
created
code/backends/DeploymentStrategy.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -130,10 +130,10 @@
 block discarded – undo
130 130
 	 */
131 131
 	public function getChangesModificationNeeded() {
132 132
 		$filtered = [];
133
-		foreach ($this->changes as $change => $details) {
134
-			if (array_key_exists('description', $details)) {
133
+		foreach($this->changes as $change => $details) {
134
+			if(array_key_exists('description', $details)) {
135 135
 				$filtered[$change] = $details;
136
-			} else if (
136
+			} else if(
137 137
 				(array_key_exists('from', $details) || array_key_exists('to', $details))
138 138
 				&& $details['from'] !== $details['to']
139 139
 			) {
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,8 +110,12 @@
 block discarded – undo
110 110
 		// Normalise "empty" values into dashes so comparisons are done properly.
111 111
 		// This means there is no diference between an empty string and a null
112 112
 		// but "0" is considered to be non-empty.
113
-		if(empty($from) && !strlen($from)) $from = '-';
114
-		if(empty($to) && !strlen($to)) $to = '-';
113
+		if(empty($from) && !strlen($from)) {
114
+			$from = '-';
115
+		}
116
+		if(empty($to) && !strlen($to)) {
117
+			$to = '-';
118
+		}
115 119
 
116 120
 		return $this->changes[$title] = array(
117 121
 			'from' => $from,
Please login to merge, or discard this patch.
code/control/Dispatcher.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	 */
64 64
 	public function asJSONValidatorErrors($code, $validatorErrors) {
65 65
 		$fieldErrors = [];
66
-		foreach ($validatorErrors as $error) {
66
+		foreach($validatorErrors as $error) {
67 67
 			$fieldErrors[$error['fieldName']] = $error['message'];
68 68
 		}
69 69
 		return $this->asJSONFormFieldErrors($code, $fieldErrors);
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 		// To get around that, upon spotting an active redirect, we change the response code to 200,
106 106
 		// and move the redirect into the "RedirectTo" field in the JSON response. Frontend can
107 107
 		// then interpret this and trigger a redirect.
108
-		if ($this->redirectedTo()) {
108
+		if($this->redirectedTo()) {
109 109
 			$data['RedirectTo'] = $this->response->getHeader('Location');
110 110
 			// Pop off the header - we are no longer redirecting via the usual mechanism.
111 111
 			$this->response->removeHeader('Location');
Please login to merge, or discard this patch.
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,13 +36,17 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	protected function getSecurityToken($name = null) {
39
-		if(is_null($name)) $name = sprintf('%sSecurityID', get_class($this));
39
+		if(is_null($name)) {
40
+			$name = sprintf('%sSecurityID', get_class($this));
41
+		}
40 42
 		return new \SecurityToken($name);
41 43
 	}
42 44
 
43 45
 	protected function checkSecurityToken($name = null) {
44 46
 		$postVar = is_null($name) ? 'SecurityID' : $name;
45
-		if(is_null($name)) $name = sprintf('%sSecurityID', get_class($this));
47
+		if(is_null($name)) {
48
+			$name = sprintf('%sSecurityID', get_class($this));
49
+		}
46 50
 		$securityToken = $this->getSecurityToken($name);
47 51
 
48 52
 		// By default the security token is always represented by a "SecurityID" post var,
@@ -132,7 +136,9 @@  discard block
 block discarded – undo
132 136
 	 */
133 137
 	protected function trimWhitespace($val) {
134 138
 		if(is_array($val)) {
135
-			foreach($val as $k => $v) $val[$k] = $this->trimWhitespace($v);
139
+			foreach($val as $k => $v) {
140
+				$val[$k] = $this->trimWhitespace($v);
141
+			}
136 142
 			return $val;
137 143
 		} else {
138 144
 			return trim($val);
@@ -147,7 +153,9 @@  discard block
 block discarded – undo
147 153
 	 */
148 154
 	protected function stripNonPrintables($val) {
149 155
 		if(is_array($val)) {
150
-			foreach($val as $k => $v) $val[$k] = $this->stripNonPrintables($v);
156
+			foreach($val as $k => $v) {
157
+				$val[$k] = $this->stripNonPrintables($v);
158
+			}
151 159
 			return $val;
152 160
 		} else {
153 161
 			return preg_replace('/[[:cntrl:]]/', '', $val);
Please login to merge, or discard this patch.
code/extensions/FrontendLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 class FrontendLink extends DataExtension {
4 4
 
5 5
 	public function updateItemEditForm($form) {
6
-		if ($this->owner->record->hasMethod('Link')) {
6
+		if($this->owner->record->hasMethod('Link')) {
7 7
 			$link = sprintf(
8 8
 				'<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
9 9
 				$this->owner->record->Link()
Please login to merge, or discard this patch.
code/model/DNEnvironment.php 2 patches
Braces   +36 added lines, -12 removed lines patch added patch discarded remove patch
@@ -386,9 +386,13 @@  discard block
 block discarded – undo
386 386
 		// Must be logged in to check permissions
387 387
 
388 388
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
389
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
389
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) {
390
+				return true;
391
+			}
390 392
 		} else {
391
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
393
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) {
394
+				return true;
395
+			}
392 396
 		}
393 397
 
394 398
 		return $this->Deployers()->byID($member->ID)
@@ -412,9 +416,13 @@  discard block
 block discarded – undo
412 416
 		// Must be logged in to check permissions
413 417
 
414 418
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
415
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
419
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
420
+				return true;
421
+			}
416 422
 		} else {
417
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
423
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
424
+				return true;
425
+			}
418 426
 		}
419 427
 
420 428
 		return $this->CanRestoreMembers()->byID($member->ID)
@@ -443,9 +451,13 @@  discard block
 block discarded – undo
443 451
 		}
444 452
 
445 453
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
446
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
454
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
455
+				return true;
456
+			}
447 457
 		} else {
448
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
458
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
459
+				return true;
460
+			}
449 461
 		}
450 462
 
451 463
 		return $this->CanBackupMembers()->byID($member->ID)
@@ -478,9 +490,13 @@  discard block
 block discarded – undo
478 490
 		// Must be logged in to check permissions
479 491
 
480 492
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
481
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
493
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
494
+				return true;
495
+			}
482 496
 		} else {
483
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
497
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
498
+				return true;
499
+			}
484 500
 		}
485 501
 
486 502
 		return $this->ArchiveUploaders()->byID($member->ID)
@@ -504,9 +520,13 @@  discard block
 block discarded – undo
504 520
 		// Must be logged in to check permissions
505 521
 
506 522
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
507
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
523
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
524
+				return true;
525
+			}
508 526
 		} else {
509
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
527
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
528
+				return true;
529
+			}
510 530
 		}
511 531
 
512 532
 		return $this->ArchiveDownloaders()->byID($member->ID)
@@ -573,9 +593,13 @@  discard block
 block discarded – undo
573 593
 		// Must be logged in to check permissions
574 594
 
575 595
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
576
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
596
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
597
+				return true;
598
+			}
577 599
 		} else {
578
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
600
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
601
+				return true;
602
+			}
579 603
 		}
580 604
 
581 605
 		return $this->ArchiveDeleters()->byID($member->ID)
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -307,10 +307,10 @@  discard block
 block discarded – undo
307 307
 		}
308 308
 		// Must be logged in to check permissions
309 309
 
310
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
311
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
310
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
311
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
312 312
 		} else {
313
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
313
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
314 314
 		}
315 315
 
316 316
 		return $this->Deployers()->byID($member->ID)
@@ -342,10 +342,10 @@  discard block
 block discarded – undo
342 342
 		}
343 343
 		// Must be logged in to check permissions
344 344
 
345
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
346
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
345
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
346
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
347 347
 		} else {
348
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
348
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
349 349
 		}
350 350
 
351 351
 		return $this->CanRestoreMembers()->byID($member->ID)
@@ -373,10 +373,10 @@  discard block
 block discarded – undo
373 373
 			return false;
374 374
 		}
375 375
 
376
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
377
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
376
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
377
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
378 378
 		} else {
379
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
379
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
380 380
 		}
381 381
 
382 382
 		return $this->CanBackupMembers()->byID($member->ID)
@@ -408,10 +408,10 @@  discard block
 block discarded – undo
408 408
 		}
409 409
 		// Must be logged in to check permissions
410 410
 
411
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
412
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
411
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
412
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
413 413
 		} else {
414
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
414
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
415 415
 		}
416 416
 
417 417
 		return $this->ArchiveUploaders()->byID($member->ID)
@@ -434,10 +434,10 @@  discard block
 block discarded – undo
434 434
 		}
435 435
 		// Must be logged in to check permissions
436 436
 
437
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
438
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
437
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
438
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
439 439
 		} else {
440
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
440
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
441 441
 		}
442 442
 
443 443
 		return $this->ArchiveDownloaders()->byID($member->ID)
@@ -460,10 +460,10 @@  discard block
 block discarded – undo
460 460
 		}
461 461
 		// Must be logged in to check permissions
462 462
 
463
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
464
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
463
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
464
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
465 465
 		} else {
466
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
466
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
467 467
 		}
468 468
 
469 469
 		return $this->ArchiveDeleters()->byID($member->ID)
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
 	 * @return string
654 654
 	 */
655 655
 	public function Link() {
656
-		return $this->Project()->Link() . "/environment/" . $this->Name;
656
+		return $this->Project()->Link()."/environment/".$this->Name;
657 657
 	}
658 658
 
659 659
 	/**
@@ -798,7 +798,7 @@  discard block
 block discarded – undo
798 798
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
799 799
 				->setTitle('Who can upload?')
800 800
 				->setDescription(
801
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
801
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
802 802
 					'Linking them to an environment allows limiting download permissions (see below).'
803 803
 				),
804 804
 
@@ -845,7 +845,7 @@  discard block
 block discarded – undo
845 845
 		// Add actions
846 846
 		$action = new FormAction('check', 'Check Connection');
847 847
 		$action->setUseButtonTag(true);
848
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
848
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
849 849
 		$action->setAttribute('data-url', $dataURL);
850 850
 		$fields->insertBefore($action, 'Name');
851 851
 
@@ -882,8 +882,8 @@  discard block
 block discarded – undo
882 882
 	 */
883 883
 	public function onBeforeWrite() {
884 884
 		parent::onBeforeWrite();
885
-		if($this->Name && $this->Name . '.rb' != $this->Filename) {
886
-			$this->Filename = $this->Name . '.rb';
885
+		if($this->Name && $this->Name.'.rb' != $this->Filename) {
886
+			$this->Filename = $this->Name.'.rb';
887 887
 		}
888 888
 		$this->checkEnvironmentPath();
889 889
 		$this->writeConfigFile();
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
 			&& $this->Filename
931 931
 			&& $this->CreateEnvConfig
932 932
 		) {
933
-			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
933
+			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
934 934
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
935 935
 		} else if($this->envFileExists() && $this->DeployConfig) {
936 936
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
@@ -985,7 +985,7 @@  discard block
 block discarded – undo
985 985
 		if(!$this->Filename) {
986 986
 			return '';
987 987
 		}
988
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
988
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
989 989
 	}
990 990
 
991 991
 	/**
Please login to merge, or discard this patch.
code/model/DNProject.php 2 patches
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -929,7 +929,9 @@  discard block
 block discarded – undo
929 929
 	 * @return SS_List
930 930
 	 */
931 931
 	public function whoIsAllowedAny($codes) {
932
-		if(!is_array($codes)) $codes = array($codes);
932
+		if(!is_array($codes)) {
933
+			$codes = array($codes);
934
+		}
933 935
 
934 936
 		$SQLa_codes = Convert::raw2sql($codes);
935 937
 		$SQL_codes = join("','", $SQLa_codes);
@@ -991,7 +993,9 @@  discard block
 block discarded – undo
991 993
 			$member = Member::currentUser();
992 994
 		}
993 995
 
994
-		if(Permission::checkMember($member, 'ADMIN')) return true;
996
+		if(Permission::checkMember($member, 'ADMIN')) {
997
+			return true;
998
+		}
995 999
 
996 1000
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
997 1001
 		return ($hits>0 ? true : false);
@@ -1018,7 +1022,9 @@  discard block
 block discarded – undo
1018 1022
 			});
1019 1023
 
1020 1024
 			// If anything returns false then we're not ready.
1021
-			if($isDone) return min($isDone);
1025
+			if($isDone) {
1026
+				return min($isDone);
1027
+			}
1022 1028
 		}
1023 1029
 
1024 1030
 		return true;
@@ -1099,8 +1105,12 @@  discard block
 block discarded – undo
1099 1105
 	 * @return bool
1100 1106
 	 */
1101 1107
 	public function canCreate($member = null) {
1102
-		if(!$member) $member = Member::currentUser();
1103
-		if(!$member) return false;
1108
+		if(!$member) {
1109
+			$member = Member::currentUser();
1110
+		}
1111
+		if(!$member) {
1112
+			return false;
1113
+		}
1104 1114
 
1105 1115
 		if(Permission::checkMember($member, 'ADMIN')) {
1106 1116
 			return true;
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 	 * @return bool
263 263
 	 */
264 264
 	public function canRestore($member = null) {
265
-		if ($this->allowedAny(
265
+		if($this->allowedAny(
266 266
 			array(
267 267
 				DNRoot::ALLOW_PROD_SNAPSHOT,
268 268
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 	 * @return bool
283 283
 	 */
284 284
 	public function canBackup($member = null) {
285
-		if ($this->allowedAny(
285
+		if($this->allowedAny(
286 286
 			array(
287 287
 				DNRoot::ALLOW_PROD_SNAPSHOT,
288 288
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 	 * @return bool
303 303
 	 */
304 304
 	public function canUploadArchive($member = null) {
305
-		if ($this->allowedAny(
305
+		if($this->allowedAny(
306 306
 			array(
307 307
 				DNRoot::ALLOW_PROD_SNAPSHOT,
308 308
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	 * @return bool
323 323
 	 */
324 324
 	public function canDownloadArchive($member = null) {
325
-		if ($this->allowedAny(
325
+		if($this->allowedAny(
326 326
 			array(
327 327
 				DNRoot::ALLOW_PROD_SNAPSHOT,
328 328
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			// Key-pair is available, use it.
392 392
 			$processEnv = array(
393 393
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
394
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
394
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
395 395
 			);
396 396
 		} else {
397 397
 			$processEnv = array();
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 	 */
747 747
 	public function getPublicKeyPath() {
748 748
 		if($privateKey = $this->getPrivateKeyPath()) {
749
-			return $privateKey . '.pub';
749
+			return $privateKey.'.pub';
750 750
 		}
751 751
 		return null;
752 752
 	}
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 		if(!empty($keyDir)) {
762 762
 			$filter = FileNameFilter::create();
763 763
 			$name = $filter->filter($this->Name);
764
-			return $keyDir . '/' . $name;
764
+			return $keyDir.'/'.$name;
765 765
 		}
766 766
 		return null;
767 767
 	}
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
 		$filter = FileNameFilter::create();
781 781
 		$name = $filter->filter($this->Name);
782 782
 
783
-		return $this->DNData()->getKeyDir() . '/' . $name;
783
+		return $this->DNData()->getKeyDir().'/'.$name;
784 784
 	}
785 785
 
786 786
 	/**
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 		/* Look for each whitelisted hostname */
870 870
 		foreach($interfaces as $host => $interface) {
871 871
 			/* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
872
-			if(preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
872
+			if(preg_match('{^[^.]*'.$host.'(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
873 873
 
874 874
 				$path = $match[2];
875 875
 
@@ -880,10 +880,10 @@  discard block
 block discarded – undo
880 880
 				$components = explode('.', $host);
881 881
 
882 882
 				foreach($regex as $pattern => $replacement) {
883
-					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
883
+					$path = preg_replace('/'.$pattern.'/', $replacement, $path);
884 884
 				}
885 885
 
886
-				$uxurl = Controller::join_links($scheme . '://', $host, $path);
886
+				$uxurl = Controller::join_links($scheme.'://', $host, $path);
887 887
 
888 888
 				if(array_key_exists('commit', $interface) && $interface['commit'] == false) {
889 889
 					$commiturl = false;
@@ -987,14 +987,14 @@  discard block
 block discarded – undo
987 987
 	 * @return bool
988 988
 	 */
989 989
 	public function allowedAny($codes, $member = null) {
990
-		if (!$member) {
990
+		if(!$member) {
991 991
 			$member = Member::currentUser();
992 992
 		}
993 993
 
994 994
 		if(Permission::checkMember($member, 'ADMIN')) return true;
995 995
 
996 996
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
997
-		return ($hits>0 ? true : false);
997
+		return ($hits > 0 ? true : false);
998 998
 	}
999 999
 
1000 1000
 	/**
Please login to merge, or discard this patch.
code/model/DNDataArchive.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			return false;
230 230
 		}
231 231
 
232
-		$key = $memberID . '-' . $this->EnvironmentID;
232
+		$key = $memberID.'-'.$this->EnvironmentID;
233 233
 		if(!isset(self::$_cache_can_restore[$key])) {
234 234
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
235 235
 		}
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 			return false;
251 251
 		}
252 252
 
253
-		$key = $memberID . '-' . $this->EnvironmentID;
253
+		$key = $memberID.'-'.$this->EnvironmentID;
254 254
 		if(!isset(self::$_cache_can_download[$key])) {
255 255
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
256 256
 		}
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 		}
438 438
 
439 439
 		// Extract database.sql.gz to <workingdir>/database.sql
440
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
440
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
441 441
 			$process = new Process('gunzip database.sql.gz', $workingDir);
442 442
 			$process->setTimeout(3600);
443 443
 			$process->run();
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 		}
449 449
 
450 450
 		// Extract assets.tar.gz to <workingdir>/assets/
451
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
451
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
452 452
 			$process = new Process('tar xzf assets.tar.gz', $workingDir);
453 453
 			$process->setTimeout(3600);
454 454
 			$process->run();
Please login to merge, or discard this patch.
code/model/GitonomyCache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 	public static $cache = array();
8 8
 
9 9
 	public static function getIncludingBranches($commit) {
10
-		$cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
10
+		$cacheKey = 'getIncludingBranches-'.$commit->getRepository()->getPath().'-'.$commit->gethash();
11 11
 		if(!isset(self::$cache[$cacheKey])) {
12 12
 			self::$cache[$cacheKey] = $commit->getIncludingBranches();
13 13
 		}
Please login to merge, or discard this patch.
code/model/DNBranch.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 
56 56
 	public function Link() {
57 57
 		// Use a get-var for branch so that it can handle unsafe chars better
58
-		return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
58
+		return Controller::join_links($this->project->Link(), 'branch?name='.urlencode($this->Name()));
59 59
 	}
60 60
 
61 61
 	/**
Please login to merge, or discard this patch.
code/model/jobs/DNPing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	 * @return string
38 38
 	 */
39 39
 	public function LogLink() {
40
-		return $this->Link() . '/log';
40
+		return $this->Link().'/log';
41 41
 	}
42 42
 
43 43
 	/**
Please login to merge, or discard this patch.