allow empty die(), rename unauthorized to forbidden

Author: simonLeary42

resources/lib/UnitySite.php

@@ -7,12 +7,20 @@
 
 class UnitySite
 {
-    public static function die($x)
+    public static function die($x = null)
     {
         if (@$GLOBALS["PHPUNIT_NO_DIE_PLEASE"] == true) {
-            throw new PhpUnitNoDieException(strval($x));
+            if (is_null($x)) {
+                throw new PhpUnitNoDieException();
+            } else {
+                throw new PhpUnitNoDieException($x);
+            }
         } else {
-            die($x);
+            if (is_null($x)) {
+                die();
+            } else {
+                die($x);
+            }
         }
     }
 
@@ -28,7 +36,7 @@ public static function headerResponseCode(int $code)
     {
         $responseCodeMessage = @http_response_code($code) ?? "";
         $msg = $_SERVER["SERVER_PROTOCOL"] . " " . strval($code) . " " . $responseCodeMessage;
-        header($msg, true, $ncode);
+        header($msg, true, $code);
     }
 
     public static function errorLog(string $title, string $message)
@@ -53,10 +61,10 @@ public static function badRequest($message)
         self::die();
     }
 
-    public static function unauthorized($message)
+    public static function forbidden($message)
     {
-        self::headerResponseCode(401);
-        self::errorLog("unauthorized", $message);
+        self::headerResponseCode(403);
+        self::errorLog("forbidden", $message);
         self::die();
     }
 

webroot/admin/ajax/get_group_members.php

@@ -6,7 +6,7 @@
 use UnityWebPortal\lib\UnitySite;
 
 if (!$USER->isAdmin()) {
-    UnitySite::unauthorized("not an admin");
+    UnitySite::forbidden("not an admin");
 }
 
 if (!isset($_GET["pi_uid"])) {

webroot/admin/ajax/get_page_contents.php

@@ -5,7 +5,7 @@
 use UnityWebPortal\lib\UnitySite;
 
 if (!$USER->isAdmin()) {
-    UnitySite::unauthorized("not an admin");
+    UnitySite::forbidden("not an admin");
 }
 
 if (!isset($_GET["pageid"])) {

webroot/admin/content.php

@@ -5,7 +5,7 @@
 use UnityWebPortal\lib\UnitySite;
 
 if (!$USER->isAdmin()) {
-    UnitySite::unauthorized("not an admin");
+    UnitySite::forbidden("not an admin");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/admin/notices.php

@@ -5,7 +5,7 @@
 use UnityWebPortal\lib\UnitySite;
 
 if (!$USER->isAdmin()) {
-    UnitySite::unauthorized("not an admin");
+    UnitySite::forbidden("not an admin");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/admin/pi-mgmt.php

@@ -7,7 +7,7 @@
 use UnityWebPortal\lib\UnitySite;
 
 if (!$USER->isAdmin()) {
-    UnitySite::unauthorized("not an admin");
+    UnitySite::forbidden("not an admin");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/admin/user-mgmt.php

@@ -5,7 +5,7 @@
 use UnityWebPortal\lib\UnitySite;
 
 if (!$USER->isAdmin()) {
-    UnitySite::unauthorized("not an admin");
+    UnitySite::forbidden("not an admin");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/panel/ajax/get_group_members.php

@@ -21,7 +21,7 @@
 }
 
 if ($found) {
-    UnitySite::unauthorized("not a group member");
+    UnitySite::forbidden("not a group member");
 }
 
 $count = count($members);

webroot/panel/pi.php

@@ -8,7 +8,7 @@
 $group = $USER->getPIGroup();
 
 if (!$USER->isPI()) {
-    UnitySite::unauthorized("not a PI");
+    UnitySite::forbidden("not a PI");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {