Merge pull request #763 from nupplaphil/replacing_goaway
Bugfix - Replacing goaway()
This commit is contained in:
commit
d3ab209676
6 changed files with 8 additions and 8 deletions
|
@ -85,7 +85,7 @@ function blackout_redirect ($a, $b) {
|
||||||
}
|
}
|
||||||
if (( $date1 <= $now ) && ( $now <= $date2 )) {
|
if (( $date1 <= $now ) && ( $now <= $date2 )) {
|
||||||
logger('redirecting user to blackout page');
|
logger('redirecting user to blackout page');
|
||||||
goaway($myurl);
|
System::externalRedirect($myurl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ function impressum_module() {
|
||||||
}
|
}
|
||||||
function impressum_content() {
|
function impressum_content() {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
goaway('friendica/');
|
$a->internalRedirect('friendica/');
|
||||||
}
|
}
|
||||||
|
|
||||||
function obfuscate_email ($s) {
|
function obfuscate_email ($s) {
|
||||||
|
|
|
@ -93,7 +93,7 @@ function notifyall_post(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
notice(L10n::t('Emails sent'));
|
notice(L10n::t('Emails sent'));
|
||||||
goaway('admin');
|
$a->internalRedirect('admin');
|
||||||
}
|
}
|
||||||
|
|
||||||
function notifyall_content(&$a)
|
function notifyall_content(&$a)
|
||||||
|
|
|
@ -31,7 +31,7 @@ function startpage_home_init($a, $b)
|
||||||
|
|
||||||
$page = PConfig::get(local_user(), 'startpage', 'startpage');
|
$page = PConfig::get(local_user(), 'startpage', 'startpage');
|
||||||
if (strlen($page)) {
|
if (strlen($page)) {
|
||||||
goaway($page);
|
$a->internalRedirect($page);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,7 +160,7 @@ function statusnet_settings_post(App $a, $post)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
goaway('settings/connectors');
|
$a->internalRedirect('settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
if (isset($_POST['statusnet-consumersecret'])) {
|
if (isset($_POST['statusnet-consumersecret'])) {
|
||||||
// check if we can reach the API of the GNU Social server
|
// check if we can reach the API of the GNU Social server
|
||||||
|
@ -188,7 +188,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);
|
notice(L10n::t('We could not contact the GNU Social API with the Path you entered.') . EOL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
goaway('settings/connectors');
|
$a->internalRedirect('settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
if (isset($_POST['statusnet-pin'])) {
|
if (isset($_POST['statusnet-pin'])) {
|
||||||
// if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
|
// if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
|
||||||
|
@ -206,7 +206,7 @@ function statusnet_settings_post(App $a, $post)
|
||||||
PConfig::set(local_user(), 'statusnet', 'post', 1);
|
PConfig::set(local_user(), 'statusnet', 'post', 1);
|
||||||
PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
|
PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
|
||||||
// reload the Addon Settings page, if we don't do it see Bug #42
|
// reload the Addon Settings page, if we don't do it see Bug #42
|
||||||
goaway('settings/connectors');
|
$a->internalRedirect('settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
// if no PIN is supplied in the POST variables, the user has changed the setting
|
// 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
|
// to post a dent for every new __public__ posting to the wall
|
||||||
|
|
|
@ -258,7 +258,7 @@ function twitter_settings_post(App $a)
|
||||||
info($e->getMessage());
|
info($e->getMessage());
|
||||||
}
|
}
|
||||||
// reload the Addon Settings page, if we don't do it see Bug #42
|
// reload the Addon Settings page, if we don't do it see Bug #42
|
||||||
goaway('settings/connectors');
|
$a->internalRedirect('settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
// if no PIN is supplied in the POST variables, the user has changed the setting
|
// 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
|
// to post a tweet for every new __public__ posting to the wall
|
||||||
|
|
Loading…
Reference in a new issue