EGroupware / egroupware

install-cli.php

Braces +60 added lines, -15 removed lines

@@ -43,10 +43,13 @@ 
 
 chdir(__DIR__);	// to enable relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>install-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 
 // parse arguments
@@ -91,7 +94,10 @@ 
 	}
 }
 
-if (!$run_git && count($argv) > 1) usage("Too many arguments!");
+if (!$run_git && count($argv) > 1)
+{
+	usage("Too many arguments!");
+}
 
 function usage($err=null)
 {
@@ -154,9 +160,15 @@ 
 	}
 }
 
-if ($verbose) echo "Using following binaries: ".json_encode ($bins, JSON_UNESCAPED_SLASHES)."\n";
+if ($verbose)
+{
+	echo "Using following binaries: ".json_encode ($bins, JSON_UNESCAPED_SLASHES)."\n";
+}
 
-if (!extension_loaded('curl')) die("Required PHP extesion 'curl' missing! You need to install php-curl package.\n\n");
+if (!extension_loaded('curl'))
+{
+	die("Required PHP extesion 'curl' missing! You need to install php-curl package.\n\n");
+}
 
 // check if we are on a git clone
 $output = array();
@@ -198,7 +210,10 @@ 
 {
 	$channel = isset($matches[1]) ? 'release' : 'bugfix';
 }
-if ($verbose) echo "Currently using branch: $branch --> $channel channel\n";
+if ($verbose)
+{
+	echo "Currently using branch: $branch --> $channel channel\n";
+}
 
 if ($argv)
 {
@@ -263,17 +278,26 @@ 
 
 // update composer managed dependencies
 $cmd = $composer.' install '.implode(' ', $composer_args);
-if ($verbose) echo "$cmd\n";
+if ($verbose)
+{
+	echo "$cmd\n";
+}
 system($cmd);
 
 // update npm dependencies and run grunt to minify javascript and css
 if ($npm && $grunt)
 {
 	$cmd = $npm.' install';
-	if ($verbose) echo "$cmd\n";
+	if ($verbose)
+	{
+		echo "$cmd\n";
+	}
 	system($cmd);
 
-	if ($verbose) echo "$grunt\n";
+	if ($verbose)
+	{
+		echo "$grunt\n";
+	}
 	system($grunt);
 }
 
@@ -303,7 +327,10 @@ 
 			error_log("\n>>> ".$cmd."\n");
 			system($cmd, $ret);
 			// break if command is not successful
-			if ($ret) return $ret;
+			if ($ret)
+			{
+				return $ret;
+			}
 		}
 	}
 	return $ret;
@@ -355,25 +382,40 @@ 
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
-			if (is_array($data)) $data = json_encode($data, JSON_FORCE_OBJECT);
+			if (is_array($data))
+			{
+				$data = json_encode($data, JSON_FORCE_OBJECT);
+			}
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
 	}
 	curl_setopt($c, CURLOPT_URL, $url);
 
-	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if (is_string($data))
+	{
+		$short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
+	}
+	if ($verbose)
+	{
+		echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	}
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -384,7 +426,10 @@ 
 		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
 	}
 
-	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	if ($verbose)
+	{
+		echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	}
 
 	curl_close($c);