Merge pull request #4 from jamesread/bugfix-error-message-rendering

bugfix: Error message rendering
jamesread · Jan 11, 2025 · 23e27c9 · 23e27c9
2 parents 4d766c1 + a9c98b9
commit 23e27c9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/includes/functionality.php b/src/includes/functionality.php
@@ -114,20 +114,18 @@ function getCountApprovals()
 function requireAdmin()
 {
     if (!isAdmin()) {
-        echo '<section class = "severe">';
-        echo '<h2>Permission denied</h2>';
-        echo '<p>You are no admin that I know of. Go away.</p>';
-        echo '</section>';
-        include_once 'includes/widgets/footer.php';
+        simpleFatalError('You are not an admin.');
 
         exit;
     }
 }
 
 function simpleFatalError($message)
 {
+    require_once 'includes/widgets/header.php';
+
     echo '<section class = "severe">';
-    echo '<h2>Permission Denied</h2>';
+    echo '<h2>Error</h2>';
     echo '<p>' . $message . '</p>';
     echo '</section>';
 

diff --git a/src/user-edit.php b/src/user-edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'includes/widgets/header.php';
+require_once 'includes/common.php';
 
 requireAdmin();
 
@@ -12,4 +12,6 @@
     redirect('users.php');
 }
 
+require_once 'includes/widgets/header.php';
+
 $tpl->displayForm($f);
diff --git a/src/usergroup-create.php b/src/usergroup-create.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'includes/widgets/header.php';
+require_once 'includes/common.php';
 
 requireAdmin();
 
@@ -12,4 +12,6 @@
     redirect('users.php');
 }
 
+require_once 'includes/widgets/header.php';
+
 $tpl->displayForm($f);
diff --git a/src/usergroup-grant.php b/src/usergroup-grant.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'includes/widgets/header.php';
+require_once 'includes/common.php';
 
 requireAdmin();
 
@@ -12,4 +12,6 @@
     redirect('users.php');
 }
 
+require_once 'includes/widgets/header.php';
+
 $tpl->displayForm($f);