Merge branch 'new' of https://github.com/PEMapModder/web-server-source into new

Author: PEMapModder

README.md

@@ -1,8 +1,8 @@
 # web-server-source
-pemapmodder.zapto.org source (partial)
+Source code for http://pmt.mcpe.me (partial)
 
 ## Requirements
-* PHP 5.6 (yes, and the default PHP 5 installation on Ubuntu is PHP 5.5)
+* At least PHP 5.6 (default PHP 5 installation on apt is PHP 5.5, make sure to install PHP 5.6 instead), PHP 7.0+ _recommended_
 * PHP YAML extension
 * PHP cURL extension
 * probably other things that I forgot

phar-result.php

@@ -121,20 +121,15 @@
 	if($_POST["inspection_lint"] === "on"){
 		$inspections[] = new SyntaxErrorInspection($dir);
 	}
-	$jsonData = [
-		"phar" => "http://pmt.mcpe.me" . $url,
-		"expiry" => time() + 7200,
-		"inspections" => []
-	];
-	foreach($inspections as $inspection){
-		$result = $inspection->run();
-		if(!$jsonExpected){
-			$result->htmlEcho();
-		}else{
-			$jsonData["inspections"][$result->getName()] = $result->jsonResult();
-		}
-	}
 	if($jsonExpected){
+		$jsonData = [
+			"phar" => "http://pmt.mcpe.me" . $url,
+			"expiry" => time() + 7200,
+			"inspections" => []
+		];
+		foreach($inspections as $inspection){
+			$jsonData["inspections"][$result->getName()] = $inspection->run()->jsonResult();
+		}
 		echo json_encode($jsonData);
 		die;
 	}
@@ -148,6 +143,9 @@
 	echo "<hr>";
 	echo "<h2>Inspections</h2>";
 	echo "<ul>";
+	foreach($inspections as $inspection){
+		$inspection->run()->htmlEcho();
+	}
 	echo "</ul>";
 	echo "<p>End of inspections</p>";
 	?>