Replaced goaway() with System::redirectTo()

pull/750/head
Philipp Holzer 2018-10-13 20:05:05 +02:00
parent a95606a10a
commit 3d3a11fa46
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
5 changed files with 13 additions and 8 deletions

View File

@ -54,6 +54,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
function blackout_install() {
Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
@ -86,8 +87,8 @@ function blackout_redirect ($a, $b) {
$date2 = 0;
}
if (( $date1 <= $now ) && ( $now <= $date2 )) {
Logger::log('redirecting user to blackout page');
System::externalRedirect($myurl);
logger('redirecting user to blackout page');
System::redirectTo($myurl);
}
}

View File

@ -14,6 +14,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Util\Emailer;
function notifyall_install()
@ -95,7 +96,7 @@ function notifyall_post(App $a)
}
notice(L10n::t('Emails sent'));
$a->internalRedirect('admin');
System::redirectTo('admin');
}
function notifyall_content(&$a)

View File

@ -9,6 +9,7 @@
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
function startpage_install() {
Hook::register('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
@ -31,7 +32,7 @@ function startpage_home_init($a, $b)
$page = PConfig::get(local_user(), 'startpage', 'startpage');
if (strlen($page)) {
$a->internalRedirect($page);
System::redirectTo($page);
}
return;
}

View File

@ -48,6 +48,7 @@ use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
@ -163,7 +164,7 @@ function statusnet_settings_post(App $a, $post)
}
}
}
$a->internalRedirect('settings/connectors');
System::redirectTo('settings/connectors');
} else {
if (isset($_POST['statusnet-consumersecret'])) {
// check if we can reach the API of the GNU Social server
@ -191,7 +192,7 @@ function statusnet_settings_post(App $a, $post)
notice(L10n::t('We could not contact the GNU Social API with the Path you entered.') . EOL);
}
}
$a->internalRedirect('settings/connectors');
System::redirectTo('settings/connectors');
} else {
if (isset($_POST['statusnet-pin'])) {
// if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
@ -209,7 +210,7 @@ function statusnet_settings_post(App $a, $post)
PConfig::set(local_user(), 'statusnet', 'post', 1);
PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
// reload the Addon Settings page, if we don't do it see Bug #42
$a->internalRedirect('settings/connectors');
System::redirectTo('settings/connectors');
} else {
// if no PIN is supplied in the POST variables, the user has changed the setting
// to post a dent for every new __public__ posting to the wall

View File

@ -75,6 +75,7 @@ use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@ -260,7 +261,7 @@ function twitter_settings_post(App $a)
info($e->getMessage());
}
// reload the Addon Settings page, if we don't do it see Bug #42
$a->internalRedirect('settings/connectors');
System::redirectTo('settings/connectors');
} else {
// if no PIN is supplied in the POST variables, the user has changed the setting
// to post a tweet for every new __public__ posting to the wall