tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7073 from MrPetovan/task/7047-theme-error-page

Browse source 
Remove usage of non-existent Module\Special\HTTPException::rawContent return value
This commit is contained in:
Philipp 2019-05-02 23:36:33 +02:00 committed by GitHub
parent 5b1fe458d9 36996dd422
commit d60edb5056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/App.php
View file

@ -1006,10 +1006,9 @@ class App
{ {
// Missing DB connection: ERROR // Missing DB connection: ERROR
if ($this->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$this->getMode()->has(App\Mode::DBAVAILABLE)) { if ($this->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$this->getMode()->has(App\Mode::DBAVAILABLE)) {
echo Module\Special\HTTPException::rawContent( Module\Special\HTTPException::rawContent(
new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.') new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.')
); );
exit;
} }
// Max Load Average reached: ERROR // Max Load Average reached: ERROR
@ -1017,17 +1016,15 @@ class App
header('Retry-After: 120'); header('Retry-After: 120');
header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string); header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
echo Module\Special\HTTPException::rawContent( Module\Special\HTTPException::rawContent(
new HTTPException\ServiceUnavaiableException('The node is currently overloaded. Please try again later.') new HTTPException\ServiceUnavaiableException('The node is currently overloaded. Please try again later.')
); );
exit;
} }
if (strstr($this->query_string, '.well-known/host-meta') && ($this->query_string != '.well-known/host-meta')) { if (strstr($this->query_string, '.well-known/host-meta') && ($this->query_string != '.well-known/host-meta')) {
echo Module\Special\HTTPException::rawContent( Module\Special\HTTPException::rawContent(
new HTTPException\NotFoundException() new HTTPException\NotFoundException()
); );
exit;
} }
if (!$this->getMode()->isInstall()) { if (!$this->getMode()->isInstall()) {
@ -1078,10 +1075,9 @@ class App
// Someone came with an invalid parameter, maybe as a DDoS attempt // Someone came with an invalid parameter, maybe as a DDoS attempt
// We simply stop processing here // We simply stop processing here
Core\Logger::log("Invalid ZRL parameter " . $_GET['zrl'], Core\Logger::DEBUG); Core\Logger::log("Invalid ZRL parameter " . $_GET['zrl'], Core\Logger::DEBUG);
echo Module\Special\HTTPException::rawContent( Module\Special\HTTPException::rawContent(
new HTTPException\ForbiddenException() new HTTPException\ForbiddenException()
); );
exit;
} }
} }
} }
@ -1267,8 +1263,7 @@ class App
Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder); Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
call_user_func([$this->module_class, 'afterpost']); call_user_func([$this->module_class, 'afterpost']);
} catch(HTTPException $e) { } catch(HTTPException $e) {
echo Module\Special\HTTPException::rawContent($e); Module\Special\HTTPException::rawContent($e);
exit;
} }
$content = ''; $content = '';