6 files changed, 16 insertions, 39 deletions
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,12 +45,20 @@ $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
  */
 $errorHandler = new ExceptionHandler();
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/guest_login.php b/includes/pages/guest_login.php
index 858ced80..106db33a 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -488,6 +488,5 @@ function get_register_hint()
         ]);
     }
 
-    //@TODO: FIXME: return error(_('Registration is disabled.'), true);
-    return error('Registration is <a href="https://engelsystem.de/33c3/overwhelmed.html">disabled</a>.', true);
+    return error(_('Registration is disabled.'), true);
 }
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 69e5a7fb..667e73d9 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -198,8 +198,9 @@ function user_settings_locale($user_source, $locales)
  */
 function user_settings()
 {
-    global $themes, $user;
+    global $user;
     $request = request();
+    $themes = config('available_themes');
 
     $enable_tshirt_size = config('enable_tshirt_size');
     $tshirt_sizes = config('tshirt_sizes');
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 1d3943b7..a659a7f3 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -1,17 +1,6 @@
 <?php
 
 /**
- * Liste der verfügbaren Themes
- */
-$themes = [
-    '4' => 'Engelsystem 33c3 (2016)',
-    '3' => 'Engelsystem 32c3 (2015)',
-    '2' => 'Engelsystem cccamp15',
-    '0' => 'Engelsystem light',
-    '1' => 'Engelsystem dark'
-];
-
-/**
  * Display muted (grey) text.
  *
  * @param string $text
@@ -333,28 +322,6 @@ function table_buttons($buttons = [])
 }
 
 /**
- * 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
  * @return string