From 52c15ae1c6d1855dd0269c374436b9749c69f95d Mon Sep 17 00:00:00 2001
From: William <willy@willy.club>
Date: Sat, 9 Oct 2021 22:01:18 +0200
Subject: [PATCH] Move some stuff around. Idk

---
 app/common.php                                      | 2 ++
 template/templateParameters.php => app/template.php | 4 +---
 example.php                                         | 9 +++++----
 index.php                                           | 6 ++++--
 login.php                                           | 6 +++---
 template/_footer.php                                | 2 +-
 template/_header.php                                | 2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 app/common.php
 rename template/templateParameters.php => app/template.php (95%)

diff --git a/app/common.php b/app/common.php
new file mode 100644
index 0000000..ee5d644
--- /dev/null
+++ b/app/common.php
@@ -0,0 +1,2 @@
+<?php
+if(!isset($_SESSION)) session_start();
diff --git a/template/templateParameters.php b/app/template.php
similarity index 95%
rename from template/templateParameters.php
rename to app/template.php
index 581cf4c..3f5455f 100644
--- a/template/templateParameters.php
+++ b/app/template.php
@@ -1,6 +1,4 @@
 <?php
-if(!isset($_SESSION)) session_start();
-
 // Default parameter values if none is defined
 $defaultTemplateParameters = [
     "title" => "Document", // Set page title
@@ -19,4 +17,4 @@ if (empty($templateUrlPrefix)) {
     if ((strlen($templateUrlPrefix) > 1)) {
         $templateUrlPrefix = htmlspecialchars($templateUrlPrefix . DIRECTORY_SEPARATOR);
     }
-}
\ No newline at end of file
+}
diff --git a/example.php b/example.php
index 6d199ad..6c6c2cd 100644
--- a/example.php
+++ b/example.php
@@ -1,18 +1,19 @@
 <?php
 // This file should serve as an example showing current implemented features
+require_once("app/common.php");
 
 // Parameters that will be used in the template files
-// For more options and explanations, check the 'templateParameters.php' file from the 'template' folder
+// For more options and explanations, check the 'app/template.php' file
 $templateParameters["title"] = "Eksempel side";
 
 // Include the top of page
-include_once("template/_header.php");
+require_once("template/_header.php");
 ?>
 
-    <h1>Eksempel side.</h1>
+    <h1>Eksempel side</h1>
     <p>Dette er en eksempel side</p>
 
 <?php
 // Include the rest of the page
-include_once("template/_footer.php");
+require_once("template/_footer.php");
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 0414c3b..57202ad 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,9 @@
 <?php
+require_once("app/common.php");
+
 $templateParameters["title"] = "Forside";
 
-include_once("template/_header.php");
+require_once("template/_header.php");
 ?>
 
     <h1>Om stafett for livet</h1>
@@ -10,5 +12,5 @@ include_once("template/_header.php");
     <a href="img/stafett.jpg"><img src="img/stafett-cropped.jpg"></a>
 
 <?php
-include_once("template/_footer.php");
+require_once("template/_footer.php");
 ?>
\ No newline at end of file
diff --git a/login.php b/login.php
index 52e6a44..a156442 100644
--- a/login.php
+++ b/login.php
@@ -1,5 +1,5 @@
 <?php
-session_start();
+require_once("app/common.php");
 
 // Login logic
 if ((isset($_POST['username'])) && (isset($_POST['password']))) {
@@ -16,7 +16,7 @@ if ((isset($_POST['username'])) && (isset($_POST['password']))) {
 
 $templateParameters["title"] = "Logg inn";
 
-include_once("template/_header.php");
+require_once("template/_header.php");
 ?>
 <h1>Logg inn</h1>
 <?= 
@@ -39,5 +39,5 @@ include_once("template/_header.php");
 </form>
 
 <?php
-include_once("template/_footer.php");
+require_once("template/_footer.php");
 ?>
\ No newline at end of file
diff --git a/template/_footer.php b/template/_footer.php
index f9799b2..a51eaa6 100644
--- a/template/_footer.php
+++ b/template/_footer.php
@@ -1,5 +1,5 @@
 <?php
-include_once("templateParameters.php");
+require_once(__DIR__ . "/../app/template.php");
 
 if ($templateParameters["render"] === FALSE) {
     return;
diff --git a/template/_header.php b/template/_header.php
index c103023..c5785c2 100644
--- a/template/_header.php
+++ b/template/_header.php
@@ -1,5 +1,5 @@
 <?php
-include_once("templateParameters.php");
+require_once(__DIR__ . "/../app/template.php");
 
 if ($templateParameters["render"] === FALSE) {
     return;