From: Philipp Holzer Date: Sat, 13 Oct 2018 18:05:05 +0000 (+0200) Subject: Replaced goaway() with System::redirectTo() X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3d3a11fa46084f3a6e6e79d9000d4ca15dd1b86b;p=friendica-addons.git Replaced goaway() with System::redirectTo() --- diff --git a/blackout/blackout.php b/blackout/blackout.php index 68854200..79b3fc92 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -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); } } diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index 51c426cc..d739649e 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -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) diff --git a/startpage/startpage.php b/startpage/startpage.php index 82ae1eb0..b882c240 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -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; } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 93fc874f..61e76a0c 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -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 diff --git a/twitter/twitter.php b/twitter/twitter.php index f05fc1f2..fe23ac0d 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -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