Revert "Actually destroy session on logout"

[friendica.git] / src / Core / Renderer.php

diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 4dab3184c77eb956c8e20830b25b85aad56746d6..24f00341733530a24d097a1a1bf01f00049bda94 100644 (file)
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -23,6 +23,7 @@ namespace Friendica\Core;
 
 use Exception;
 use Friendica\DI;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Render\TemplateEngine;
 
 /**
@@ -70,8 +71,9 @@ class Renderer
         * @param string $template
         * @param array  $vars
         * @return string
+        * @throws InternalServerErrorException
         */
-       public static function replaceMacros(string $template, array $vars)
+       public static function replaceMacros(string $template, array $vars = [])
        {
                $stamp1 = microtime(true);
 
@@ -83,11 +85,14 @@ class Renderer
                try {
                        $output = $t->replaceMacros($template, $vars);
                } catch (Exception $e) {
-                       echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-                       exit();
+                       DI::logger()->critical($e->getMessage(), ['template' => $template, 'vars' => $vars]);
+                       $message = is_site_admin() ?
+                               $e->getMessage() :
+                               DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+                       throw new InternalServerErrorException($message);
                }
 
-               DI::profiler()->saveTimestamp($stamp1, "rendering", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "rendering");
 
                return $output;
        }
@@ -99,7 +104,7 @@ class Renderer
         * @param string $subDir Subdirectory (Optional)
         *
         * @return string template.
-        * @throws Exception
+        * @throws InternalServerErrorException
         */
        public static function getMarkupTemplate($file, $subDir = '')
        {
@@ -109,11 +114,14 @@ class Renderer
                try {
                        $template = $t->getTemplateFile($file, $subDir);
                } catch (Exception $e) {
-                       echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-                       exit();
+                       DI::logger()->critical($e->getMessage(), ['file' => $file, 'subDir' => $subDir]);
+                       $message = is_site_admin() ?
+                               $e->getMessage() :
+                               DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+                       throw new InternalServerErrorException($message);
                }
 
-               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file");
 
                return $template;
        }
@@ -122,6 +130,7 @@ class Renderer
         * Register template engine class
         *
         * @param string $class
+        * @throws InternalServerErrorException
         */
        public static function registerTemplateEngine($class)
        {
@@ -131,8 +140,12 @@ class Renderer
                        $name = $v['name'];
                        self::$template_engines[$name] = $class;
                } else {
-                       echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
-                       die();
+                       $admin_message = DI::l10n()->t('template engine cannot be registered without a name.');
+                       DI::logger()->critical($admin_message, ['class' => $class]);
+                       $message = is_site_admin() ?
+                               $admin_message :
+                               DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+                       throw new InternalServerErrorException($message);
                }
        }
 
@@ -143,6 +156,7 @@ class Renderer
         * or default
         *
         * @return TemplateEngine Template Engine instance
+        * @throws InternalServerErrorException
         */
        public static function getTemplateEngine()
        {
@@ -160,8 +174,12 @@ class Renderer
                        }
                }
 
-               echo "template engine <tt>$template_engine</tt> is not registered!\n";
-               exit();
+               $admin_message = DI::l10n()->t('template engine is not registered!');
+               DI::logger()->critical($admin_message, ['template_engine' => $template_engine]);
+               $message = is_site_admin() ?
+                       $admin_message :
+                       DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+               throw new InternalServerErrorException($message);
        }
 
        /**