Merge branch 'master' into engineers-branch

.gitignore

@@ -462,7 +462,7 @@ MigrationBackup/
 
 # real ignore for venom
 conf/config.inc.php
-conf/module.inc.php
+conf/modules.inc.php
 conf/routers.inc.php
 conf/lang.inc.php
 logs/Exception.log

base/config.base.php

@@ -42,6 +42,7 @@ $config->setSecurity([
 // all themes are in __DIR__/public/theme/
 $config->setRender([
     'theme' => 'default', //very important! it will search for a folder with this name.
+    'assetDir' => 'default',
     'baseFile' => 'base', //this will called after all templates are rendered...
     'useCache' => false, //is only on big systems good
     'cacheName' => 'defaultCache', //this is for bigger systems, ignore it

base/lang.base.php

@@ -1,3 +1,3 @@
 <?php
 
-require_once __DIR__ . '/../lang/de.php';
+require_once __DIR__ . '/../lang/example.php';

base/module.base.php

@@ -5,5 +5,5 @@ $modules = [];
 
 // register controllers that can handle templates ;) need to have a render function for this
 $controllers = [
-    'test' => \Modules\TestController::class,
+    'test' => \Controllers\TestController::class,
 ];

composer.json

@@ -14,7 +14,8 @@
   "autoload": {
     "psr-4": {
       "Venom\\": "./src/Venom/",
-      "Modules\\": "./src/modules/"
+      "Modules\\": "./src/modules/",
+      "Controllers\\": "./src/controllers/"
     }
   }
 }

install/db.sql

@@ -16,3 +16,14 @@ create table if not exists language
     isDefault tinyint(1) default 0    null
 )
     comment 'Language File';
+
+create table if not exists data
+(
+    id        int(255) auto_increment not null unique primary key,
+    identity  varchar(255)            not null unique,
+    isActive  tinyint(1) default 1    null,
+    generated longtext                not null,
+    raw       longtext                not null,
+    datatype  enum ('content', 'form')
+)
+    comment 'DataLoader File';

src/Venom/Core/ArgumentHandler.php

@@ -29,14 +29,16 @@ class ArgumentHandler
 
     public function getItem(string $key, $default = null)
     {
-        if (isset($this->arguments[$key])) {
+        return $this->arguments[$key] ?? $default;
-            return $this->arguments[$key];
-        }
-        return $default;
     }
 
-    public function setItem(string $key, $item)
+    public function setItem(string $key, $item): void
     {
         $this->arguments[$key] = $item;
     }
+
+    public function hasItem(string $key): bool
+    {
+        return isset($this->arguments[$key]);
+    }
 }

src/Venom/Core/DatabaseHandler.php

@@ -66,9 +66,9 @@ class DatabaseHandler
         return $stmt->fetchAll();
     }
 
-    public function execute(string $query, array $args): void
+    public function execute(string $query, array $args): bool
     {
         $stmt = $this->db->prepare($query);
-        $stmt->execute($args);
+        return $stmt->execute($args);
     }
 }

src/Venom/Helper/ErrorHandler.php

@@ -8,13 +8,25 @@ use Venom\Core\ArgumentHandler;
 
 class ErrorHandler
 {
-
+    public const ERROR_KEY = 'errorHandler';
 
     public static function setFatalError(): void
     {
         self::setError(500);
     }
 
+    public static function setError(int $errorCode): void
+    {
+        http_response_code($errorCode);
+        $handler = ArgumentHandler::get();
+        if (!$handler->hasItem('cl')) {
+            $handler->setItem('cl', 'error');
+            $handler->setItem('fnc', 'handleError');
+            $handler->setItem('errorCode', $errorCode);
+            $handler->setItem(self::ERROR_KEY, true);
+        }
+    }
+
     public static function setNotFound(): void
     {
         self::setError(404);
@@ -24,12 +36,4 @@ class ErrorHandler
     {
         self::setError(204);
     }
-
-    public static function setError(int $errorCode): void
-    {
-        http_response_code($errorCode);
-        ArgumentHandler::get()->setItem('cl', 'error');
-        ArgumentHandler::get()->setItem('fnc', 'handleError');
-        ArgumentHandler::get()->setItem('errorCode', $errorCode);
-    }
 }

src/Venom/Models/DataModel.php

@@ -0,0 +1,90 @@
+<?php
+
+
+namespace Venom\Models;
+
+
+class DataModel
+{
+    public const TYPE_CONTENT = 'content';
+    public const TYPE_FORM = 'form';
+
+    public string $id;
+    public string $raw;
+    public string $generated;
+    public string $type;
+    public int $active = 1;
+
+    public function __construct(
+        string $id,
+        string $type = self::TYPE_CONTENT,
+        string $raw = '',
+        string $generated = ''
+    )
+    {
+        $this->id = $id;
+        $this->type = $type;
+        $this->raw = $raw;
+        $this->generated = $generated;
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function setId(string $id): void
+    {
+        $this->id = $id;
+    }
+
+    public function getRaw(): string
+    {
+        return $this->raw;
+    }
+
+    public function setRaw(string $raw): void
+    {
+        $this->raw = $raw;
+    }
+
+    public function getGenerated(): string
+    {
+        return $this->generated;
+    }
+
+    public function setGenerated(string $generated): void
+    {
+        $this->generated = $generated;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function setType(string $type): void
+    {
+        $this->type = $type;
+    }
+
+    public function validate(): bool
+    {
+        return $this->type !== '' && $this->id !== '' && $this->generated !== '' && $this->raw !== '';
+    }
+
+    public function isActive(): bool
+    {
+        return $this->active === 1;
+    }
+
+    public function getActive(): int
+    {
+        return $this->active;
+    }
+
+    public function setActive(bool $value): void
+    {
+        $this->active = $value ? 1 : 0;
+    }
+}

src/Venom/Security/Security.php

@@ -4,7 +4,6 @@
 namespace Venom\Security;
 
 
-
 class Security
 {
     private static ?Security $instance = null;

src/Venom/Venom.php

@@ -32,6 +32,8 @@ class Venom
 
     public function run(): void
     {
+        $arguments = ArgumentHandler::get();
+        $arguments->setItem(ErrorHandler::ERROR_KEY, false);
         // we need to load the current controller and the current start template.
         // after this we can start the renderer
         if (Config::getInstance()->isRouterEnabled()) {
@@ -45,7 +47,10 @@ class Venom
         }
         $registry = Registry::getInstance();
         $registry->getLang()->initLang();
+        // if site is errored then dont load via SEO
+        if (!$arguments->getItem(ErrorHandler::ERROR_KEY)) {
             $registry->getSeo()->loadSite();
+        }
         $this->renderer->init($this->findController());
         $this->renderer->render();
     }
@@ -68,7 +73,16 @@ class Venom
     {
         $cl = ArgumentHandler::get()->getItem('cl');
         if ($cl !== null && isset($this->controllers[$cl])) {
-            return $this->controllers[$cl];
+            return $this->loadController($this->controllers[$cl]);
+        }
+        return null;
+    }
+
+    public function loadController($controllerClass): ?RenderController
+    {
+        $controller = new $controllerClass;
+        if ($controller instanceof RenderController && $controller->register()) {
+            return $controller;
         }
         return null;
     }
@@ -85,12 +99,7 @@ class Venom
 
     public function initControllers(array $controllers): void
     {
-        foreach ($controllers as $key => $controllerClass) {
+        $this->controllers = $controllers;
-            $controller = new $controllerClass;
-            if ($controller instanceof RenderController && $controller->register()) {
-                $this->controllers[$key] = $controller;
-            }
-        }
     }
 
     public function addRouter(string $name, Router $router): void

src/Venom/Views/Asset.php

@@ -43,9 +43,10 @@ class Asset
 
     public function getImagePath(string $filepath, bool $useAbsolute = false)
     {
-        $preDir = '/content/';
+        $config = Config::getInstance();
+        $preDir = '/' . $config->getRenderer()->uploadDir;
         if ($useAbsolute) {
-            $preDir = Config::getInstance()->getBaseUrl() . $preDir;
+            $preDir = $config->getBaseUrl() . $preDir;
         }
         return $preDir . $filepath;
     }
@@ -61,7 +62,7 @@ class Asset
         usort($this->jsFiles, function ($a, $b) {
             return $a['pos'] <=> $b['pos'];
         });
-        $theme = $this->getPath('/theme/' . Config::getInstance()->getRenderer()->theme . '/js/');
+        $theme = $this->getPath('/theme/' . Config::getInstance()->getRenderer()->assetDir . '/js/');
         foreach ($this->jsFiles as $key => $file) {
             echo '<script src="' . $theme . $file['file'] . '" id="js-' . $key . '"></script>';
         }
@@ -72,7 +73,7 @@ class Asset
         $preDir = $base;
         $config = Config::getInstance();
         $baseUrl = Config::getInstance()->getBaseUrl();
-        if ($baseUrl != '' && $config->getRenderer()->useStaticUrl) {
+        if ($baseUrl !== '' && $config->getRenderer()->useStaticUrl) {
             $preDir = Config::getInstance()->getBaseUrl() . $preDir;
         }
         return $preDir;
@@ -83,7 +84,7 @@ class Asset
         usort($this->cssFiles, function ($a, $b) {
             return $a['pos'] <=> $b['pos'];
         });
-        $theme = $this->getPath('/theme/' . Config::getInstance()->getRenderer()->theme . '/css/');
+        $theme = $this->getPath('/theme/' . Config::getInstance()->getRenderer()->assetDir . '/css/');
         foreach ($this->cssFiles as $key => $file) {
             echo '<link rel="stylesheet" href="' . $theme . $file['file'] . '" id="css-' . $key . '">';
         }

src/Venom/Views/DataLoader.php

@@ -0,0 +1,94 @@
+<?php
+
+
+namespace Venom\Views;
+
+use RuntimeException;
+use Venom\Core\DatabaseHandler;
+use Venom\Models\DataModel;
+
+class DataLoader
+{
+    private static ?DataLoader $instance = null;
+
+    private function __construct()
+    {
+    }
+
+    public static function get(): DataLoader
+    {
+        if (self::$instance === null) {
+            self::$instance = new DataLoader();
+        }
+        return self::$instance;
+    }
+
+    public static function loadById(string $id): ?DataModel
+    {
+        if ($id === '') {
+            throw new RuntimeException('Try to Load empty ID from Database');
+        }
+        $data = DatabaseHandler::get()->getOne('SELECT identity, raw, generated, datatype FROM data WHERE identity = :id and isActive = 1 LIMIT 1', [
+            ':id' => $id
+        ]);
+
+        if ($data !== null) {
+            $model = new DataModel($data->identity, $data->datatype, $data->raw, $data->generated);
+            $model->setActive(true);
+            return $model;
+        }
+        return null;
+    }
+
+    public function updateData(DataModel $model): bool
+    {
+        if ($model->getId() === '') {
+            return $this->insertData($model);
+        }
+        return DatabaseHandler::get()->execute(
+            "UPDATE data SET identity=:id, isActive=:isActive, generated=:gen, raw=:raw, datatype=:dt WHERE identity=:id",
+            [
+                ':id' => $model->getId(),
+                ':isActive' => $model->getActive(),
+                ':gen' => $model->getGenerated(),
+                ':raw' => $model->getRaw(),
+                ':dt' => $model->getType()
+            ]
+        );
+    }
+
+    public function insertData(DataModel $model): bool
+    {
+
+        $this->validateModel($model);
+        return DatabaseHandler::get()->execute(
+            "INSERT INTO data (identity, isActive, generated, raw, datatype) VALUES (:id, :isActive, :gen, :raw, :dt)",
+            [
+                ':id' => $model->getId(),
+                ':isActive' => $model->getActive(),
+                ':gen' => $model->getGenerated(),
+                ':raw' => $model->getRaw(),
+                ':dt' => $model->getType()
+            ]
+        );
+    }
+
+    private function validateModel(DataModel $model): void
+    {
+        if ($model->getId() === '') {
+            $model->setId($this->generateID());
+        }
+        if (!$model->validate()) {
+            $id = htmlspecialchars($model->getId());
+            throw new RuntimeException("DataModel with id: \"$id\" is invalid!");
+        }
+    }
+
+    private function generateID(string $id = ''): string
+    {
+        if ($id === '') {
+            $id = bin2hex(random_bytes(16));
+        }
+        return $id;
+    }
+}

src/Venom/Views/VenomRenderer.php

@@ -16,7 +16,6 @@ class VenomRenderer
     private array  $vars = [];
     private string $baseTemplate = '';
     private string $templateDir = '';
-    private string $assetsDir = '';
 
     public function __construct(Venom $venom)
     {
@@ -48,6 +47,13 @@ class VenomRenderer
         }
     }
 
+    public function renderTemplate($template): void
+    {
+        // random variable name... to remove it instantly
+        echo $this->includeTemplate($template, '1408138186');
+        unset($this->vars['1408138186']);
+    }
+
     /**
      * function will load a template (without extension!) into a variable and return the content
      * @param $template
@@ -78,12 +84,16 @@ class VenomRenderer
         return $this->vars[$name];
     }
 
+    public function deleteVar($name)
+    {
+        unset($this->vars[$name]);
+    }
+
     public function init(?RenderController $controller): void
     {
         $this->controller = $controller;
         $data = Config::getInstance()->getRenderer();
         $this->baseTemplate = $data->baseFile . '.php' ?? 'base.php';
         $this->templateDir = __DIR__ . '/../../../tpl/' . $data->theme . '/';
-        $this->assetsDir = __DIR__ . '/../../../public/theme/' . $data->theme . '/';
     }
 }

src/controllers/TestController.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Modules;
+namespace Controllers;
 
 
 use Venom\Views\Asset;