replace die with exception

simonLeary42 · simonLeary42 · commit fa5d021aac37 · 2025-04-25T18:20:05.000-04:00
diff --git a/webroot/admin/ajax/get_group_members.php b/webroot/admin/ajax/get_group_members.php
@@ -5,11 +5,11 @@
 use UnityWebPortal\lib\UnityGroup;
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if (!isset($_GET["pi_uid"])) {
-    die("PI UID not set");
+    throw new Exception("PI UID not set");
 }
 
 $group = new UnityGroup($_GET["pi_uid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
diff --git a/webroot/admin/ajax/get_page_contents.php b/webroot/admin/ajax/get_page_contents.php
@@ -3,11 +3,11 @@
 require_once __DIR__ . "/../../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if (!isset($_GET["pageid"])) {
-    die("Pageid not found");
+    throw new Exception("Pageid not defined");
 }
 
 $page = $SQL->getPage($_GET["pageid"]);
diff --git a/webroot/admin/content.php b/webroot/admin/content.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . "/../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
diff --git a/webroot/admin/notices.php b/webroot/admin/notices.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . "/../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
@@ -6,7 +6,7 @@
 use UnityWebPortal\lib\UnityGroup;
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
@@ -5,7 +5,7 @@
 use UnityWebPortal\lib\UnitySite;
 
 if (!$USER->isAdmin()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
diff --git a/webroot/api/content/index.php b/webroot/api/content/index.php
@@ -11,7 +11,7 @@
 }
 
 if (!isset($_GET["content_name"])) {
-    die();
+    throw new Exception("content_name not set");
 }
 
 echo $SQL->getPage($_GET["content_name"])["content"];
diff --git a/webroot/panel/ajax/get_group_members.php b/webroot/panel/ajax/get_group_members.php
@@ -5,7 +5,7 @@
 use UnityWebPortal\lib\UnityGroup;
 
 if (!isset($_GET["pi_uid"])) {
-    die("PI UID not set");
+    throw new Exception("PI UID not set");
 }
 
 $group = new UnityGroup($_GET["pi_uid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
@@ -8,7 +8,7 @@
 $group = $USER->getPIGroup();
 
 if (!$USER->isPI()) {
-    die();
+    throw new Exception("access denied");
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@`
`5`	`5`	`use UnityWebPortal\lib\UnityGroup;`
`6`	`6`
`7`	`7`	`if (!$USER->isAdmin()) {`
`8`		`- die();`
	`8`	`+ throw new Exception("access denied");`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`if (!isset($_GET["pi_uid"])) {`
`12`		`- die("PI UID not set");`
	`12`	`+ throw new Exception("PI UID not set");`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`$group = new UnityGroup($_GET["pi_uid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@`
`3`	`3`	`require_once __DIR__ . "/../../../resources/autoload.php";`
`4`	`4`
`5`	`5`	`if (!$USER->isAdmin()) {`
`6`		`- die();`
	`6`	`+ throw new Exception("access denied");`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`if (!isset($_GET["pageid"])) {`
`10`		`- die("Pageid not found");`
	`10`	`+ throw new Exception("Pageid not defined");`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`$page = $SQL->getPage($_GET["pageid"]);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`require_once __DIR__ . "/../../resources/autoload.php";`
`4`	`4`
`5`	`5`	`if (!$USER->isAdmin()) {`
`6`		`- die();`
	`6`	`+ throw new Exception("access denied");`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`if ($_SERVER["REQUEST_METHOD"] == "POST") {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use UnityWebPortal\lib\UnityGroup;`
`7`	`7`
`8`	`8`	`if (!$USER->isAdmin()) {`
`9`		`- die();`
	`9`	`+ throw new Exception("access denied");`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`if ($_SERVER["REQUEST_METHOD"] == "POST") {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use UnityWebPortal\lib\UnitySite;`
`6`	`6`
`7`	`7`	`if (!$USER->isAdmin()) {`
`8`		`- die();`
	`8`	`+ throw new Exception("access denied");`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`if ($_SERVER["REQUEST_METHOD"] == "POST") {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`if (!isset($_GET["content_name"])) {`
`14`		`- die();`
	`14`	`+ throw new Exception("content_name not set");`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`echo $SQL->getPage($_GET["content_name"])["content"];`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`$group = $USER->getPIGroup();`
`9`	`9`
`10`	`10`	`if (!$USER->isPI()) {`
`11`		`- die();`
	`11`	`+ throw new Exception("access denied");`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`if ($_SERVER["REQUEST_METHOD"] == "POST") {`