fixed logo size

README.md

@@ -1,4 +1,4 @@
-![Novaconium PHP](/_assets/header.svg)
+![Novaconium PHP](/_assets/novaconium-logo.png)
 
 # Novaconium PHP:  A PHP Framework Built from the Past
 
@@ -35,4 +35,4 @@ rm composer-setup.php
 
 ## Documentation
 
-* [Docker Setup](https://git.4lt.ca/4lt/novaconium)
+* [Docker Setup](https://git.4lt.ca/4lt/novaconium)

_assets/header.svg

@@ -1,39 +0,0 @@
-<svg width="100%" height="200" xmlns="http://www.w3.org/2000/svg">
-  <rect width="100%" height="100%" fill="black"/>
-  <defs>
-    <radialGradient id="star-gradient" cx="50%" cy="50%" r="50%" fx="50%" fy="50%">
-      <stop offset="0%" style="stop-color: white; stop-opacity: 1" />
-      <stop offset="100%" style="stop-color: white; stop-opacity: 0" />
-    </radialGradient>
-    <g id="star">
-      <circle cx="0" cy="0" r="2" fill="white" />
-    </g>
-  </defs>
-
-  <!-- Lots of stars moving outward slower -->
-  <g>
-    <use href="#star" x="50%" y="50%" transform="translate(-300,-150) scale(1)" />
-    <use href="#star" x="50%" y="50%" transform="translate(300,-150) scale(1)" />
-    <use href="#star" x="50%" y="50%" transform="translate(-300,150) scale(1)" />
-    <use href="#star" x="50%" y="50%" transform="translate(300,150) scale(1)" />
-    <use href="#star" x="50%" y="50%" transform="translate(-150,-75) scale(0.5)" />
-    <use href="#star" x="50%" y="50%" transform="translate(150,-75) scale(0.5)" />
-    <use href="#star" x="50%" y="50%" transform="translate(-150,75) scale(0.5)" />
-    <use href="#star" x="50%" y="50%" transform="translate(150,75) scale(0.5)" />
-    <use href="#star" x="50%" y="50%" transform="translate(-75,-37) scale(0.7)" />
-    <use href="#star" x="50%" y="50%" transform="translate(75,-37) scale(0.7)" />
-    <use href="#star" x="50%" y="50%" transform="translate(-75,37) scale(0.7)" />
-    <use href="#star" x="50%" y="50%" transform="translate(75,37) scale(0.7)" />
-    <use href="#star" x="50%" y="50%" transform="translate(-350,-175) scale(0.4)" />
-    <use href="#star" x="50%" y="50%" transform="translate(350,-175) scale(0.4)" />
-    <use href="#star" x="50%" y="50%" transform="translate(-350,175) scale(0.4)" />
-    <use href="#star" x="50%" y="50%" transform="translate(350,175) scale(0.4)" />
-    <animateTransform attributeName="transform" type="scale" from="1" to="10" dur="2s" repeatCount="indefinite"/>
-    <animate attributeName="opacity" from="1" to="0" dur="2s" repeatCount="indefinite" />
-  </g>
-
-  <!-- Centered Title -->
-  <text x="50%" y="50%" fill="white" font-size="40" text-anchor="middle" font-family="Arial" dy=".3em">
-    Novaconium PHP
-  </text>
-</svg>

src/Database.php

@@ -2,71 +2,74 @@
 
 class Database {
 
-    private $host;
-    private $user;
-    private $pass;
-    private $dbname;
     private $conn;
 
     public function __construct($dbinfo) {
-        $this->host = $dbinfo['host'];
-        $this->user = $dbinfo['user'];
-        $this->pass = $dbinfo['pass'];
-        $this->dbname = $dbinfo['name'];
-
-        $this->connect();
-    }
-
-    private function connect() {
-        $this->conn = new mysqli($this->host, $this->user, $this->pass, $this->dbname);
-
+        $this->conn = new mysqli($dbinfo['host'], $dbinfo['user'], $dbinfo['pass'], $dbinfo['name']);
         if ($this->conn->connect_error) {
             die("Connection failed: " . $this->conn->connect_error);
         }
+        
     }
 
-    public function query($query) {
+    public function query($query, $params = []) {
+        // Prepare the SQL query
+        if ($stmt = $this->conn->prepare($query)) {
+            // Bind parameters to the prepared statement (if any)
+            if (!empty($params)) {
+                $types = str_repeat('s', count($params)); // Assuming all params are strings
+                $stmt->bind_param($types, ...$params);
+            }
+    
+            // Execute the statement
+            if (!$stmt->execute()) {
+                throw new Exception("Query execution failed: " . $stmt->error);
+            }
+    
+            // Return the statement result
+            return $stmt;
+        } else {
+            throw new Exception("Query preparation failed: " . $this->conn->error);
+        }
+    }
+
+    public function getRow($query, $params = []) {
+        try {
+            // Perform the query using prepared statement
+            $stmt = $this->query($query, $params);
+    
+            // Get the result of the query
+            $result = $stmt->get_result();
+    
+            // Fetch the first row from the result
+            return $result->fetch_assoc();
+        } catch (Exception $e) {
+            // Handle the exception (log it, display a message, etc.)
+            echo "An error occurred: " . $e->getMessage();
+            return null;
+        }
+    }
+
+    public function getRows($query, $params = []) {
         $stmt = $this->conn->prepare($query);
+        if (!$stmt) {
+            die("Query preparation failed: " . $this->conn->error);
+        }
+    
+        // Bind parameters if provided
+        if (!empty($params)) {
+            $types = str_repeat('s', count($params)); // Assuming all are strings, adjust as needed
+            $stmt->bind_param($types, ...$params);
+        }
+    
         $stmt->execute();
-
-        return $stmt->get_result();
-    }
-
-    public function getRow($query) {
-        $result = $this->query($query);
-        return $result->fetch_assoc();
-    }
-
-    public function debugGetRow($query) {
-        echo "<h1>Debug GetRow Query</h1>";
-        echo "<div class='debug-query'>Query: $query</div>";
-        $result = $this->query($query);
-        $row = $result->fetch_assoc();
+        $result = $stmt->get_result(); // Requires MySQL Native Driver (mysqlnd)
     
-        echo "<pre>";
-        print_r($row);
-        echo "</pre>";
-    
-        die();
-    }
-
-    public function getRows($query) {
-        $result = $this->query($query);
-        return $result->fetch_all(MYSQLI_ASSOC);
-    }
-
-    public function debugGetRows($query) {
-        echo "<h1>Debug GetRows Query</h1>";
-        echo "<div class='debug-query'>Query: $query</div>";
-    
-        $result = $this->query($query);
-        $rows = $result->fetch_all(MYSQLI_ASSOC);
-    
-        echo "<pre>";
-        print_r($rows);
-        echo "</pre>";
-    
-        die();
+        if ($result) {
+            return $result->fetch_all(MYSQLI_ASSOC);
+        } else {
+            return [];
+        }
     }
 
     public function close() {

src/MessageHandler.php

@@ -0,0 +1,62 @@
+<?php
+
+class MessageHandler {
+    private $messages = [
+        'error' => [],
+        'warning' => [],
+        'notice' => [],
+        'success' => []
+    ];
+
+    // Add a message of a specific type
+    public function addMessage($type, $message) {
+        if (!isset($this->messages[$type])) {
+            throw new Exception("Invalid message type: $type");
+        }
+        $this->messages[$type][] = $message;
+    }
+
+    // Get all messages of a specific type
+    public function getMessages($type) {
+        return $this->messages[$type] ?? [];
+    }
+
+    // Get all messages of all types
+    public function getAllMessages() {
+        return $this->messages;
+    }
+
+    // Get the count of messages for a specific type
+    public function count($type) {
+        return isset($this->messages[$type]) ? count($this->messages[$type]) : 0;
+    }
+
+    // Get the total count of all messages
+    public function totalCount() {
+        return array_sum(array_map('count', $this->messages));
+    }
+
+    // Check if there are any messages of a specific type
+    public function hasMessages($type) {
+        return !empty($this->messages[$type]);
+    }
+
+    // Check if there are any messages at all
+    public function hasAnyMessages() {
+        return $this->totalCount() > 0;
+    }
+
+    // Clear messages of a specific type
+    public function clear($type) {
+        if (isset($this->messages[$type])) {
+            $this->messages[$type] = [];
+        }
+    }
+
+    // Clear all messages
+    public function clearAll() {
+        foreach ($this->messages as $type => $list) {
+            $this->messages[$type] = [];
+        }
+    }
+}

src/Post.php

@@ -0,0 +1,25 @@
+<?php
+
+class Post {
+    private $data = [];
+
+    public function __construct($post) {
+        $this->sanitize($post);
+    }
+
+    private function sanitize($post) {
+        foreach ($post as $key => $value) {
+            $this->data[$key] = is_array($value) 
+                ? filter_var_array($value, FILTER_SANITIZE_FULL_SPECIAL_CHARS) 
+                : filter_var($value, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        }
+    }
+
+    public function get($key, $default = null) {
+        return $this->data[$key] ?? $default;
+    }
+
+    public function all() {
+        return $this->data;
+    }
+}

src/Redirect.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Use 
+ * $redirect->to('/login');
+ * to trigger a redirect
+ */
+
+
+class Redirect {
+    private ?string $url = null;
+    private int $statusCode = 303;
+
+    public function url(string $relativeUrl, int $statusCode = 303): void {
+        $this->statusCode = $statusCode;
+
+        // Detect HTTPS
+        $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? "https" : "http";
+
+        // Get Hostname
+        $host = $_SERVER['HTTP_HOST'];
+
+        // Get Base Directory
+        $basePath = rtrim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
+
+        // Construct Absolute URL
+        $this->url = "$protocol://$host$basePath/" . ltrim($relativeUrl, '/');
+    }
+
+    public function isset(): bool {
+        return !is_null($this->url);
+    }
+
+    public function execute(): void {
+        if ($this->url) {
+            header("Location: " . $this->url, true, $this->statusCode);
+            exit();
+        }
+    }
+}

src/Router.php

@@ -119,19 +119,16 @@ class Router {
     }
 
     public function debug() {
-        echo '<h1>Debugging Router</h1>';
-        echo '<h2>Url Path</h2>';
-        echo $this->path . '<br>';
-        echo '<h2>ControllerPath</h2>';
-        echo $this->controllerPath;
-        echo '<h2>Parameters</h2>';
-        echo '<pre>';
-        print_r($this->parameters);
-        echo '</pre>';
-        echo '<h2>Routes Variable</h2><pre>';
-        print_r($this->routes);
-        echo '</pre>';
+        echo '<div id="router-debug-container" class="debug">';
+        echo '<table border="1" cellpadding="10" cellspacing="0">';
+        echo '<tr><th>Url Path</th><td>' . htmlspecialchars($this->path) . '</td></tr>';
+        echo '<tr><th>Controller Path</th><td>' . htmlspecialchars($this->controllerPath) . '</td></tr>';
+        echo '<tr><th>Parameters</th><td><pre>' . print_r($this->parameters, true) . '</pre></td></tr>';
+        echo '<tr><th>Routes</th><td><pre>' . print_r($this->routes, true) . '</pre></td></tr>';
+        echo '</table></div>';
+    
         die();
     }
+    
 
 }

src/Session.php

@@ -4,13 +4,15 @@ class Session {
     private $session;
 
     public function __construct() {
+        session_start();
         if (!isset($_SESSION)) {
-            session_start();
             $this->session = $_SESSION;
+            $this->setToken();
+            $this->session['messages'] = [];
         } else {
             $this->session = $_SESSION;
         }
-        $this->setToken();
+        
     }
 
     public function setToken() {
@@ -34,7 +36,7 @@ class Session {
     }
 
     public function debug() {
-        print_r($this->session);
+        return $this->session;
     }
 
     public function delete($key) {
@@ -48,4 +50,8 @@ class Session {
         session_write_close();
     }
 
+    public function kill() {
+        session_destroy();
+    }
+
 }

src/functions.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Dump and Die
+ */
+function dd(...$vars) {
+    echo "<pre style='background:#222;color:#0f0;padding:10px;border-radius:5px;'>";
+    foreach ($vars as $var) {
+        var_dump($var);
+        echo "\n";
+    }
+    echo "</pre>";
+    die();
+}
+
+function makeitso() {
+    global $session, $db, $redirect, $config, $messages;
+
+    if (!empty($config['database']['host'])) {
+        $db->close();
+    }
+
+    $session->set('messages', $messages->getAllMessages());
+    $session->write();
+
+    $redirect->execute();
+
+    exit();
+}

src/novaconium.php

@@ -10,9 +10,16 @@ if (file_exists(BASEPATH . '/App/config.php')) {
     require_once(FRAMEWORKPATH . '/defaults/App/config.php');
 }
 
-// Creates twig and the view() function
+// Global Functions
+require_once(FRAMEWORKPATH . '/src/functions.php');
+
+// Creates the view() function using twig
 require_once(FRAMEWORKPATH . '/src/twig.php');
 
+// Messages
+require_once(FRAMEWORKPATH . '/src/MessageHandler.php');
+$messages = new MessageHandler;
+
 // Start a Session
 require_once(FRAMEWORKPATH . '/src/Session.php');
 $session = new Session();
@@ -23,11 +30,20 @@ if (!empty($config['database']['host'])) {
     $db = new Database($config['database']);
 }
 
+// Sanatize POST Data
+if (!empty($_POST)) {
+    require_once(FRAMEWORKPATH . '/src/Post.php');
+    $post = new POST($_POST);
+}
+
+// Start a Redirect
+require_once(FRAMEWORKPATH . '/src/Redirect.php');
+$redirect = new Redirect();
+
 // Load a controller
 require_once(FRAMEWORKPATH . '/src/Router.php');
 $router = new Router();
 //$router->debug();
 require_once($router->controllerPath);
 
-//write the session
-$session->write();
+makeitso();