silverstripe / silverstripe-environmentcheck

code/EnvironmentCheckSuite.php

Braces +12 added lines, -4 removed lines

@@ -75,7 +75,9 @@ 
 
 			// Existing named checks can be disabled by setting their 'state' to 'disabled'.
 			// This is handy for disabling checks mandated by modules.
-			if (!empty($check['state']) && $check['state']==='disabled') continue;
+			if (!empty($check['state']) && $check['state']==='disabled') {
+				continue;
+			}
 			
 			// Add the check to this suite.
 			$this->push($check['definition'], $check['title']);
@@ -158,7 +160,9 @@ 
 	 * @return EnvironmentCheckSuite
 	 */
 	static function inst($name) {
-		if(!isset(self::$instances[$name])) self::$instances[$name] = new EnvironmentCheckSuite($name);
+		if(!isset(self::$instances[$name])) {
+			self::$instances[$name] = new EnvironmentCheckSuite($name);
+		}
 		return self::$instances[$name];
 	}
 
@@ -170,8 +174,12 @@ 
 	 * @param string|array
 	 */
 	static function register($names, $check, $title = null) {
-		if(!is_array($names)) $names = array($names);
-		foreach($names as $name) self::inst($name)->push($check, $title);
+		if(!is_array($names)) {
+			$names = array($names);
+		}
+		foreach($names as $name) {
+			self::inst($name)->push($check, $title);
+		}
 	}
 
 	/**

code/EnvironmentChecker.php

Braces +8 added lines, -3 removed lines

@@ -104,7 +104,9 @@ 
 				throw $e;
 			}
 		} else {
-			if(!$this->canAccess(null, $permission)) return $this->httpError(403);
+			if(!$this->canAccess(null, $permission)) {
+				return $this->httpError(403);
+			}
 		}
 	}
 
@@ -141,8 +143,11 @@ 
 		$canExtended = null;
 		$results = $this->extend('canAccess', $member);
 		if($results && is_array($results)) {
-			if(!min($results)) return false;
-			else return true;
+			if(!min($results)) {
+				return false;
+			} else {
+				return true;
+			}
 		}
 
 		return false;

code/checks/ExternalURLCheck.php

Braces +9 added lines, -3 removed lines

@@ -24,7 +24,9 @@ 
 	 * @param int $timeout
 	 */
 	function __construct($urls, $timeout = 15) {
-		if($urls) $this->urls = explode(' ', $urls);
+		if($urls) {
+			$this->urls = explode(' ', $urls);
+		}
 		$this->timeout = $timeout;
 	}
 
@@ -44,7 +46,9 @@ 
 		}	
 		// Parallel execution for faster performance
 		$mh = curl_multi_init();
-		foreach($chs as $ch) curl_multi_add_handle($mh,$ch);
+		foreach($chs as $ch) {
+			curl_multi_add_handle($mh,$ch);
+		}
 		
 		$active = null;
 		// Execute the handles
@@ -84,7 +88,9 @@ 
 		}
 
 		// Close the handles
-		foreach($chs as $ch) curl_multi_remove_handle($mh, $ch);
+		foreach($chs as $ch) {
+			curl_multi_remove_handle($mh, $ch);
+		}
 		curl_multi_close($mh);
 		
 		if($hasError) {

code/checks/FileAccessibilityAndValidationCheck.php

Braces +9 added lines, -8 removed lines

@@ -81,7 +81,7 @@ 
 				foreach($files as $file){
 					if($this->$fileTypeValidateFunc($file)){
 						$validFiles[] = $file;
-					}else{
+					} else{
 						$invalidFiles[] = $file;
 					}
 				}
@@ -97,15 +97,16 @@ 
 							EnvironmentCheck::OK,
 							sprintf('At least these file(s) accessible: %s', $validFileList)
 						);
-					}else{
+					} else{
 						$checkReturn = array(
 							EnvironmentCheck::OK,
 							sprintf('At least these file(s) passed file type validate function "%s": %s', $fileTypeValidateFunc, $validFileList)
 						);
 					}
 				} else {
-					if (count($invalidFiles) == 0) $checkReturn = array(EnvironmentCheck::OK, 'All files valideted');
-					else {
+					if (count($invalidFiles) == 0) {
+						$checkReturn = array(EnvironmentCheck::OK, 'All files valideted');
+					} else {
 						$invalidFileList = "\n";
 						foreach($invalidFiles as $vf){
 							$invalidFileList .= $vf."\n";
@@ -116,7 +117,7 @@ 
 								EnvironmentCheck::ERROR,
 								sprintf('File(s) not accessible: %s', $invalidFileList)
 							);
-						}else{
+						} else{
 							$checkReturn = array(
 								EnvironmentCheck::ERROR,
 								sprintf('File(s) not passing the file type validate function "%s": %s', $fileTypeValidateFunc, $invalidFileList)
@@ -125,14 +126,14 @@ 
 	
 					}
 				}
-			}else{
+			} else{
 				$checkReturn =  array(
 					EnvironmentCheck::ERROR,
 					sprintf("Invalid file type validation method name passed: %s ", $fileTypeValidateFunc)
 				);
 			}
 
-		}else{
+		} else{
 			$checkReturn = array(
 				EnvironmentCheck::ERROR,
 				sprintf("No files accessible at path %s", $this->path)
@@ -153,7 +154,7 @@ 
 		$json = json_decode(file_get_contents($file));
 		if(!$json) {
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}

code/checks/FileAgeCheck.php

Braces +8 added lines, -3 removed lines

@@ -92,8 +92,10 @@ 
 		$validFiles = array();
 		$checkFn = $this->checkFn;
 		$allValid = true;
-		if($files) foreach($files as $file) {
+		if($files) {
+			foreach($files as $file) {
 			$fileTime = $checkFn($file);
+		}
 			$valid = ($this->compareOperand == '>') ? ($fileTime >= $cutoffTime) : ($fileTime <= $cutoffTime);
 			if($valid) {
 				$validFiles[] = $file;
@@ -115,11 +117,14 @@ 
 		if($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
 			return array(EnvironmentCheck::OK, '');
 		} else {
-	       if (count($invalidFiles) == 0) return array(EnvironmentCheck::OK, '');
-	       else return array(
+	       if (count($invalidFiles) == 0) {
+	       	return array(EnvironmentCheck::OK, '');
+	       } else {
+	       	return array(
 				EnvironmentCheck::ERROR,
 				sprintf('No files matched criteria (%s %s)', $this->compareOperand, date('c', $cutoffTime))
 			);
+	       }
 		}
 			
 	}

code/checks/FileWriteableCheck.php

Braces +13 added lines, -5 removed lines

@@ -22,11 +22,17 @@ 
 	 * @return array
 	 */
 	function check() {
-		if($this->path[0] == '/') $filename = $this->path;
-		else $filename = BASE_PATH . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $this->path);
+		if($this->path[0] == '/') {
+			$filename = $this->path;
+		} else {
+			$filename = BASE_PATH . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $this->path);
+		}
 		
-		if(file_exists($filename)) $isWriteable = is_writeable($filename);
-		else $isWriteable = is_writeable(dirname($filename));
+		if(file_exists($filename)) {
+			$isWriteable = is_writeable($filename);
+		} else {
+			$isWriteable = is_writeable(dirname($filename));
+		}
 		
 		if(!$isWriteable) {
 			if(function_exists('posix_getgroups')) {
@@ -46,7 +52,9 @@ 
 					$groupList = array();
 					foreach($groups as $group) {
 						$groupInfo = posix_getgrgid($group);
-						if(in_array($currentOwner['name'], $groupInfo['members'])) $groupList[] = $groupInfo['name'];
+						if(in_array($currentOwner['name'], $groupInfo['members'])) {
+							$groupList[] = $groupInfo['name'];
+						}
 					}
 					if($groupList) {
 						$message .= "	We recommend that you make the file group-writeable and change the group to one of these groups:\n - ". implode("\n - ", $groupList)

code/checks/HasClassCheck.php

Braces +5 added lines, -2 removed lines

@@ -22,7 +22,10 @@
 	 * @return array
 	 */
 	function check() {
-		if(class_exists($this->className)) return array(EnvironmentCheck::OK, 'Class ' . $this->className.' exists');
-		else return array(EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist');
+		if(class_exists($this->className)) {
+			return array(EnvironmentCheck::OK, 'Class ' . $this->className.' exists');
+		} else {
+			return array(EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist');
+		}
 	}
 }

code/checks/HasFunctionCheck.php

Braces +5 added lines, -2 removed lines

@@ -22,7 +22,10 @@
 	 * @return array
 	 */
 	function check() {
-		if(function_exists($this->functionName)) return array(EnvironmentCheck::OK, $this->functionName.'() exists');
-		else return array(EnvironmentCheck::ERROR, $this->functionName.'() doesn\'t exist');
+		if(function_exists($this->functionName)) {
+			return array(EnvironmentCheck::OK, $this->functionName.'() exists');
+		} else {
+			return array(EnvironmentCheck::ERROR, $this->functionName.'() doesn\'t exist');
+		}
 	}
 }

code/checks/SMTPConnectCheck.php

Braces +6 added lines, -2 removed lines

@@ -30,10 +30,14 @@
 	 */
 	function __construct($host = null, $port = null, $timeout = 15) {
 		$this->host = ($host) ? $host : ini_get('SMTP');
-		if(!$this->host) $this->host = 'localhost';
+		if(!$this->host) {
+			$this->host = 'localhost';
+		}
 		
 		$this->port = ($port) ? $port : ini_get('smtp_port');
-		if(!$this->port) $this->port = 25;
+		if(!$this->port) {
+			$this->port = 25;
+		}
 
 		$this->timeout = $timeout;
 	}