From e1762e7764d4ee4f37757ecd2630f62a440dbf0e Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Thu, 20 Jul 2017 02:22:18 +0200
Subject: replaced template_render with dynamic renderer class

---
 includes/engelsystem_provider.php | 12 +++++-
 includes/pages/guest_credits.php  |  2 +-
 includes/pages/user_shifts.php    |  2 +-
 includes/sys_template.php         | 22 ----------
 public/index.php                  |  2 +-
 public/maintenance.html           | 86 ---------------------------------------
 src/Renderer/EngineInterface.php  | 21 ++++++++++
 src/Renderer/HtmlEngine.php       | 34 ++++++++++++++++
 src/Renderer/Renderer.php         | 62 ++++++++++++++++++++++++++++
 src/helpers.php                   | 17 ++++++++
 templates/maintenance.html        | 86 +++++++++++++++++++++++++++++++++++++++
 11 files changed, 234 insertions(+), 112 deletions(-)
 delete mode 100644 public/maintenance.html
 create mode 100644 src/Renderer/EngineInterface.php
 create mode 100644 src/Renderer/HtmlEngine.php
 create mode 100644 src/Renderer/Renderer.php
 create mode 100644 templates/maintenance.html

diff --git a/includes/engelsystem_provider.php b/includes/engelsystem_provider.php
index edfae705..ff682871 100644
--- a/includes/engelsystem_provider.php
+++ b/includes/engelsystem_provider.php
@@ -4,6 +4,8 @@ use Engelsystem\Config\Config;
 use Engelsystem\Database\Db;
 use Engelsystem\Exceptions\Handler as ExceptionHandler;
 use Engelsystem\Http\Request;
+use Engelsystem\Renderer\HtmlEngine;
+use Engelsystem\Renderer\Renderer;
 
 /**
  * This file includes all needed functions, connects to the db etc.
@@ -43,11 +45,19 @@ $request::setInstance($request);
  * Check for maintenance
  */
 if ($config->get('maintenance')) {
-    echo file_get_contents(__DIR__ . '/../public/maintenance.html');
+    echo file_get_contents(__DIR__ . '/../templates/maintenance.html');
     die();
 }
 
 
+/**
+ * Initialize renderer
+ */
+$renderer = new Renderer();
+$renderer->addRenderer(new HtmlEngine());
+Renderer::setInstance($renderer);
+
+
 /**
  * Register error handler
  */
diff --git a/includes/pages/guest_credits.php b/includes/pages/guest_credits.php
index d9224cbb..db86132d 100644
--- a/includes/pages/guest_credits.php
+++ b/includes/pages/guest_credits.php
@@ -13,5 +13,5 @@ function credits_title()
  */
 function guest_credits()
 {
-    return template_render(__DIR__ . '/../../templates/guest_credits.html', []);
+    return view(__DIR__ . '/../../templates/guest_credits.html');
 }
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 4dabdfb5..813cb9b3 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -206,7 +206,7 @@ function view_user_shifts()
     return page([
         div('col-md-12', [
             msg(),
-            template_render(__DIR__ . '/../../templates/user_shifts.html', [
+            view(__DIR__ . '/../../templates/user_shifts.html', [
                 'title'         => shifts_title(),
                 'room_select'   => make_select($rooms, $shiftsFilter->getRooms(), 'rooms', _('Rooms')),
                 'start_select'  => html_select_key('start_day', 'start_day', array_combine($days, $days), $start_day),
diff --git a/includes/sys_template.php b/includes/sys_template.php
index bcf462d7..a659a7f3 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -321,28 +321,6 @@ function table_buttons($buttons = [])
     return '<div class="btn-group">' . join(' ', $buttons) . '</div>';
 }
 
-/**
- * Load and render template
- *
- * @param string   $file
- * @param string[] $data
- * @return string
- */
-function template_render($file, $data = [])
-{
-    if (file_exists($file)) {
-        $template = file_get_contents($file);
-        if (is_array($data)) {
-            foreach ($data as $name => $content) {
-                $template = str_replace('%' . $name . '%', $content, $template);
-            }
-        }
-        return $template;
-    }
-    engelsystem_error('Cannot find template file &laquo;' . $file . '&raquo;.');
-    return '';
-}
-
 /**
  * @param string $str
  * @param int    $length
diff --git a/public/index.php b/public/index.php
index 52f32438..f22721c8 100644
--- a/public/index.php
+++ b/public/index.php
@@ -166,7 +166,7 @@ if (
 
 $event_config = EventConfig();
 
-echo template_render(__DIR__ . '/../templates/layout.html', [
+echo view(__DIR__ . '/../templates/layout.html', [
     'theme'          => isset($user) ? $user['color'] : config('theme'),
     'title'          => $title,
     'atom_link'      => ($page == 'news' || $page == 'user_meetings')
diff --git a/public/maintenance.html b/public/maintenance.html
deleted file mode 100644
index 3f7dae8a..00000000
--- a/public/maintenance.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Maintenance - Engelsystem</title>
-    <meta charset="UTF-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="css/theme0.css"/>
-    <link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css"/>
-    <link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css"/>
-    <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script>
-    <script type="text/javascript" src="vendor/jquery-ui.min.js"></script>
-</head>
-<body>
-<div class="navbar navbar-default navbar-fixed-top">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed"
-                    data-toggle="collapse" data-target="#navbar-collapse-1">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="?">
-                <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong>
-            </a>
-        </div>
-        <div class="collapse navbar-collapse" id="navbar-collapse-1">
-            <ul class="nav navbar-nav"></ul>
-            <ul class="nav navbar-nav navbar-right">
-            </ul>
-        </div>
-    </div>
-</div>
-<div class="container-fluid">
-    <div class="row">
-        <div class="jumbotron">
-            <div class="container text-center">
-                <h1>
-                    <span class="glyphicon glyphicon-scissors"></span>
-                    <span class="glyphicon glyphicon-wrench"></span>
-                    <span class="glyphicon glyphicon-fire"></span>
-                </h1>
-                <div class="col-md-6">
-                    <h2>
-                        The <span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong> is in maintenance mode.
-                    </h2>
-                    <p>This may be due to...</p>
-                    <p>
-                        ...archangels closing the gates of heaven. <br>
-                        ...somebody's stolen the power chord and now the battery is empty. <br>
-                        ...DHCP decided to give me another ip address.
-                    </p>
-                </div>
-                <div class="col-md-6">
-                    <iframe width="560" height="315"
-                            src="https://www.youtube.com/embed/0aV_vHcunSQ?rel=0"
-                            frameborder="0" allowfullscreen>
-                    </iframe>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <div class="text-center footer">
-                <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a>
-                · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</a>
-            </div>
-        </div>
-    </div>
-</div>
-<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js"></script>
-<script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js"></script>
-<script type="text/javascript" src="vendor/Chart.min.js"></script>
-<script type="text/javascript" src="js/forms.js"></script>
-<script type="text/javascript" src="vendor/moment-with-locales.min.js"></script>
-<script type="text/javascript">
-    $(function () {
-        moment.locale("en_US.UTF-8");
-    });
-</script>
-<script type="text/javascript" src="js/moment-countdown.js"></script>
-</body>
-</html>
diff --git a/src/Renderer/EngineInterface.php b/src/Renderer/EngineInterface.php
new file mode 100644
index 00000000..ca468db5
--- /dev/null
+++ b/src/Renderer/EngineInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Engelsystem\Renderer;
+
+interface EngineInterface
+{
+    /**
+     * Render a template
+     *
+     * @param string  $path
+     * @param mixed[] $data
+     * @return string
+     */
+    public function get($path, $data = []);
+
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function canRender($path);
+}
diff --git a/src/Renderer/HtmlEngine.php b/src/Renderer/HtmlEngine.php
new file mode 100644
index 00000000..4a48e1f0
--- /dev/null
+++ b/src/Renderer/HtmlEngine.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Engelsystem\Renderer;
+
+class HtmlEngine implements EngineInterface
+{
+    /**
+     * Render a template
+     *
+     * @param string  $path
+     * @param mixed[] $data
+     * @return string
+     */
+    public function get($path, $data = [])
+    {
+        $template = file_get_contents($path);
+        if (is_array($data)) {
+            foreach ($data as $name => $content) {
+                $template = str_replace('%' . $name . '%', $content, $template);
+            }
+        }
+
+        return $template;
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function canRender($path)
+    {
+        return strpos($path, '.html') && file_exists($path);
+    }
+}
diff --git a/src/Renderer/Renderer.php b/src/Renderer/Renderer.php
new file mode 100644
index 00000000..bf3d5609
--- /dev/null
+++ b/src/Renderer/Renderer.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Engelsystem\Renderer;
+
+use ErrorException;
+
+class Renderer
+{
+    /** @var self */
+    protected static $instance;
+
+    /** @var EngineInterface[] */
+    protected $renderer = [];
+
+    /**
+     * Render a template
+     *
+     * @param string  $template
+     * @param mixed[] $data
+     * @return string
+     */
+    public function render($template, $data = [])
+    {
+        foreach ($this->renderer as $renderer) {
+            if (!$renderer->canRender($template)) {
+                continue;
+            }
+
+            return $renderer->get($template, $data);
+        }
+
+        engelsystem_error('Unable to find a renderer for template file &laquo;' . $template . '&raquo;.');
+        return '';
+    }
+
+    /**
+     * Add a new renderer engine
+     *
+     * @param EngineInterface $renderer
+     */
+    public function addRenderer(EngineInterface $renderer)
+    {
+        $this->renderer[] = $renderer;
+    }
+
+    /**
+     * @return self
+     * @throws ErrorException
+     */
+    public static function getInstance()
+    {
+        return self::$instance;
+    }
+
+    /**
+     * @param self $instance
+     */
+    public static function setInstance($instance)
+    {
+        self::$instance = $instance;
+    }
+}
diff --git a/src/helpers.php b/src/helpers.php
index a410b27e..d44d1d21 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -3,6 +3,7 @@
 
 use Engelsystem\Config\Config;
 use Engelsystem\Http\Request;
+use Engelsystem\Renderer\Renderer;
 
 /**
  * Get or set config values
@@ -39,3 +40,19 @@ function request($key = null, $default = null)
 
     return $request->input($key, $default);
 }
+
+/**
+ * @param string  $template
+ * @param mixed[] $data
+ * @return Renderer|string
+ */
+function view($template = null, $data = null)
+{
+    $renderer = Renderer::getInstance();
+
+    if (is_null($template)) {
+        return $renderer;
+    }
+
+    return $renderer->render($template, $data);
+}
diff --git a/templates/maintenance.html b/templates/maintenance.html
new file mode 100644
index 00000000..3f7dae8a
--- /dev/null
+++ b/templates/maintenance.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Maintenance - Engelsystem</title>
+    <meta charset="UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" type="text/css" href="css/theme0.css"/>
+    <link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css"/>
+    <link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css"/>
+    <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script>
+    <script type="text/javascript" src="vendor/jquery-ui.min.js"></script>
+</head>
+<body>
+<div class="navbar navbar-default navbar-fixed-top">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed"
+                    data-toggle="collapse" data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="?">
+                <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong>
+            </a>
+        </div>
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav"></ul>
+            <ul class="nav navbar-nav navbar-right">
+            </ul>
+        </div>
+    </div>
+</div>
+<div class="container-fluid">
+    <div class="row">
+        <div class="jumbotron">
+            <div class="container text-center">
+                <h1>
+                    <span class="glyphicon glyphicon-scissors"></span>
+                    <span class="glyphicon glyphicon-wrench"></span>
+                    <span class="glyphicon glyphicon-fire"></span>
+                </h1>
+                <div class="col-md-6">
+                    <h2>
+                        The <span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong> is in maintenance mode.
+                    </h2>
+                    <p>This may be due to...</p>
+                    <p>
+                        ...archangels closing the gates of heaven. <br>
+                        ...somebody's stolen the power chord and now the battery is empty. <br>
+                        ...DHCP decided to give me another ip address.
+                    </p>
+                </div>
+                <div class="col-md-6">
+                    <iframe width="560" height="315"
+                            src="https://www.youtube.com/embed/0aV_vHcunSQ?rel=0"
+                            frameborder="0" allowfullscreen>
+                    </iframe>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="text-center footer">
+                <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a>
+                · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</a>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js"></script>
+<script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js"></script>
+<script type="text/javascript" src="vendor/Chart.min.js"></script>
+<script type="text/javascript" src="js/forms.js"></script>
+<script type="text/javascript" src="vendor/moment-with-locales.min.js"></script>
+<script type="text/javascript">
+    $(function () {
+        moment.locale("en_US.UTF-8");
+    });
+</script>
+<script type="text/javascript" src="js/moment-countdown.js"></script>
+</body>
+</html>
-- 
cgit v1.2.3-54-g00ecf