X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FRenderer.php;h=29bbb2b89491f83fdd63bfd554108bf5f7eeb65b;hb=69984ac6bcf08a1c3ce8967ad3ec4ca954039b75;hp=98915e70fade30c9d057e272685d436918874719;hpb=01640a7045e146759bc936dd499ac27738b78940;p=friendica.git

diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 98915e70fa..29bbb2b894 100644
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,8 +23,8 @@ namespace Friendica\Core;
 
 use Exception;
 use Friendica\DI;
-use Friendica\Render\FriendicaSmarty;
-use Friendica\Render\ITemplateEngine;
+use Friendica\Network\HTTPException\ServiceUnavailableException;
+use Friendica\Render\TemplateEngine;
 
 /**
  * This class handles Renderer related functions.
@@ -48,10 +48,8 @@ class Renderer
 	 * beyond are used.
 	 */
 	public static $theme = [
-		'sourcename' => '',
 		'videowidth' => 425,
 		'videoheight' => 350,
-		'force_max_items' => 0,
 		'stylesheet' => '',
 		'template_engine' => 'smarty3',
 	];
@@ -66,31 +64,33 @@ class Renderer
 	];
 
 	/**
-	 * This is our template processor
+	 * Returns the rendered template output from the template string and variables
 	 *
-	 * @param string|FriendicaSmarty $s    The string requiring macro substitution or an instance of FriendicaSmarty
-	 * @param array                  $vars Key value pairs (search => replace)
-	 *
-	 * @return string substituted string
-	 * @throws Exception
+	 * @param string $template
+	 * @param array  $vars
+	 * @return string
+	 * @throws ServiceUnavailableException
 	 */
-	public static function replaceMacros($s, array $vars = [])
+	public static function replaceMacros(string $template, array $vars = [])
 	{
-		$stamp1 = microtime(true);
+		DI::profiler()->startRecording('rendering');
 
 		// pass $baseurl to all templates if it isn't set
-		$vars = array_merge(['$baseurl' => DI::baseUrl()->get()], $vars);
+		$vars = array_merge(['$baseurl' => DI::baseUrl()->get(), '$APP' => DI::app()], $vars);
 
 		$t = self::getTemplateEngine();
 
 		try {
-			$output = $t->replaceMacros($s, $vars);
+			$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 = DI::app()->isSiteAdmin() ?
+				$e->getMessage() :
+				DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+			throw new ServiceUnavailableException($message);
 		}
 
-		DI::profiler()->saveTimestamp($stamp1, "rendering", System::callstack());
+		DI::profiler()->stopRecording();
 
 		return $output;
 	}
@@ -98,26 +98,28 @@ class Renderer
 	/**
 	 * Load a given template $s
 	 *
-	 * @param string $s    Template to load.
-	 * @param string $root Optional.
+	 * @param string $file   Template to load.
+	 * @param string $subDir Subdirectory (Optional)
 	 *
 	 * @return string template.
-	 * @throws Exception
+	 * @throws ServiceUnavailableException
 	 */
-	public static function getMarkupTemplate($s, $root = '')
+	public static function getMarkupTemplate($file, $subDir = '')
 	{
-		$stamp1 = microtime(true);
-		$a = DI::app();
+		DI::profiler()->startRecording('file');
 		$t = self::getTemplateEngine();
 
 		try {
-			$template = $t->getTemplateFile($s, $root);
+			$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 = DI::app()->isSiteAdmin() ?
+				$e->getMessage() :
+				DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+			throw new ServiceUnavailableException($message);
 		}
 
-		DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
+		DI::profiler()->stopRecording();
 
 		return $template;
 	}
@@ -126,18 +128,22 @@ class Renderer
 	 * Register template engine class
 	 *
 	 * @param string $class
+	 * @throws ServiceUnavailableException
 	 */
 	public static function registerTemplateEngine($class)
 	{
 		$v = get_class_vars($class);
 
-		if (!empty($v['name']))
-		{
+		if (!empty($v['name'])) {
 			$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 = DI::app()->isSiteAdmin() ?
+				$admin_message :
+				DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+			throw new ServiceUnavailableException($message);
 		}
 	}
 
@@ -147,7 +153,8 @@ class Renderer
 	 * If $name is not defined, return engine defined by theme,
 	 * or default
 	 *
-	 * @return ITemplateEngine Template Engine instance
+	 * @return TemplateEngine Template Engine instance
+	 * @throws ServiceUnavailableException
 	 */
 	public static function getTemplateEngine()
 	{
@@ -157,15 +164,20 @@ class Renderer
 			if (isset(self::$template_engine_instance[$template_engine])) {
 				return self::$template_engine_instance[$template_engine];
 			} else {
+				$a = DI::app();
 				$class = self::$template_engines[$template_engine];
-				$obj = new $class;
+				$obj = new $class($a->getCurrentTheme(), $a->getThemeInfo());
 				self::$template_engine_instance[$template_engine] = $obj;
 				return $obj;
 			}
 		}
 
-		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 = DI::app()->isSiteAdmin() ?
+			$admin_message :
+			DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator.');
+		throw new ServiceUnavailableException($message);
 	}
 
 	/**