friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Catch HTTPExceptions in App::runFrontend() 

Set correct http response header, display error message using "404.tpl"
This commit is contained in:
fabrixxm 2018-11-20 22:34:39 +01:00
parent 36c8828b32
commit 58bd75f8f3
1 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/App.php
View File

@ -9,6 +9,7 @@ use DOMDocument;
use DOMXPath; use DOMXPath;
use Exception; use Exception;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Network\HTTPException;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
require_once 'boot.php'; require_once 'boot.php';
@ -1684,46 +1685,55 @@ class App
// Call module functions // Call module functions
if ($this->module_loaded) { if ($this->module_loaded) {
$this->page['page_title'] = $this->module; try {
$placeholder = ''; $this->page['page_title'] = $this->module;
$placeholder = '';
Core\Addon::callHooks($this->module . '_mod_init', $placeholder); Core\Addon::callHooks($this->module . '_mod_init', $placeholder);
call_user_func([$this->module_class, 'init']); call_user_func([$this->module_class, 'init']);
// "rawContent" is especially meant for technical endpoints. // "rawContent" is especially meant for technical endpoints.
// This endpoint doesn't need any theme initialization or other comparable stuff. // This endpoint doesn't need any theme initialization or other comparable stuff.
if (!$this->error) { if (!$this->error) {
call_user_func([$this->module_class, 'rawContent']); call_user_func([$this->module_class, 'rawContent']);
} }
if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_init')) { if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_init')) {
$func = str_replace('-', '_', $this->getCurrentTheme()) . '_init'; $func = str_replace('-', '_', $this->getCurrentTheme()) . '_init';
$func($this); $func($this);
} }
if (! $this->error && $_SERVER['REQUEST_METHOD'] === 'POST') { if (! $this->error && $_SERVER['REQUEST_METHOD'] === 'POST') {
Core\Addon::callHooks($this->module . '_mod_post', $_POST); Core\Addon::callHooks($this->module . '_mod_post', $_POST);
call_user_func([$this->module_class, 'post']); call_user_func([$this->module_class, 'post']);
} }
if (! $this->error) { if (! $this->error) {
Core\Addon::callHooks($this->module . '_mod_afterpost', $placeholder); Core\Addon::callHooks($this->module . '_mod_afterpost', $placeholder);
call_user_func([$this->module_class, 'afterpost']); call_user_func([$this->module_class, 'afterpost']);
} }
if (! $this->error) { if (! $this->error) {
$arr = ['content' => $this->page['content']]; $arr = ['content' => $this->page['content']];
Core\Addon::callHooks($this->module . '_mod_content', $arr); Core\Addon::callHooks($this->module . '_mod_content', $arr);
$this->page['content'] = $arr['content']; $this->page['content'] = $arr['content'];
$arr = ['content' => call_user_func([$this->module_class, 'content'])]; $arr = ['content' => call_user_func([$this->module_class, 'content'])];
Core\Addon::callHooks($this->module . '_mod_aftercontent', $arr); Core\Addon::callHooks($this->module . '_mod_aftercontent', $arr);
$this->page['content'] .= $arr['content']; $this->page['content'] .= $arr['content'];
} }
if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded')) { if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded')) {
$func = str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded'; $func = str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded';
$func($this); $func($this);
}
} catch (HTTPException $e) {
header($_SERVER["SERVER_PROTOCOL"] . " " . $e->httpcode . " " . $e->httpdesc , true, $e->httpcode);
$error = ($e->getMessage() !== "" ? $e->getMessage() : $e->httpdesc);
$tpl = Core\Renderer::getMarkupTemplate("404.tpl");
$this->page['content'] = Core\Renderer::replaceMacros($tpl, [
'$message' => $error
]);
} }
} }