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

goaway fix in App

This commit is contained in:
Philipp Holzer 2018-10-22 22:15:50 +02:00
parent 32af52842b
commit 3072c56057
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/App.php
View File

@ -1747,35 +1747,35 @@ class App
if (strlen($this->module)) { if (strlen($this->module)) {
// Compatibility with the Android Diaspora client // Compatibility with the Android Diaspora client
if ($this->module == 'stream') { if ($this->module == 'stream') {
goaway('network?f=&order=post'); $this->internalRedirect('network?f=&order=post');
} }
if ($this->module == 'conversations') { if ($this->module == 'conversations') {
goaway('message'); $this->internalRedirect('message');
} }
if ($this->module == 'commented') { if ($this->module == 'commented') {
goaway('network?f=&order=comment'); $this->internalRedirect('network?f=&order=comment');
} }
if ($this->module == 'liked') { if ($this->module == 'liked') {
goaway('network?f=&order=comment'); $this->internalRedirect('network?f=&order=comment');
} }
if ($this->module == 'activity') { if ($this->module == 'activity') {
goaway('network/?f=&conv=1'); $this->internalRedirect('network/?f=&conv=1');
} }
if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) { if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {
goaway('bookmarklet'); $this->internalRedirect('bookmarklet');
} }
if (($this->module == 'user') && ($this->cmd == 'user/edit')) { if (($this->module == 'user') && ($this->cmd == 'user/edit')) {
goaway('settings'); $this->internalRedirect('settings');
} }
if (($this->module == 'tag_followings') && ($this->cmd == 'tag_followings/manage')) { if (($this->module == 'tag_followings') && ($this->cmd == 'tag_followings/manage')) {
goaway('search'); $this->internalRedirect('search');
} }
// Compatibility with the Firefox App // Compatibility with the Firefox App
@ -1830,7 +1830,7 @@ class App
if (!empty($_SERVER['QUERY_STRING']) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) { if (!empty($_SERVER['QUERY_STRING']) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']); logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
goaway($this->getBaseURL() . $_SERVER['REQUEST_URI']); $this->internalRedirect($_SERVER['REQUEST_URI']);
} }
logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG); logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);