Refactor redirects

src/classes/page.php

@@ -129,16 +129,14 @@ class Page
             && isset($_GET['page'])
             && !in_array($_GET['page'], $disableRedirect)
         ) {
-            header('Location: /?page=login');
+            redirect('/?page=login');
-            die();
         }
 
         /**
          * Power
          */
         if (isset($user->power) && $user->power < $this->power) {
-            header('Location: /?page=power&required=' . $this->power);
+            redirect('/?page=power&required=' . $this->power);
-            die();
         }
 
         /**
@@ -150,9 +148,8 @@ class Page
             $url         = new URL($_SERVER['QUERY_STRING']);
             $redirect_to = $url->getPretty();
 
-            if ($redirect_to && $redirect_to !== $_SERVER['REQUEST_URI']) {
+            if ($redirect_to) {
-                header('Location: ' . $redirect_to);
+                redirect($redirect_to);
-                die();
             }
         }
 

src/functions/redirect.php

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Redirect to URL
+ *
+ * @author Jay Trees <github.jay@grandel.anonaddy.me>
+ */
+
+function redirect(string $target)
+{
+    if ($target !== $_SERVER['REQUEST_URI']) {
+        header('Location: ' . $target);
+        die();
+    }
+}

src/pages/install.php

@@ -9,8 +9,7 @@
 use wishthis\{Page, Database};
 
 if ($options && $options->getOption('isInstalled')) {
-    header('Location: /?page=home');
+    redirect('/?page=home');
-    die();
 }
 
 $page = new Page(__FILE__, __('Install'));

src/pages/login.php

@@ -40,8 +40,7 @@ if (isset($_POST['login'], $_POST['email'], $_POST['password'])) {
 }
 
 if (isset($_SESSION['user'])) {
-    header('Location: /?page=home');
+    redirect('/?page=home');
-    die();
 }
 
 /**

src/pages/logout.php

@@ -13,8 +13,7 @@ $page = new Page(__FILE__, __('Logout'));
 if (PHP_SESSION_ACTIVE === session_status()) {
     session_destroy();
 
-    header('Location: /?page=home');
+    redirect('/?page=home');
-    die();
 }
 
 $page->header();

src/pages/profile.php

@@ -47,8 +47,7 @@ if (isset($_POST['user-id'])) {
         session_destroy();
     }
 
-    header('Location: /?page=profile');
+    redirect('/?page=profile');
-    die();
 }
 
 $page = new Page(__FILE__, __('Profile'));

src/pages/update.php

@@ -46,8 +46,7 @@ if ('POST' === $_SERVER['REQUEST_METHOD']) {
     $options->setOption('version', VERSION);
     $options->setOption('updateAvailable', false);
 
-    header('Location: /?page=home');
+    redirect('/?page=home');
-    die();
 }
 
 $page = new Page(__FILE__, __('Update'), 100);