Refactor deprecated App::internalRedirect() to DI::baseUrl()->redirect()
This commit is contained in:
parent
33dae7eb94
commit
99db3452e3
4 changed files with 10 additions and 7 deletions
|
@ -13,6 +13,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
|
use Friendica\DI;
|
||||||
use Friendica\Util\ConfigFileLoader;
|
use Friendica\Util\ConfigFileLoader;
|
||||||
use Friendica\Util\Proxy as ProxyUtils;
|
use Friendica\Util\Proxy as ProxyUtils;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
@ -34,8 +35,7 @@ function impressum_uninstall() {
|
||||||
function impressum_module() {
|
function impressum_module() {
|
||||||
}
|
}
|
||||||
function impressum_content() {
|
function impressum_content() {
|
||||||
$a = \get_app();
|
DI::baseUrl()->redirect('friendica/');
|
||||||
$a->internalRedirect('friendica/');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function obfuscate_email ($s) {
|
function obfuscate_email ($s) {
|
||||||
|
|
|
@ -15,6 +15,7 @@ use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
|
use Friendica\DI;
|
||||||
use Friendica\Util\Emailer;
|
use Friendica\Util\Emailer;
|
||||||
|
|
||||||
function notifyall_install()
|
function notifyall_install()
|
||||||
|
@ -96,7 +97,7 @@ function notifyall_post(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
notice(L10n::t('Emails sent'));
|
notice(L10n::t('Emails sent'));
|
||||||
$a->internalRedirect('admin');
|
DI::baseUrl()->redirect('admin');
|
||||||
}
|
}
|
||||||
|
|
||||||
function notifyall_content(&$a)
|
function notifyall_content(&$a)
|
||||||
|
|
|
@ -50,6 +50,7 @@ use Friendica\Core\PConfig;
|
||||||
use Friendica\Core\Protocol;
|
use Friendica\Core\Protocol;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
use Friendica\DI;
|
||||||
use Friendica\Model\Contact;
|
use Friendica\Model\Contact;
|
||||||
use Friendica\Model\Group;
|
use Friendica\Model\Group;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
|
@ -167,7 +168,7 @@ function statusnet_settings_post(App $a, $post)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$a->internalRedirect('settings/connectors');
|
DI::baseUrl()->redirect('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
|
||||||
|
@ -195,7 +196,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$a->internalRedirect('settings/connectors');
|
DI::baseUrl()->redirect('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
|
||||||
|
@ -213,7 +214,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
|
||||||
$a->internalRedirect('settings/connectors');
|
DI::baseUrl()->redirect('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
|
||||||
|
|
|
@ -78,6 +78,7 @@ use Friendica\Core\Protocol;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
use Friendica\DI;
|
||||||
use Friendica\Model\Contact;
|
use Friendica\Model\Contact;
|
||||||
use Friendica\Model\Conversation;
|
use Friendica\Model\Conversation;
|
||||||
use Friendica\Model\Group;
|
use Friendica\Model\Group;
|
||||||
|
@ -263,7 +264,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
|
||||||
$a->internalRedirect('settings/connectors');
|
DI::baseUrl()->redirect('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