diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2017-07-20 02:22:18 +0200 |
---|---|---|
committer | Igor Scheller <igor.scheller@igorshp.de> | 2017-07-20 02:30:53 +0200 |
commit | e1762e7764d4ee4f37757ecd2630f62a440dbf0e (patch) | |
tree | ab10822d61e7a2549be99bf2e7964351ddda484b /includes | |
parent | d4ad70804be9d310787b98fcdce51b3697967d22 (diff) |
replaced template_render with dynamic renderer class
Diffstat (limited to 'includes')
-rw-r--r-- | includes/engelsystem_provider.php | 12 | ||||
-rw-r--r-- | includes/pages/guest_credits.php | 2 | ||||
-rw-r--r-- | includes/pages/user_shifts.php | 2 | ||||
-rw-r--r-- | includes/sys_template.php | 22 |
4 files changed, 13 insertions, 25 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/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 @@ -322,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 «' . $file . '».'); - return ''; -} - -/** * @param string $str * @param int $length * @return string |