Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls

Replace hard coded HTTP status codes with proper calls to http_response_code

4 files changed, 6 insertions, 7 deletions

diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index c013733dbb3..588c76154a5 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -38,7 +38,7 @@ $dir = \OC\Files\Filesystem::normalizePath($dir);
 try {
 	$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
 	if (!$dirInfo || !$dirInfo->getType() === 'dir') {
-		header("HTTP/1.0 404 Not Found");
+		http_response_code(404);
 		exit();
 	}
 
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 0ca7e8f245e..e1e4aa877b2 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -30,14 +30,13 @@ $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare
 if($token !== '') {
 	$protocol = \OC::$server->getRequest()->getHttpProtocol();
 	if ($protocol == 'HTTP/1.0') {
-		$status = '302 Found';
+		http_response_code(302);
 	} else {
-		$status = '307 Temporary Redirect';
+		http_response_code(307);
 	}
-	header($protocol.' ' . $status);
 	header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
-	header('HTTP/1.0 404 Not Found');
+	http_response_code(404);
 	$tmpl = new OCP\Template('', '404', 'guest');
 	print_unescaped($tmpl->fetchPage());
 }
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index c31a33c2050..e72c063f428 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -34,7 +34,7 @@ $data = array();
 try {
 	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
 } catch (Exception $e) {
-	header("HTTP/1.0 404 Not Found");
+	http_response_code(404);
 	exit();
 }
 
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
index 77f3e9f0887..65ba245d71d 100644
--- a/apps/files_versions/download.php
+++ b/apps/files_versions/download.php
@@ -34,7 +34,7 @@ $revision=(int)$_GET['revision'];
 try {
 	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
 } catch(\OCP\Files\NotFoundException $e) {
-	header("HTTP/1.1 404 Not Found");
+	http_response_code(404);
 	$tmpl = new OCP\Template('', '404', 'guest');
 	$tmpl->assign('file', '');
 	$tmpl->printPage();