keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace direct error output and exit by logger + exception in Core\Renderer 

- Same in Render\FriendicaSmartyEngine
This commit is contained in:
Hypolite Petovan 2020-05-18 01:21:58 -04:00
parent 346f99b877
commit ef9b51e631
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Core/Renderer.php
View File

@ -23,6 +23,7 @@ namespace Friendica\Core;
use Exception; use Exception;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Render\TemplateEngine; use Friendica\Render\TemplateEngine;
/** /**
@ -70,6 +71,7 @@ class Renderer
* @param string $template * @param string $template
* @param array $vars * @param array $vars
* @return string * @return string
* @throws InternalServerErrorException
*/ */
public static function replaceMacros(string $template, array $vars) public static function replaceMacros(string $template, array $vars)
{ {
@ -83,8 +85,8 @@ class Renderer
try { try {
$output = $t->replaceMacros($template, $vars); $output = $t->replaceMacros($template, $vars);
} catch (Exception $e) { } catch (Exception $e) {
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>"; DI::logger()->critical($e->getMessage(), ['template' => $template, 'vars' => $vars]);
exit(); throw new InternalServerErrorException(DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator or check the Friendica log for errors.'));
} }
DI::profiler()->saveTimestamp($stamp1, "rendering", System::callstack()); DI::profiler()->saveTimestamp($stamp1, "rendering", System::callstack());
@ -99,7 +101,7 @@ class Renderer
* @param string $subDir Subdirectory (Optional) * @param string $subDir Subdirectory (Optional)
* *
* @return string template. * @return string template.
* @throws Exception * @throws InternalServerErrorException
*/ */
public static function getMarkupTemplate($file, $subDir = '') public static function getMarkupTemplate($file, $subDir = '')
{ {
@ -109,8 +111,8 @@ class Renderer
try { try {
$template = $t->getTemplateFile($file, $subDir); $template = $t->getTemplateFile($file, $subDir);
} catch (Exception $e) { } catch (Exception $e) {
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>"; DI::logger()->critical($e->getMessage(), ['file' => $file, 'subDir' => $subDir]);
exit(); throw new InternalServerErrorException(DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator or check the Friendica log for errors.'));
} }
DI::profiler()->saveTimestamp($stamp1, "file", System::callstack()); DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
@ -122,6 +124,7 @@ class Renderer
* Register template engine class * Register template engine class
* *
* @param string $class * @param string $class
* @throws InternalServerErrorException
*/ */
public static function registerTemplateEngine($class) public static function registerTemplateEngine($class)
{ {
@ -131,8 +134,8 @@ class Renderer
$name = $v['name']; $name = $v['name'];
self::$template_engines[$name] = $class; self::$template_engines[$name] = $class;
} else { } else {
echo "template engine <tt>$class</tt> cannot be registered without a name.\n"; DI::logger()->critical(DI::l10n()->t('template engine cannot be registered without a name.'), ['class' => $class]);
die(); throw new InternalServerErrorException(DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator or check the Friendica log for errors.'));
} }
} }
@ -143,6 +146,7 @@ class Renderer
* or default * or default
* *
* @return TemplateEngine Template Engine instance * @return TemplateEngine Template Engine instance
* @throws InternalServerErrorException
*/ */
public static function getTemplateEngine() public static function getTemplateEngine()
{ {
@ -160,8 +164,8 @@ class Renderer
} }
} }
echo "template engine <tt>$template_engine</tt> is not registered!\n"; DI::logger()->critical(DI::l10n()->t('template engine is not registered!'), ['template_engine' => $template_engine]);
exit(); throw new InternalServerErrorException(DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator or check the Friendica log for errors.'));
} }
/** /**

5
src/Render/FriendicaSmartyEngine.php
View File

@ -23,6 +23,7 @@ namespace Friendica\Render;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\Strings; use Friendica\Util\Strings;
/** /**
@ -48,8 +49,8 @@ final class FriendicaSmartyEngine extends TemplateEngine
$this->smarty = new FriendicaSmarty($this->theme, $this->theme_info); $this->smarty = new FriendicaSmarty($this->theme, $this->theme_info);
if (!is_writable(DI::basePath() . '/view/smarty3')) { if (!is_writable(DI::basePath() . '/view/smarty3')) {
echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver."; DI::logger()->critical(DI::l10n()->t('The folder view/smarty3/ must be writable by webserver.'));
exit(); throw new InternalServerErrorException(DI::l10n()->t('Friendica can\'t display this page at the moment, please contact the administrator or check the Friendica log for errors.'));
} }
} }