silverstripe / deploynaut

code/model/DNEnvironment.php

Spacing +24 added lines, -24 removed lines

@@ -311,10 +311,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
 		}
 
 		return $this->Deployers()->byID($member->ID)
@@ -346,10 +346,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->CanRestoreMembers()->byID($member->ID)
@@ -377,10 +377,10 @@ 
 			return false;
 		}
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->CanBackupMembers()->byID($member->ID)
@@ -412,10 +412,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveUploaders()->byID($member->ID)
@@ -438,10 +438,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveDownloaders()->byID($member->ID)
@@ -464,10 +464,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveDeleters()->byID($member->ID)
@@ -804,7 +804,7 @@ 
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
 				->setTitle('Who can upload?')
 				->setDescription(
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
 					'Linking them to an environment allows limiting download permissions (see below).'
 				),
 
@@ -851,7 +851,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
 		$action->setAttribute('data-url', $dataURL);
 		$fields->insertBefore($action, 'Name');
 
@@ -888,8 +888,8 @@ 
 	 */
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
-		if($this->Name && $this->Name . '.rb' != $this->Filename) {
-			$this->Filename = $this->Name . '.rb';
+		if($this->Name && $this->Name.'.rb' != $this->Filename) {
+			$this->Filename = $this->Name.'.rb';
 		}
 		$this->checkEnvironmentPath();
 		$this->writeConfigFile();
@@ -936,7 +936,7 @@ 
 			&& $this->Filename
 			&& $this->CreateEnvConfig
 		) {
-			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
+			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
 		} else if($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
@@ -991,7 +991,7 @@ 
 		if(!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**

code/control/Dispatcher.php

Braces +6 added lines, -2 removed lines

@@ -145,7 +145,9 @@ 
 	 */
 	protected function trimWhitespace($val) {
 		if(is_array($val)) {
-			foreach($val as $k => $v) $val[$k] = $this->trimWhitespace($v);
+			foreach($val as $k => $v) {
+				$val[$k] = $this->trimWhitespace($v);
+			}
 			return $val;
 		} else {
 			return trim($val);
@@ -160,7 +162,9 @@ 
 	 */
 	protected function stripNonPrintables($val) {
 		if(is_array($val)) {
-			foreach($val as $k => $v) $val[$k] = $this->stripNonPrintables($v);
+			foreach($val as $k => $v) {
+				$val[$k] = $this->stripNonPrintables($v);
+			}
 			return $val;
 		} else {
 			return preg_replace('/[[:cntrl:]]/', '', $val);