Use http_response_code() instead of header(), add a few missing repsonse codes

5 files changed, 19 insertions, 12 deletions

diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php
index 6b0df8e4..06eb9b4f 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -456,8 +456,10 @@ class Page_Dnbd3 extends Page
 			LEFT JOIN machine m USING (machineuuid)
 			WHERE s.serverid = :serverId', compact('serverId'));
 		if ($server === false) {
-			if (AJAX)
+			if (AJAX) {
+				http_response_code(404);
 				die('Invalid server id: ' . $serverId);
+			}
 			Message::addError('server-non-existent', $serverId);
 			Util::redirect('?do=dnbd3');
 		}
@@ -610,16 +612,20 @@ class Page_Dnbd3 extends Page
 		$server = $this->getServerFromQuery();
 		$imgId = Request::any('id', 0, 'int');
 		if ($imgId <= 0) {
-			Header('HTTP/1.1 400 Bad Request');
+			http_response_code(400);
 			die('Invalid/no image id');
 		}
-		$data = Dnbd3Rpc::getCacheMap($server['ip'], $imgId);
+		$data = Dnbd3Rpc::getCacheMap($server['ip'], $imgId, $code);
 		if ($data === Dnbd3Rpc::ERROR_UNREACHABLE) {
-			Header('HTTP/1.1 504 Gateway Timeout');
+			http_response_code(504);
 			die('Proxy not reachable');
 		}
 		if ($data === Dnbd3Rpc::ERROR_NOT_200) {
-			Header('HTTP/1.1 503 Service Unavailable');
+			if ($code >= 200 && $code < 500) {
+				http_response_code($code);
+				die("Proxy replied with $code");
+			}
+			http_response_code(503);
 			die("Proxy didn't reply with 200 OK");
 		}
 		Header('Content-Type: application/octet-stream');
diff --git a/modules-available/dozmod/api.inc.php b/modules-available/dozmod/api.inc.php
index 34b5136d..5a8f6302 100644
--- a/modules-available/dozmod/api.inc.php
+++ b/modules-available/dozmod/api.inc.php
@@ -284,7 +284,7 @@ function outputResource(string $lecture_uuid, string $resource): void
 #[NoReturn]
 function fatalDozmodUnreachable()
 {
-	Header('HTTP/1.1 504 Gateway Timeout');
+	http_response_code(504);
 	die('DMSD currently not available');
 }
 
@@ -292,7 +292,7 @@ function readLectureParam(array $locationIds): string
 {
 	$lecture = Request::get('lecture', false, 'string');
 	if ($lecture === false) {
-		Header('HTTP/1.1 400 Bad Request');
+		http_response_code(400);
 		die('Missing lecture UUID');
 	}
 	$lectures = getLectureUuidsForLocations($locationIds);
@@ -301,7 +301,7 @@ function readLectureParam(array $locationIds): string
 	}
 	/* check that the user requests a lecture that he is allowed to have */
 	if (!in_array($lecture, $lectures)) {
-		Header('HTTP/1.1 403 Forbidden');
+		http_response_code(403);
 		die("You don't have permission to access this lecture");
 	}
 	return $lecture;
@@ -316,7 +316,7 @@ function readImageParam(): string
 	$image = Request::get('lecture', false, 'string');
 		
 	if ($image === false) {
-		Header('HTTP/1.1 400 Bad Request');
+		http_response_code(400);
 		die('Missing IMAGE UUID');
 	}
 	return $image;
@@ -331,7 +331,7 @@ if ($resource === false) {
 }
 
 if (!in_array($resource, $availableRessources)) {
-	Header('HTTP/1.1 400 Bad Request');
+	http_response_code(400);
 	die("unknown resource: $resource");
 }
 
diff --git a/modules-available/permissionmanager/page.inc.php b/modules-available/permissionmanager/page.inc.php
index 7e9f17e4..a637148d 100644
--- a/modules-available/permissionmanager/page.inc.php
+++ b/modules-available/permissionmanager/page.inc.php
@@ -59,6 +59,7 @@ class Page_PermissionManager extends Page
 
 		// "Public" page -- nice "permission denied" message
 		if ($show === 'denied') {
+			http_response_code(403);
 			Render::addTemplate('page-permission-denied', [
 				'name' => User::getName(),
 				'permission' => Request::get('permission', false, 'string'),
diff --git a/modules-available/roomplanner/api.inc.php b/modules-available/roomplanner/api.inc.php
index 1af25ca8..c66640a0 100644
--- a/modules-available/roomplanner/api.inc.php
+++ b/modules-available/roomplanner/api.inc.php
@@ -9,7 +9,7 @@ if (Request::any('show') === 'svg') {
 		Request::any('url', false, 'bool'));
 	if ($ret === false) {
 		if (Request::any('fallback', 0, 'int') === 0) {
-			Header('HTTP/1.1 404 Not Found');
+			http_response_code(404);
 			exit;
 		}
 		$ret = <<<EOF
diff --git a/modules-available/sysconfig/api.inc.php b/modules-available/sysconfig/api.inc.php
index e7be3029..90383240 100644
--- a/modules-available/sysconfig/api.inc.php
+++ b/modules-available/sysconfig/api.inc.php
@@ -20,7 +20,7 @@ if ($uuid !== null && strlen($uuid) !== 36) {
 function deliverEmpty($message)
 {
 	EventLog::failure($message);
-	Header('HTTP/1.1 404 Not found');
+	http_response_code(404);
 	die('Config file could not be found or read!');
 }