Split goaway to System::externalRedirectTo() and App->internalRedirect()

This commit is contained in:
Philipp Holzer 2018-10-19 20:11:27 +02:00
parent 2ef81108b3
commit d00ddc01af
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
61 changed files with 286 additions and 266 deletions

View File

@ -4810,8 +4810,7 @@ function api_friendica_remoteauth()
logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG); logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
$dest = ($url ? '&destination_url=' . $url : ''); $dest = ($url ? '&destination_url=' . $url : '');
$app = get_app(); System::externalRedirect((
$app->redirect(
$contact['poll'] . '?dfrn_id=' . $dfrn_id $contact['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&type=profile&sec=' . $sec . $dest . '&type=profile&sec=' . $sec . $dest

View File

@ -354,7 +354,7 @@ function drop_item($id)
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
notice(L10n::t('Item not found.') . EOL); notice(L10n::t('Item not found.') . EOL);
$a->redirect('network'); $a->internalRedirect('network');
} }
if ($item['deleted']) { if ($item['deleted']) {
@ -401,17 +401,17 @@ function drop_item($id)
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) { if (!empty($_REQUEST['canceled'])) {
$a->redirect('display/' . $item['guid']); $a->internalRedirect('display/' . $item['guid']);
} }
// delete the item // delete the item
Item::deleteForUser(['id' => $item['id']], local_user()); Item::deleteForUser(['id' => $item['id']], local_user());
$a->redirect('network'); $a->internalRedirect('network');
//NOTREACHED //NOTREACHED
} else { } else {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
$a->redirect('display/' . $item['guid']); $a->internalRedirect('display/' . $item['guid']);
//NOTREACHED //NOTREACHED
} }
} }

View File

@ -82,7 +82,7 @@ function admin_post(App $a)
if ($a->isAjax()) { if ($a->isAjax()) {
return; return;
} }
$a->redirect('admin/'); $a->internalRedirect('admin/');
return; return;
} }
@ -135,7 +135,7 @@ function admin_post(App $a)
} }
} }
$a->redirect($return_path); $a->internalRedirect($return_path);
return; // NOTREACHED return; // NOTREACHED
} }
@ -340,7 +340,7 @@ function admin_page_tos_post(App $a)
Config::set('system', 'tosprivstatement', $displayprivstatement); Config::set('system', 'tosprivstatement', $displayprivstatement);
Config::set('system', 'tostext', $tostext); Config::set('system', 'tostext', $tostext);
$a->redirect('admin/tos'); $a->internalRedirect('admin/tos');
return; // NOTREACHED return; // NOTREACHED
} }
@ -429,7 +429,7 @@ function admin_page_blocklist_post(App $a)
Config::set('system', 'blocklist', $blocklist); Config::set('system', 'blocklist', $blocklist);
info(L10n::t('Site blocklist updated.') . EOL); info(L10n::t('Site blocklist updated.') . EOL);
} }
$a->redirect('admin/blocklist'); $a->internalRedirect('admin/blocklist');
return; // NOTREACHED return; // NOTREACHED
} }
@ -461,7 +461,7 @@ function admin_page_contactblock_post(App $a)
} }
notice(L10n::tt("%s contact unblocked", "%s contacts unblocked", count($contacts))); notice(L10n::tt("%s contact unblocked", "%s contacts unblocked", count($contacts)));
} }
$a->redirect('admin/contactblock'); $a->internalRedirect('admin/contactblock');
return; // NOTREACHED return; // NOTREACHED
} }
@ -569,7 +569,7 @@ function admin_page_deleteitem_post(App $a)
} }
info(L10n::t('Item marked for deletion.') . EOL); info(L10n::t('Item marked for deletion.') . EOL);
$a->redirect('admin/deleteitem'); $a->internalRedirect('admin/deleteitem');
return; // NOTREACHED return; // NOTREACHED
} }
@ -965,7 +965,7 @@ function admin_page_site_post(App $a)
$parsed = @parse_url($new_url); $parsed = @parse_url($new_url);
if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) { if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) {
notice(L10n::t("Can not parse base url. Must have at least <scheme>://<domain>")); notice(L10n::t("Can not parse base url. Must have at least <scheme>://<domain>"));
$a->redirect('admin/site'); $a->internalRedirect('admin/site');
} }
/* steps: /* steps:
@ -973,13 +973,13 @@ function admin_page_site_post(App $a)
* send relocate for every local user * send relocate for every local user
* */ * */
$old_url = System::baseUrl(true); $old_url = $a->getBaseURL(true);
// Generate host names for relocation the addresses in the format user@address.tld // Generate host names for relocation the addresses in the format user@address.tld
$new_host = str_replace("http://", "@", normalise_link($new_url)); $new_host = str_replace("http://", "@", normalise_link($new_url));
$old_host = str_replace("http://", "@", normalise_link($old_url)); $old_host = str_replace("http://", "@", normalise_link($old_url));
function update_table($table_name, $fields, $old_url, $new_url) function update_table(App $a, $table_name, $fields, $old_url, $new_url)
{ {
$dbold = DBA::escape($old_url); $dbold = DBA::escape($old_url);
$dbnew = DBA::escape($new_url); $dbnew = DBA::escape($new_url);
@ -995,20 +995,20 @@ function admin_page_site_post(App $a)
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice("Failed updating '$table_name': " . DBA::errorMessage()); notice("Failed updating '$table_name': " . DBA::errorMessage());
$a->redirect('admin/site'); $a->internalRedirect('admin/site');
} }
} }
// update tables // update tables
// update profile links in the format "http://server.tld" // update profile links in the format "http://server.tld"
update_table("profile", ['photo', 'thumb'], $old_url, $new_url); update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url);
update_table("term", ['url'], $old_url, $new_url); update_table($a, "term", ['url'], $old_url, $new_url);
update_table("contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url); update_table($a, "contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url);
update_table("gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url); update_table($a, "gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url);
update_table("item", ['owner-link', 'author-link', 'body', 'plink', 'tag'], $old_url, $new_url); update_table($a, "item", ['owner-link', 'author-link', 'body', 'plink', 'tag'], $old_url, $new_url);
// update profile addresses in the format "user@server.tld" // update profile addresses in the format "user@server.tld"
update_table("contact", ['addr'], $old_host, $new_host); update_table($a, "contact", ['addr'], $old_host, $new_host);
update_table("gcontact", ['connect', 'addr'], $old_host, $new_host); update_table($a, "gcontact", ['connect', 'addr'], $old_host, $new_host);
// update config // update config
Config::set('system', 'hostname', parse_url($new_url, PHP_URL_HOST)); Config::set('system', 'hostname', parse_url($new_url, PHP_URL_HOST));
@ -1024,7 +1024,7 @@ function admin_page_site_post(App $a)
info("Relocation started. Could take a while to complete."); info("Relocation started. Could take a while to complete.");
$a->redirect('admin/site'); $a->internalRedirect('admin/site');
} }
// end relocate // end relocate
@ -1298,7 +1298,7 @@ function admin_page_site_post(App $a)
Config::set('system', 'rino_encrypt', $rino); Config::set('system', 'rino_encrypt', $rino);
info(L10n::t('Site settings updated.') . EOL); info(L10n::t('Site settings updated.') . EOL);
$a->redirect('admin/site'); $a->internalRedirect('admin/site');
return; // NOTREACHED return; // NOTREACHED
} }
@ -1570,7 +1570,7 @@ function admin_page_dbsync(App $a)
Config::set('system', 'build', intval($curr) + 1); Config::set('system', 'build', intval($curr) + 1);
} }
info(L10n::t('Update has been marked successful') . EOL); info(L10n::t('Update has been marked successful') . EOL);
$a->redirect('admin/dbsync'); $a->internalRedirect('admin/dbsync');
} }
if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) { if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) {
@ -1745,7 +1745,7 @@ function admin_page_users_post(App $a)
user_deny($hash); user_deny($hash);
} }
} }
$a->redirect('admin/users'); $a->internalRedirect('admin/users');
return; // NOTREACHED return; // NOTREACHED
} }
@ -1768,7 +1768,7 @@ function admin_page_users(App $a)
$user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]); $user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {
notice('User not found' . EOL); notice('User not found' . EOL);
$a->redirect('admin/users'); $a->internalRedirect('admin/users');
return ''; // NOTREACHED return ''; // NOTREACHED
} }
switch ($a->argv[2]) { switch ($a->argv[2]) {
@ -1788,7 +1788,7 @@ function admin_page_users(App $a)
notice(sprintf(($user['blocked'] ? L10n::t("User '%s' unblocked") : L10n::t("User '%s' blocked")), $user['username']) . EOL); notice(sprintf(($user['blocked'] ? L10n::t("User '%s' unblocked") : L10n::t("User '%s' blocked")), $user['username']) . EOL);
break; break;
} }
$a->redirect('admin/users'); $a->internalRedirect('admin/users');
return ''; // NOTREACHED return ''; // NOTREACHED
} }
@ -1986,7 +1986,7 @@ function admin_page_addons(App $a)
info(L10n::t("Addon %s enabled.", $addon)); info(L10n::t("Addon %s enabled.", $addon));
} }
Config::set("system", "addon", implode(", ", $a->addons)); Config::set("system", "addon", implode(", ", $a->addons));
$a->redirect('admin/addons'); $a->internalRedirect('admin/addons');
return ''; // NOTREACHED return ''; // NOTREACHED
} }
@ -2045,7 +2045,7 @@ function admin_page_addons(App $a)
BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't'); BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't');
Addon::reload(); Addon::reload();
info("Addons reloaded"); info("Addons reloaded");
$a->redirect('admin/addons'); $a->internalRedirect('admin/addons');
} }
$addons = []; $addons = [];
@ -2235,7 +2235,7 @@ function admin_page_themes(App $a)
} }
Config::set('system', 'allowed_themes', $s); Config::set('system', 'allowed_themes', $s);
$a->redirect('admin/themes'); $a->internalRedirect('admin/themes');
return ''; // NOTREACHED return ''; // NOTREACHED
} }
@ -2316,7 +2316,7 @@ function admin_page_themes(App $a)
} }
} }
info("Themes reloaded"); info("Themes reloaded");
$a->redirect('admin/themes'); $a->internalRedirect('admin/themes');
} }
/* /*
@ -2365,7 +2365,7 @@ function admin_page_logs_post(App $a)
} }
info(L10n::t("Log settings updated.")); info(L10n::t("Log settings updated."));
$a->redirect('admin/logs'); $a->internalRedirect('admin/logs');
return; // NOTREACHED return; // NOTREACHED
} }
@ -2513,7 +2513,7 @@ function admin_page_features_post(App $a)
} }
} }
$a->redirect('admin/features'); $a->internalRedirect('admin/features');
return; // NOTREACHED return; // NOTREACHED
} }

View File

@ -77,7 +77,7 @@ function api_content(App $a)
if (strstr($consumer->callback_url, $glue)) { if (strstr($consumer->callback_url, $glue)) {
$glue = "?"; $glue = "?";
} }
$a->redirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier)); $a->internalRedirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier));
killme(); killme();
} }

View File

@ -301,7 +301,7 @@ function cal_content(App $a)
// Respect the export feature setting for all other /cal pages if it's not the own profile // Respect the export feature setting for all other /cal pages if it's not the own profile
if ((local_user() !== intval($owner_uid)) && !Feature::isEnabled($owner_uid, "export_calendar")) { if ((local_user() !== intval($owner_uid)) && !Feature::isEnabled($owner_uid, "export_calendar")) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
$a->redirect('cal/' . $nick); $a->internalRedirect('cal/' . $nick);
} }
// Get the export data by uid // Get the export data by uid
@ -322,7 +322,7 @@ function cal_content(App $a)
$return_path = "cal/" . $nick; $return_path = "cal/" . $nick;
} }
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
// If nothing went wrong we can echo the export content // If nothing went wrong we can echo the export content

View File

@ -62,7 +62,7 @@ function delegate_content(App $a)
if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) { if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions // delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) { if (x($_SESSION, 'submanage')) {
$a->redirect('delegate'); $a->internalRedirect('delegate');
} }
$user_id = $a->argv[2]; $user_id = $a->argv[2];
@ -77,17 +77,17 @@ function delegate_content(App $a)
DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]); DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
} }
} }
$a->redirect('delegate'); $a->internalRedirect('delegate');
} }
if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) { if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions // delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) { if (x($_SESSION, 'submanage')) {
$a->redirect('delegate'); $a->internalRedirect('delegate');
} }
DBA::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]); DBA::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
$a->redirect('delegate'); $a->internalRedirect('delegate');
} }
// find everybody that currently has delegated management to this account/page // find everybody that currently has delegated management to this account/page

View File

@ -400,7 +400,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
// Let's send our user to the contact editor in case they want to // Let's send our user to the contact editor in case they want to
// do anything special with this new friend. // do anything special with this new friend.
if ($handsfree === null) { if ($handsfree === null) {
$a->redirect('contact/' . intval($contact_id)); $a->internalRedirect('contact/' . intval($contact_id));
} else { } else {
return; return;
} }
@ -620,6 +620,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
} }
// somebody arrived here by mistake or they are fishing. Send them to the homepage. // somebody arrived here by mistake or they are fishing. Send them to the homepage.
$a->redirect(); $a->internalRedirect();
// NOTREACHED // NOTREACHED
} }

View File

@ -90,7 +90,7 @@ function dfrn_poll_init(App $a)
$my_id = '0:' . $dfrn_id; $my_id = '0:' . $dfrn_id;
break; break;
default: default:
$a->redirect(); $a->internalRedirect();
break; // NOTREACHED break; // NOTREACHED
} }
@ -109,7 +109,7 @@ function dfrn_poll_init(App $a)
if (strlen($s)) { if (strlen($s)) {
$xml = XML::parseString($s); $xml = XML::parseString($s);
if ((int) $xml->status === 1) { if ((int)$xml->status === 1) {
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
if (!x($_SESSION, 'remote')) { if (!x($_SESSION, 'remote')) {
$_SESSION['remote'] = []; $_SESSION['remote'] = [];
@ -135,10 +135,15 @@ function dfrn_poll_init(App $a)
); );
} }
} }
$profile = $r[0]['nickname'];
$a->redirect((strlen($destination_url)) ? $destination_url : 'profile/' . $profile); $profile = (count($r) > 0 && isset($r[0]['nickname']) ? $r[0]['nickname'] : '');
if (!empty($destination_url)) {
System::externalRedirect($destination_url);
} else {
$a->internalRedirect('profile/' . $profile);
}
} }
$a->redirect(); $a->internalRedirect();
} }
if ($type === 'profile-check' && $dfrn_version < 2.2) { if ($type === 'profile-check' && $dfrn_version < 2.2) {
@ -325,7 +330,7 @@ function dfrn_poll_post(App $a)
$my_id = '0:' . $dfrn_id; $my_id = '0:' . $dfrn_id;
break; break;
default: default:
$a->redirect(); $a->internalRedirect();
break; // NOTREACHED break; // NOTREACHED
} }
@ -446,7 +451,7 @@ function dfrn_poll_content(App $a)
$my_id = '0:' . $dfrn_id; $my_id = '0:' . $dfrn_id;
break; break;
default: default:
$a->redirect(); $a->internalRedirect();
break; // NOTREACHED break; // NOTREACHED
} }
@ -505,25 +510,6 @@ function dfrn_poll_content(App $a)
])->getBody(); ])->getBody();
} }
$profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
switch ($destination_url) {
case 'profile':
$dest = 'profile/' . $profile . '?f=&tab=profile';
break;
case 'photos':
$dest = 'photos/' . $profile;
break;
case 'status':
case '':
$dest = 'profile/' . $profile;
break;
default:
$appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
$dest = $destination_url . $appendix;
break;
}
logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA); logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
if (strlen($s) && strstr($s, '<?xml')) { if (strlen($s) && strstr($s, '<?xml')) {
@ -557,10 +543,26 @@ function dfrn_poll_content(App $a)
DBA::escape($session_id) DBA::escape($session_id)
); );
} }
$a->redirect($dest);
} }
$a->redirect($dest);
$profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
switch ($destination_url) {
case 'profile':
$a->internalRedirect('profile/' . $profile . '?f=&tab=profile';
break;
case 'photos':
$a->internalRedirect('photos/' . $profile;
break;
case 'status':
case '':
$a->internalRedirect('profile/' . $profile;
break;
default:
$appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
System::externalRedirect($destination_url . $appendix);
break;
}
// NOTREACHED // NOTREACHED
} else { } else {
// XML reply // XML reply

View File

@ -62,7 +62,7 @@ function dfrn_request_post(App $a)
} }
if (x($_POST, 'cancel')) { if (x($_POST, 'cancel')) {
$a->redirect(); $a->internalRedirect();
} }
/* /*
@ -188,14 +188,14 @@ function dfrn_request_post(App $a)
} }
// (ignore reply, nothing we can do it failed) // (ignore reply, nothing we can do it failed)
$a->redirect($forwardurl); $a->internalRedirect($forwardurl);
return; // NOTREACHED return; // NOTREACHED
} }
} }
// invalid/bogus request // invalid/bogus request
notice(L10n::t('Unrecoverable protocol error.') . EOL); notice(L10n::t('Unrecoverable protocol error.') . EOL);
$a->redirect(); $a->internalRedirect();
return; // NOTREACHED return; // NOTREACHED
} }
@ -331,19 +331,19 @@ function dfrn_request_post(App $a)
$url = Network::isUrlValid($url); $url = Network::isUrlValid($url);
if (!$url) { if (!$url) {
notice(L10n::t('Invalid profile URL.') . EOL); notice(L10n::t('Invalid profile URL.') . EOL);
$a->redirect($a->cmd); $a->internalRedirect($a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
if (!Network::isUrlAllowed($url)) { if (!Network::isUrlAllowed($url)) {
notice(L10n::t('Disallowed profile URL.') . EOL); notice(L10n::t('Disallowed profile URL.') . EOL);
$a->redirect($a->cmd); $a->internalRedirect($a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
if (Network::isUrlBlocked($url)) { if (Network::isUrlBlocked($url)) {
notice(L10n::t('Blocked domain') . EOL); notice(L10n::t('Blocked domain') . EOL);
$a->redirect($a->cmd); $a->internalRedirect($a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
@ -351,7 +351,7 @@ function dfrn_request_post(App $a)
if (!count($parms)) { if (!count($parms)) {
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL); notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
$a->redirect($a->cmd); $a->internalRedirect($a->cmd);
} else { } else {
if (!x($parms, 'fn')) { if (!x($parms, 'fn')) {
notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL); notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
@ -433,10 +433,10 @@ function dfrn_request_post(App $a)
} }
// "Homecoming" - send the requestor back to their site to record the introduction. // "Homecoming" - send the requestor back to their site to record the introduction.
$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname); $dfrn_url = bin2hex($a->getBaseURL() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0); $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
$a->redirect($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" System::externalRedirect($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&confirm_key=' . $hash . '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "") . (($aes_allow) ? "&aes_allow=1" : "")
@ -463,7 +463,7 @@ function dfrn_request_post(App $a)
} }
$url = str_replace('{uri}', $uri, $url); $url = str_replace('{uri}', $uri, $url);
$a->redirect($url); System::externalRedirect($url);
// NOTREACHED // NOTREACHED
// END $network != Protocol::PHANTOM // END $network != Protocol::PHANTOM
} else { } else {

View File

@ -79,7 +79,7 @@ function display_init(App $a)
} }
if (ActivityPub::isRequest()) { if (ActivityPub::isRequest()) {
$a->redirect(str_replace('display/', 'objects/', $a->query_string)); $a->internalRedirect(str_replace('display/', 'objects/', $a->query_string));
} }
if ($item["id"] != $item["parent"]) { if ($item["id"] != $item["parent"]) {

View File

@ -108,7 +108,7 @@ function events_post(App $a)
echo L10n::t('Event can not end before it has started.'); echo L10n::t('Event can not end before it has started.');
killme(); killme();
} }
$a->redirect($onerror_url); $a->internalRedirect($onerror_url);
} }
if (!$summary || ($start === NULL_DATE)) { if (!$summary || ($start === NULL_DATE)) {
@ -117,7 +117,7 @@ function events_post(App $a)
echo L10n::t('Event title and start time are required.'); echo L10n::t('Event title and start time are required.');
killme(); killme();
} }
$a->redirect($onerror_url); $a->internalRedirect($onerror_url);
} }
$share = intval(defaults($_POST, 'share', 0)); $share = intval(defaults($_POST, 'share', 0));
@ -187,7 +187,7 @@ function events_post(App $a)
Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id); Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
} }
$a->redirect('events'); $a->internalRedirect('events');
} }
function events_content(App $a) function events_content(App $a)
@ -577,6 +577,6 @@ function events_content(App $a)
info(L10n::t('Event removed') . EOL); info(L10n::t('Event removed') . EOL);
} }
$a->redirect('events'); $a->internalRedirect('events');
} }
} }

View File

@ -25,7 +25,7 @@ function filerm_content(App $a) {
file_tag_unsave_file(local_user(),$item_id,$term, $category); file_tag_unsave_file(local_user(),$item_id,$term, $category);
} }
//$a->redirect('network'); //$a->internalRedirect('network');
killme(); killme();
} }

View File

@ -20,7 +20,7 @@ function follow_post(App $a)
} }
if (isset($_REQUEST['cancel'])) { if (isset($_REQUEST['cancel'])) {
$a->redirect('contacts'); $a->internalRedirect('contacts');
} }
$uid = local_user(); $uid = local_user();
@ -37,14 +37,14 @@ function follow_post(App $a)
if ($result['message']) { if ($result['message']) {
notice($result['message']); notice($result['message']);
} }
$a->redirect($return_url); $a->internalRedirect($return_url);
} elseif ($result['cid']) { } elseif ($result['cid']) {
$a->redirect('contact/' . $result['cid']); $a->internalRedirect('contact/' . $result['cid']);
} }
info(L10n::t('The contact could not be added.')); info(L10n::t('The contact could not be added.'));
$a->redirect($return_url); $a->internalRedirect($return_url);
// NOTREACHED // NOTREACHED
} }
@ -54,7 +54,7 @@ function follow_content(App $a)
if (!local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
$a->redirect($return_url); $a->internalRedirect($return_url);
// NOTREACHED // NOTREACHED
} }
@ -74,7 +74,7 @@ function follow_content(App $a)
if ($r[0]['pending']) { if ($r[0]['pending']) {
notice(L10n::t('You already added this contact.')); notice(L10n::t('You already added this contact.'));
$submit = ''; $submit = '';
//$a->redirect($_SESSION['return_url']); //$a->internalRedirect($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
} }
@ -84,21 +84,21 @@ function follow_content(App $a)
if (($ret['network'] == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) { if (($ret['network'] == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
notice(L10n::t("Diaspora support isn't enabled. Contact can't be added.")); notice(L10n::t("Diaspora support isn't enabled. Contact can't be added."));
$submit = ''; $submit = '';
//$a->redirect($_SESSION['return_url']); //$a->internalRedirect($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
if (($ret['network'] == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) { if (($ret['network'] == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
notice(L10n::t("OStatus support is disabled. Contact can't be added.")); notice(L10n::t("OStatus support is disabled. Contact can't be added."));
$submit = ''; $submit = '';
//$a->redirect($_SESSION['return_url']); //$a->internalRedirect($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
if ($ret['network'] == Protocol::PHANTOM) { if ($ret['network'] == Protocol::PHANTOM) {
notice(L10n::t("The network type couldn't be detected. Contact can't be added.")); notice(L10n::t("The network type couldn't be detected. Contact can't be added."));
$submit = ''; $submit = '';
//$a->redirect($_SESSION['return_url']); //$a->internalRedirect($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
@ -118,7 +118,7 @@ function follow_content(App $a)
if (!$r) { if (!$r) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
$a->redirect($return_url); $a->internalRedirect($return_url);
// NOTREACHED // NOTREACHED
} }

View File

@ -38,12 +38,12 @@ function group_post(App $a) {
info(L10n::t('Group created.') . EOL); info(L10n::t('Group created.') . EOL);
$r = Model\Group::getIdByName(local_user(), $name); $r = Model\Group::getIdByName(local_user(), $name);
if ($r) { if ($r) {
$a->redirect('group/' . $r); $a->internalRedirect('group/' . $r);
} }
} else { } else {
notice(L10n::t('Could not create group.') . EOL); notice(L10n::t('Could not create group.') . EOL);
} }
$a->redirect('group'); $a->internalRedirect('group');
return; // NOTREACHED return; // NOTREACHED
} }
@ -56,7 +56,7 @@ function group_post(App $a) {
); );
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL); notice(L10n::t('Group not found.') . EOL);
$a->redirect('contact'); $a->internalRedirect('contact');
return; // NOTREACHED return; // NOTREACHED
} }
$group = $r[0]; $group = $r[0];
@ -88,7 +88,7 @@ function group_content(App $a) {
// With no group number provided we jump to the unassigned contacts as a starting point // With no group number provided we jump to the unassigned contacts as a starting point
if ($a->argc == 1) { if ($a->argc == 1) {
$a->redirect('group/none'); $a->internalRedirect('group/none');
} }
// Switch to text mode interface if we have more than 'n' contacts or group members // Switch to text mode interface if we have more than 'n' contacts or group members
@ -159,7 +159,7 @@ function group_content(App $a) {
notice(L10n::t('Unable to remove group.') . EOL); notice(L10n::t('Unable to remove group.') . EOL);
} }
} }
$a->redirect('group'); $a->internalRedirect('group');
// NOTREACHED // NOTREACHED
} }
@ -183,7 +183,7 @@ function group_content(App $a) {
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL); notice(L10n::t('Group not found.') . EOL);
$a->redirect('contact'); $a->internalRedirect('contact');
} }
$group = $r[0]; $group = $r[0];

View File

@ -16,11 +16,11 @@ function home_init(App $a) {
Addon::callHooks('home_init',$ret); Addon::callHooks('home_init',$ret);
if (local_user() && ($a->user['nickname'])) { if (local_user() && ($a->user['nickname'])) {
$a->redirect('network'); $a->internalRedirect('network');
} }
if (strlen(Config::get('system','singleuser'))) { if (strlen(Config::get('system','singleuser'))) {
$a->redirect('profile/' . Config::get('system','singleuser')); $a->internalRedirect('profile/' . Config::get('system','singleuser'));
} }
}} }}

View File

@ -43,7 +43,7 @@ function ignored_init(App $a)
$rand = "?$rand"; $rand = "?$rand";
} }
$a->redirect($return_path . $rand); $a->internalRedirect($return_path . $rand);
} }
// the json doesn't really matter, it will either be 0 or 1 // the json doesn't really matter, it will either be 0 or 1

View File

@ -115,7 +115,7 @@ function item_post(App $a) {
if (!DBA::isResult($parent_item)) { if (!DBA::isResult($parent_item)) {
notice(L10n::t('Unable to locate original post.') . EOL); notice(L10n::t('Unable to locate original post.') . EOL);
if (!empty($_REQUEST['return'])) { if (!empty($_REQUEST['return'])) {
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
killme(); killme();
} }
@ -165,7 +165,7 @@ function item_post(App $a) {
notice(L10n::t('Permission denied.') . EOL) ; notice(L10n::t('Permission denied.') . EOL) ;
if (!empty($_REQUEST['return'])) { if (!empty($_REQUEST['return'])) {
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
killme(); killme();
@ -283,7 +283,7 @@ function item_post(App $a) {
} }
info(L10n::t('Empty post discarded.') . EOL); info(L10n::t('Empty post discarded.') . EOL);
if (!empty($_REQUEST['return'])) { if (!empty($_REQUEST['return'])) {
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
killme(); killme();
} }
@ -678,7 +678,7 @@ function item_post(App $a) {
if (!empty($datarray['cancel'])) { if (!empty($datarray['cancel'])) {
logger('mod_item: post cancelled by addon.'); logger('mod_item: post cancelled by addon.');
if ($return_path) { if ($return_path) {
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
$json = ['cancel' => 1]; $json = ['cancel' => 1];
@ -714,7 +714,7 @@ function item_post(App $a) {
if (!empty($_REQUEST['return']) && strlen($return_path)) { if (!empty($_REQUEST['return']) && strlen($return_path)) {
logger('return: ' . $return_path); logger('return: ' . $return_path);
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
killme(); killme();
} else { } else {
@ -729,14 +729,14 @@ function item_post(App $a) {
if (!$post_id) { if (!$post_id) {
logger("Item wasn't stored."); logger("Item wasn't stored.");
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
$datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]); $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
if (!DBA::isResult($datarray)) { if (!DBA::isResult($datarray)) {
logger("Item with id ".$post_id." couldn't be fetched."); logger("Item with id ".$post_id." couldn't be fetched.");
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
// update filetags in pconfig // update filetags in pconfig
@ -851,7 +851,7 @@ function item_post_return($baseurl, $api_source, $return_path)
} }
if ($return_path) { if ($return_path) {
$a->redirect($return_path); $a->internalRedirect($return_path);
} }
$json = ['success' => 1]; $json = ['success' => 1];

View File

@ -45,7 +45,7 @@ function like_content_return(App $a, $return_path) {
$rand = "?$rand"; $rand = "?$rand";
} }
$a->redirect($return_path . $rand); $a->internalRedirect($return_path . $rand);
} }
killme(); killme();

View File

@ -19,14 +19,14 @@ function lostpass_post(App $a)
{ {
$loginame = notags(trim($_POST['login-name'])); $loginame = notags(trim($_POST['login-name']));
if (!$loginame) { if (!$loginame) {
$a->redirect(); $a->internalRedirect();
} }
$condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame]; $condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame];
$user = DBA::selectFirst('user', ['uid', 'username', 'email', 'language'], $condition); $user = DBA::selectFirst('user', ['uid', 'username', 'email', 'language'], $condition);
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {
notice(L10n::t('No valid account found.') . EOL); notice(L10n::t('No valid account found.') . EOL);
$a->redirect(); $a->internalRedirect();
} }
$pwdreset_token = autoname(12) . mt_rand(1000, 9999); $pwdreset_token = autoname(12) . mt_rand(1000, 9999);
@ -78,7 +78,7 @@ function lostpass_post(App $a)
'body' => $body 'body' => $body
]); ]);
$a->redirect(); $a->internalRedirect();
} }
function lostpass_content(App $a) function lostpass_content(App $a)

View File

@ -119,7 +119,7 @@ function manage_post(App $a) {
$ret = []; $ret = [];
Addon::callHooks('home_init',$ret); Addon::callHooks('home_init',$ret);
$a->redirect('profile/' . $a->user['nickname'] ); $a->internalRedirect('profile/' . $a->user['nickname'] );
// NOTREACHED // NOTREACHED
} }

View File

@ -87,7 +87,7 @@ function message_post(App $a)
$a->argc = 2; $a->argc = 2;
$a->argv[1] = 'new'; $a->argv[1] = 'new';
} else { } else {
$a->redirect($a->cmd . '/' . $ret); $a->internalRedirect($a->cmd . '/' . $ret);
} }
} }
@ -155,7 +155,7 @@ function message_content(App $a)
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) { if (!empty($_REQUEST['canceled'])) {
$a->redirect('message'); $a->internalRedirect('message');
} }
$cmd = $a->argv[1]; $cmd = $a->argv[1];
@ -163,7 +163,7 @@ function message_content(App $a)
$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]); $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
if(!DBA::isResult($message)){ if(!DBA::isResult($message)){
info(L10n::t('Conversation not found.') . EOL); info(L10n::t('Conversation not found.') . EOL);
$a->redirect('message'); $a->internalRedirect('message');
} }
if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) { if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
@ -173,10 +173,10 @@ function message_content(App $a)
$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]); $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
if(!DBA::isResult($conversation)){ if(!DBA::isResult($conversation)){
info(L10n::t('Conversation removed.') . EOL); info(L10n::t('Conversation removed.') . EOL);
$a->redirect('message'); $a->internalRedirect('message');
} }
$a->redirect('message/' . $conversation['id'] ); $a->internalRedirect('message/' . $conversation['id'] );
} else { } else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]), intval($a->argv[2]),
@ -190,7 +190,7 @@ function message_content(App $a)
info(L10n::t('Conversation removed.') . EOL); info(L10n::t('Conversation removed.') . EOL);
} }
} }
$a->redirect('message'); $a->internalRedirect('message');
} }
} }

View File

@ -38,7 +38,7 @@ function network_init(App $a)
$search = (x($_GET, 'search') ? escape_tags($_GET['search']) : ''); $search = (x($_GET, 'search') ? escape_tags($_GET['search']) : '');
if (($search != '') && !empty($_GET['submit'])) { if (($search != '') && !empty($_GET['submit'])) {
$a->redirect('search?search=' . urlencode($search)); $a->internalRedirect('search?search=' . urlencode($search));
} }
if (x($_GET, 'save')) { if (x($_GET, 'save')) {
@ -140,7 +140,7 @@ function network_init(App $a)
$redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl); $redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl);
$a->redirect($redir_url); $a->internalRedirect($redir_url);
} }
} }
@ -618,7 +618,7 @@ function networkThreadedView(App $a, $update, $parent)
killme(); killme();
} }
notice(L10n::t('No such group') . EOL); notice(L10n::t('No such group') . EOL);
$a->redirect('network/0'); $a->internalRedirect('network/0');
// NOTREACHED // NOTREACHED
} }
@ -672,7 +672,7 @@ function networkThreadedView(App $a, $update, $parent)
} }
} else { } else {
notice(L10n::t('Invalid contact.') . EOL); notice(L10n::t('Invalid contact.') . EOL);
$a->redirect('network'); $a->internalRedirect('network');
// NOTREACHED // NOTREACHED
} }
} }

View File

@ -24,5 +24,5 @@ function nogroup_content(App $a)
return ''; return '';
} }
$a->redirect('group/none'); $a->internalRedirect('group/none');
} }

View File

@ -15,7 +15,7 @@ function notice_init(App $a)
$r = q("SELECT `user`.`nickname` FROM `user` LEFT JOIN `item` ON `item`.`uid` = `user`.`uid` WHERE `item`.`id` = %d", intval($id)); $r = q("SELECT `user`.`nickname` FROM `user` LEFT JOIN `item` ON `item`.`uid` = `user`.`uid` WHERE `item`.`id` = %d", intval($id));
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$nick = $r[0]['nickname']; $nick = $r[0]['nickname'];
$a->redirect('display/' . $nick . '/' . $id); $a->internalRedirect('display/' . $nick . '/' . $id);
} else { } else {
$a->error = 404; $a->error = 404;
notice(L10n::t('Item not found.') . EOL); notice(L10n::t('Item not found.') . EOL);

View File

@ -17,7 +17,7 @@ use Friendica\Module\Login;
function notifications_post(App $a) function notifications_post(App $a)
{ {
if (!local_user()) { if (!local_user()) {
$a->redirect(); $a->internalRedirect();
} }
$request_id = (($a->argc > 1) ? $a->argv[1] : 0); $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@ -52,12 +52,12 @@ function notifications_post(App $a)
'self' => false, 'blocked' => true, 'pending' => true]; 'self' => false, 'blocked' => true, 'pending' => true];
DBA::delete('contact', $condition); DBA::delete('contact', $condition);
} }
$a->redirect('notifications/intros'); $a->internalRedirect('notifications/intros');
} }
if ($_POST['submit'] == L10n::t('Ignore')) { if ($_POST['submit'] == L10n::t('Ignore')) {
DBA::update('intro', ['ignore' => true], ['id' => $intro_id]); DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
$a->redirect('notifications/intros'); $a->internalRedirect('notifications/intros');
} }
} }
} }

View File

@ -37,10 +37,10 @@ function notify_init(App $a)
} }
} }
$a->redirect($note['link']); System::externalRedirect($note['link']);
} }
$a->redirect(); $a->internalRedirect();
} }
if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') { if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {

View File

@ -14,7 +14,7 @@ function openid_content(App $a) {
$noid = Config::get('system','no_openid'); $noid = Config::get('system','no_openid');
if($noid) if($noid)
$a->redirect(); $a->internalRedirect();
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA); logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
@ -28,7 +28,7 @@ function openid_content(App $a) {
if(! strlen($authid)) { if(! strlen($authid)) {
logger(L10n::t('OpenID protocol error. No ID returned.') . EOL); logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
$a->redirect(); $a->internalRedirect();
} }
// NOTE: we search both for normalised and non-normalised form of $authid // NOTE: we search both for normalised and non-normalised form of $authid
@ -56,7 +56,7 @@ function openid_content(App $a) {
// just in case there was no return url set // just in case there was no return url set
// and we fell through // and we fell through
$a->redirect(); $a->internalRedirect();
} }
// Successful OpenID login - but we can't match it to an existing account. // Successful OpenID login - but we can't match it to an existing account.
@ -64,7 +64,7 @@ function openid_content(App $a) {
if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) { if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL); notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
$a->redirect(); $a->internalRedirect();
} }
unset($_SESSION['register']); unset($_SESSION['register']);
@ -108,12 +108,12 @@ function openid_content(App $a) {
$args .= '&openid_url=' . urlencode(notags(trim($authid))); $args .= '&openid_url=' . urlencode(notags(trim($authid)));
$a->redirect('register?' . $args); $a->internalRedirect('register?' . $args);
// NOTREACHED // NOTREACHED
} }
} }
notice(L10n::t('Login failed.') . EOL); notice(L10n::t('Login failed.') . EOL);
$a->redirect(); $a->internalRedirect();
// NOTREACHED // NOTREACHED
} }

View File

@ -15,7 +15,7 @@ function ostatus_subscribe_content(App $a) {
if (! local_user()) { if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
$a->redirect('ostatus_subscribe'); $a->internalRedirect('ostatus_subscribe');
// NOTREACHED // NOTREACHED
} }

View File

@ -196,7 +196,7 @@ function photos_post(App $a)
$album = hex2bin($a->argv[3]); $album = hex2bin($a->argv[3]);
if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) { if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -207,13 +207,13 @@ function photos_post(App $a)
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(L10n::t('Album not found.') . EOL); notice(L10n::t('Album not found.') . EOL);
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
// Check if the user has responded to a delete confirmation query // Check if the user has responded to a delete confirmation query
if (!empty($_REQUEST['canceled'])) { if (!empty($_REQUEST['canceled'])) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }
// RENAME photo album // RENAME photo album
@ -227,7 +227,7 @@ function photos_post(App $a)
// Update the photo albums cache // Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid); Photo::clearAlbumCache($page_owner_uid);
$a->redirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum)); $a->internalRedirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum));
return; // NOTREACHED return; // NOTREACHED
} }
@ -280,7 +280,7 @@ function photos_post(App $a)
$res[] = "'" . DBA::escape($rr['rid']) . "'" ; $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
} }
} else { } else {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -298,14 +298,14 @@ function photos_post(App $a)
Photo::clearAlbumCache($page_owner_uid); Photo::clearAlbumCache($page_owner_uid);
} }
$a->redirect('photos/' . $a->data['user']['nickname']); $a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED return; // NOTREACHED
} }
// Check if the user has responded to a delete confirmation query for a single photo // Check if the user has responded to a delete confirmation query for a single photo
if ($a->argc > 2 && !empty($_REQUEST['canceled'])) { if ($a->argc > 2 && !empty($_REQUEST['canceled'])) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }
if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) { if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) {
@ -355,7 +355,7 @@ function photos_post(App $a)
Photo::clearAlbumCache($page_owner_uid); Photo::clearAlbumCache($page_owner_uid);
} }
$a->redirect('photos/' . $a->data['user']['nickname']); $a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -696,7 +696,7 @@ function photos_post(App $a)
} }
} }
} }
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -927,7 +927,7 @@ function photos_post(App $a)
// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
// if they do not wish to be redirected // if they do not wish to be redirected
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
} }

View File

@ -34,7 +34,7 @@ function profile_init(App $a)
} else { } else {
$r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1"); $r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$a->redirect('profile/' . $r[0]['nickname']); $a->internalRedirect('profile/' . $r[0]['nickname']);
} else { } else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG); logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
notice(L10n::t('Requested profile is not available.') . EOL); notice(L10n::t('Requested profile is not available.') . EOL);

View File

@ -74,7 +74,7 @@ function profile_photo_post(App $a)
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", DBA::escape($image_id), $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", DBA::escape($image_id),
DBA::escape(local_user()), intval($scale)); DBA::escape(local_user()), intval($scale));
$url = System::baseUrl() . '/profile/' . $a->user['nickname']; $url = 'profile/' . $a->user['nickname'];
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$base_image = $r[0]; $base_image = $r[0];
@ -135,7 +135,7 @@ function profile_photo_post(App $a)
} }
} }
$a->redirect($url); $a->internalRedirect($url);
return; // NOTREACHED return; // NOTREACHED
} }
@ -168,7 +168,7 @@ function profile_photo_post(App $a)
@unlink($src); @unlink($src);
$imagecrop = profile_photo_crop_ui_head($a, $ph); $imagecrop = profile_photo_crop_ui_head($a, $ph);
$a->redirect('profile_photo/use/' . $imagecrop['hash']); $a->internalRedirect('profile_photo/use/' . $imagecrop['hash']);
} }
function profile_photo_content(App $a) function profile_photo_content(App $a)
@ -225,7 +225,7 @@ function profile_photo_content(App $a)
Worker::add(PRIORITY_LOW, "Directory", $url); Worker::add(PRIORITY_LOW, "Directory", $url);
} }
$a->redirect('profile/' . $a->user['nickname']); $a->internalRedirect('profile/' . $a->user['nickname']);
return; // NOTREACHED return; // NOTREACHED
} }
$ph = new Image($r[0]['data'], $r[0]['type']); $ph = new Image($r[0]['data'], $r[0]['type']);

View File

@ -38,7 +38,7 @@ function profiles_init(App $a) {
); );
if (! DBA::isResult($r)) { if (! DBA::isResult($r)) {
notice(L10n::t('Profile not found.') . EOL); notice(L10n::t('Profile not found.') . EOL);
$a->redirect('profiles'); $a->internalRedirect('profiles');
return; // NOTREACHED return; // NOTREACHED
} }
@ -59,7 +59,7 @@ function profiles_init(App $a) {
info(L10n::t('Profile deleted.').EOL); info(L10n::t('Profile deleted.').EOL);
} }
$a->redirect('profiles'); $a->internalRedirect('profiles');
return; // NOTREACHED return; // NOTREACHED
} }
@ -93,10 +93,10 @@ function profiles_init(App $a) {
info(L10n::t('New profile created.') . EOL); info(L10n::t('New profile created.') . EOL);
if (DBA::isResult($r3) && count($r3) == 1) { if (DBA::isResult($r3) && count($r3) == 1) {
$a->redirect('profiles/' . $r3[0]['id']); $a->internalRedirect('profiles/' . $r3[0]['id']);
} }
$a->redirect('profiles'); $a->internalRedirect('profiles');
} }
if (($a->argc > 2) && ($a->argv[1] === 'clone')) { if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
@ -132,10 +132,10 @@ function profiles_init(App $a) {
); );
info(L10n::t('New profile created.') . EOL); info(L10n::t('New profile created.') . EOL);
if ((DBA::isResult($r3)) && (count($r3) == 1)) { if ((DBA::isResult($r3)) && (count($r3) == 1)) {
$a->redirect('profiles/'.$r3[0]['id']); $a->internalRedirect('profiles/'.$r3[0]['id']);
} }
$a->redirect('profiles'); $a->internalRedirect('profiles');
return; // NOTREACHED return; // NOTREACHED
} }
@ -654,7 +654,7 @@ function profiles_content(App $a) {
); );
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
//Go to the default profile. //Go to the default profile.
$a->redirect('profiles/' . $r[0]['id']); $a->internalRedirect('profiles/' . $r[0]['id']);
} }
} }

View File

@ -13,8 +13,8 @@ function randprof_init(App $a)
$x = GContact::getRandomUrl(); $x = GContact::getRandomUrl();
if ($x) { if ($x) {
$a->redirect(Contact::magicLink($x)); $a->internalRedirect(Contact::magicLink($x));
} }
$a->redirect('profile'); $a->internalRedirect('profile');
} }

View File

@ -27,7 +27,7 @@ function redir_init(App $a) {
$contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]); $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
notice(L10n::t('Contact not found.')); notice(L10n::t('Contact not found.'));
$a->redirect(); $a->internalRedirect();
} }
$contact_url = $contact['url']; $contact_url = $contact['url'];
@ -36,7 +36,7 @@ function redir_init(App $a) {
|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate. || (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated. || (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
{ {
$a->redirect($url != '' ? $url : $contact_url); System::externalRedirect($url != '' ? $url : $contact_url);
} }
if ($contact['uid'] == 0 && local_user()) { if ($contact['uid'] == 0 && local_user()) {
@ -52,12 +52,12 @@ function redir_init(App $a) {
// Local user is already authenticated. // Local user is already authenticated.
$target_url = $url != '' ? $url : $contact_url; $target_url = $url != '' ? $url : $contact_url;
logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG); logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
$a->redirect($target_url); System::externalRedirect($target_url);
} }
} }
if (remote_user()) { if (remote_user()) {
$host = substr(System::baseUrl() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos(System::baseUrl(), '://') + 3); $host = substr($a->getBaseURL() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos($a->getBaseURL(), '://') + 3);
$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1); $remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
// On a local instance we have to check if the local user has already authenticated // On a local instance we have to check if the local user has already authenticated
@ -73,7 +73,7 @@ function redir_init(App $a) {
// Remote user is already authenticated. // Remote user is already authenticated.
$target_url = $url != '' ? $url : $contact_url; $target_url = $url != '' ? $url : $contact_url;
logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG); logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
$a->redirect($target_url); System::externalRedirect($target_url);
} }
} }
} }
@ -102,7 +102,7 @@ function redir_init(App $a) {
$dest = (!empty($url) ? '&destination_url=' . $url : ''); $dest = (!empty($url) ? '&destination_url=' . $url : '');
$a->redirect($contact['poll'] . '?dfrn_id=' . $dfrn_id System::externalRedirect($contact['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet); . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
} }
@ -121,9 +121,9 @@ function redir_init(App $a) {
} }
logger('redirecting to ' . $url, LOGGER_DEBUG); logger('redirecting to ' . $url, LOGGER_DEBUG);
$a->redirect($url); $a->internalRedirect($url);
} }
notice(L10n::t('Contact not found.')); notice(L10n::t('Contact not found.'));
$a->redirect(); $a->internalRedirect();
} }

View File

@ -100,7 +100,7 @@ function register_post(App $a)
if ($res) { if ($res) {
info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL); info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
$a->redirect(); $a->internalRedirect();
} else { } else {
notice( notice(
L10n::t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.', L10n::t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
@ -111,12 +111,12 @@ function register_post(App $a)
} }
} else { } else {
info(L10n::t('Registration successful.') . EOL); info(L10n::t('Registration successful.') . EOL);
$a->redirect(); $a->internalRedirect();
} }
} elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) { } elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) {
if (!strlen(Config::get('config', 'admin_email'))) { if (!strlen(Config::get('config', 'admin_email'))) {
notice(L10n::t('Your registration can not be processed.') . EOL); notice(L10n::t('Your registration can not be processed.') . EOL);
$a->redirect(); $a->internalRedirect();
} }
Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']); Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']);
@ -159,7 +159,7 @@ function register_post(App $a)
); );
info(L10n::t('Your registration is pending approval by the site owner.') . EOL); info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
$a->redirect(); $a->internalRedirect();
} }
return; return;

View File

@ -101,11 +101,11 @@ function regmod_content(App $a)
if ($cmd === 'deny') { if ($cmd === 'deny') {
user_deny($hash); user_deny($hash);
$a->redirect('admin/users/'); $a->internalRedirect('admin/users/');
} }
if ($cmd === 'allow') { if ($cmd === 'allow') {
user_allow($hash); user_allow($hash);
$a->redirect('admin/users/'); $a->internalRedirect('admin/users/');
} }
} }

View File

@ -64,7 +64,7 @@ function removeme_post(App $a)
function removeme_content(App $a) function removeme_content(App $a)
{ {
if (!local_user()) { if (!local_user()) {
$a->redirect(); $a->internalRedirect();
} }
$hash = random_string(); $hash = random_string();

View File

@ -14,7 +14,7 @@ function repair_ostatus_content(App $a) {
if (! local_user()) { if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
$a->redirect('ostatus_repair'); $a->internalRedirect('ostatus_repair');
// NOTREACHED // NOTREACHED
} }

View File

@ -160,7 +160,7 @@ function settings_post(App $a)
$key = $_POST['remove']; $key = $_POST['remove'];
DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]); DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
$a->redirect('settings/oauth/', true); $a->internalRedirect('settings/oauth/', true);
return; return;
} }
@ -206,7 +206,7 @@ function settings_post(App $a)
); );
} }
} }
$a->redirect('settings/oauth/', true); $a->internalRedirect('settings/oauth/', true);
return; return;
} }
@ -371,7 +371,7 @@ function settings_post(App $a)
); );
Addon::callHooks('display_settings_post', $_POST); Addon::callHooks('display_settings_post', $_POST);
$a->redirect('settings/display'); $a->internalRedirect('settings/display');
return; // NOTREACHED return; // NOTREACHED
} }
@ -380,7 +380,7 @@ function settings_post(App $a)
if (x($_POST,'resend_relocate')) { if (x($_POST,'resend_relocate')) {
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user()); Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
info(L10n::t("Relocate message has been send to your contacts")); info(L10n::t("Relocate message has been send to your contacts"));
$a->redirect('settings'); $a->internalRedirect('settings');
} }
Addon::callHooks('settings_post', $_POST); Addon::callHooks('settings_post', $_POST);
@ -649,7 +649,7 @@ function settings_post(App $a)
// Update the global contact for the user // Update the global contact for the user
GContact::updateForUser(local_user()); GContact::updateForUser(local_user());
$a->redirect('settings'); $a->internalRedirect('settings');
return; // NOTREACHED return; // NOTREACHED
} }
@ -716,7 +716,7 @@ function settings_content(App $a)
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't'); BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth', 't');
DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]); DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
$a->redirect('settings/oauth/', true); $a->internalRedirect('settings/oauth/', true);
return; return;
} }
@ -795,7 +795,7 @@ function settings_content(App $a)
$legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact'); $legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
if (x($legacy_contact)) { if (x($legacy_contact)) {
/// @todo Isn't it supposed to be a $a->redirect() call? /// @todo Isn't it supposed to be a $a->internalRedirect() call?
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">'; $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
} }

View File

@ -42,7 +42,7 @@ function starred_init(App $a) {
$rand = "?$rand"; $rand = "?$rand";
} }
$a->redirect($return_path . $rand); $a->internalRedirect($return_path . $rand);
} }
// the json doesn't really matter, it will either be 0 or 1 // the json doesn't really matter, it will either be 0 or 1

View File

@ -13,11 +13,11 @@ use Friendica\Model\Item;
function tagrm_post(App $a) function tagrm_post(App $a)
{ {
if (!local_user()) { if (!local_user()) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }
if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) { if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }
$tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : ''); $tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : '');
@ -25,7 +25,7 @@ function tagrm_post(App $a)
$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }
$arr = explode(',', $item['tag']); $arr = explode(',', $item['tag']);
@ -41,7 +41,7 @@ function tagrm_post(App $a)
Item::update(['tag' => $tag_str], ['id' => $item_id]); Item::update(['tag' => $tag_str], ['id' => $item_id]);
info(L10n::t('Tag removed') . EOL ); info(L10n::t('Tag removed') . EOL );
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
} }
@ -53,25 +53,25 @@ function tagrm_content(App $a)
$o = ''; $o = '';
if (!local_user()) { if (!local_user()) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
} }
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$item_id) { if (!$item_id) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
} }
$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }
$arr = explode(',', $item['tag']); $arr = explode(',', $item['tag']);
if (!count($arr)) { if (!count($arr)) {
$a->redirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }
$o .= '<h3>' . L10n::t('Remove Item Tag') . '</h3>'; $o .= '<h3>' . L10n::t('Remove Item Tag') . '</h3>';

View File

@ -17,5 +17,5 @@ function toggle_mobile_init(App $a) {
$address = ''; $address = '';
} }
$a->redirect($address); $a->internalRedirect($address);
} }

View File

@ -18,7 +18,7 @@ function unfollow_post(App $a)
if (!local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
$a->redirect('login'); $a->internalRedirect('login');
// NOTREACHED // NOTREACHED
} }
@ -32,17 +32,17 @@ function unfollow_post(App $a)
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
notice(L10n::t("You aren't following this contact.")); notice(L10n::t("You aren't following this contact."));
$a->redirect($return_url); $a->internalRedirect($return_url);
// NOTREACHED // NOTREACHED
} }
if (!empty($_REQUEST['cancel'])) { if (!empty($_REQUEST['cancel'])) {
$a->redirect($return_url . '/' . $contact['id']); $a->internalRedirect($return_url . '/' . $contact['id']);
} }
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
notice(L10n::t('Unfollowing is currently not supported by your network.')); notice(L10n::t('Unfollowing is currently not supported by your network.'));
$a->redirect($return_url . '/' . $contact['id']); $a->internalRedirect($return_url . '/' . $contact['id']);
// NOTREACHED // NOTREACHED
} }
@ -63,7 +63,7 @@ function unfollow_post(App $a)
} }
info(L10n::t('Contact unfollowed')); info(L10n::t('Contact unfollowed'));
$a->redirect($return_path); $a->internalRedirect($return_path);
// NOTREACHED // NOTREACHED
} }
@ -73,7 +73,7 @@ function unfollow_content(App $a)
if (!local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
$a->redirect('login'); $a->internalRedirect('login');
// NOTREACHED // NOTREACHED
} }
@ -88,13 +88,13 @@ function unfollow_content(App $a)
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
notice(L10n::t("You aren't following this contact.")); notice(L10n::t("You aren't following this contact."));
$a->redirect($return_url); $a->internalRedirect($return_url);
// NOTREACHED // NOTREACHED
} }
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
notice(L10n::t('Unfollowing is currently not supported by your network.')); notice(L10n::t('Unfollowing is currently not supported by your network.'));
$a->redirect('contact/' . $contact['id']); $a->internalRedirect('contact/' . $contact['id']);
// NOTREACHED // NOTREACHED
} }
@ -105,7 +105,7 @@ function unfollow_content(App $a)
if (!DBA::isResult($self)) { if (!DBA::isResult($self)) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
$a->redirect($return_url); $a->internalRedirect($return_url);
// NOTREACHED // NOTREACHED
} }

View File

@ -115,14 +115,14 @@ function videos_post(App $a)
$owner_uid = $a->data['user']['uid']; $owner_uid = $a->data['user']['uid'];
if (local_user() != $owner_uid) { if (local_user() != $owner_uid) {
$a->redirect('videos/' . $a->data['user']['nickname']); $a->internalRedirect('videos/' . $a->data['user']['nickname']);
} }
if (($a->argc == 2) && !empty($_POST['delete']) && !empty($_POST['id'])) { if (($a->argc == 2) && !empty($_POST['delete']) && !empty($_POST['id'])) {
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if (empty($_REQUEST['confirm'])) { if (empty($_REQUEST['confirm'])) {
if (!empty($_REQUEST['canceled'])) { if (!empty($_REQUEST['canceled'])) {
$a->redirect('videos/' . $a->data['user']['nickname']); $a->internalRedirect('videos/' . $a->data['user']['nickname']);
} }
$drop_url = $a->query_string; $drop_url = $a->query_string;
@ -169,11 +169,11 @@ function videos_post(App $a)
} }
} }
$a->redirect('videos/' . $a->data['user']['nickname']); $a->internalRedirect('videos/' . $a->data['user']['nickname']);
return; // NOTREACHED return; // NOTREACHED
} }
$a->redirect('videos/' . $a->data['user']['nickname']); $a->internalRedirect('videos/' . $a->data['user']['nickname']);
} }
function videos_content(App $a) function videos_content(App $a)

View File

@ -69,7 +69,7 @@ function wallmessage_post(App $a) {
info(L10n::t('Message sent.') . EOL); info(L10n::t('Message sent.') . EOL);
} }
$a->redirect('profile/'.$user['nickname']); $a->internalRedirect('profile/'.$user['nickname']);
} }

View File

@ -2001,20 +2001,21 @@ class App
} }
/** /**
* Redirects to another URL and exits this process. * Redirects to another service relative to the current Friendica base.
* If you want to redirect to a external URL, use System::externalRedirectTo()
* *
* @param string $toUrl The destination URL (Default is empty, which is the default page of the Friendica node) * @param string $toUrl The destination URL (Default is empty, which is the default page of the Friendica node)
* @param bool $ssl if true, base URL will try to get called with https:// (works just for relative paths) * @param bool $ssl if true, base URL will try to get called with https:// (works just for relative paths)
*
* @throws InternalServerErrorException In Case the given URL is not relative to the Friendica node
*/ */
public function redirect($toUrl = '', $ssl = false) public function internalRedirect($toUrl = '', $ssl = false)
{ {
if (strstr(normalise_link($toUrl), 'http://')) { if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
$redirectTo = $toUrl; throw new InternalServerErrorException('URL is not a relative path, please use System::externalRedirectTo');
} else {
$redirectTo = self::getApp()->getBaseURL($ssl) . '/' . ltrim($toUrl, '/');
} }
header("Location: $redirectTo"); $redirectTo = $this->getBaseURL($ssl) . '/' . ltrim($toUrl, '/');
exit(); System::externalRedirect($redirectTo);
} }
} }

View File

@ -61,7 +61,7 @@ abstract class BaseModule extends BaseObject
public static function post() public static function post()
{ {
// $a = self::getApp(); // $a = self::getApp();
// $a->redirect('module'); // $a->internalRedirect('module');
} }
/** /**
@ -139,7 +139,7 @@ abstract class BaseModule extends BaseObject
logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename); logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA); logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
notice(self::getFormSecurityStandardErrorMessage()); notice(self::getFormSecurityStandardErrorMessage());
goaway(System::baseUrl() . $err_redirect); $a->internalRedirect($err_redirect);
} }
} }

View File

@ -194,7 +194,7 @@ class Authentication extends BaseObject
Addon::callHooks('logged_in', $a->user); Addon::callHooks('logged_in', $a->user);
if (($a->module !== 'home') && isset($_SESSION['return_url'])) { if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
goaway($a->getbaseUrl() . '/' . $_SESSION['return_url']); $a->internalRedirect($_SESSION['return_url']);
} }
} }
} }

View File

@ -5,6 +5,7 @@
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\XML; use Friendica\Util\XML;
/** /**
@ -236,6 +237,23 @@ class System extends BaseObject
return max($load_arr[0], $load_arr[1]); return max($load_arr[0], $load_arr[1]);
} }
/**
* Redirects to an external URL (fully qualified URL)
* If you want to route relative to the current Friendica base, use App->internalRedirect()
*
* @param string $url The new Location to redirect
* @throws InternalServerErrorException If the URL is not fully qualified
*/
public static function externalRedirect($url)
{
if (!filter_var($url, FILTER_VALIDATE_URL)) {
throw new InternalServerErrorException('URL is not a fully qualified URL, please use App->internalRedirect() instead');
}
header("Location: $url");
exit();
}
/// @todo Move the following functions from boot.php /// @todo Move the following functions from boot.php
/* /*
function killme() function killme()

View File

@ -272,6 +272,6 @@ class UserImport
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid); Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid);
info(L10n::t("Done. You can now login with your username and password")); info(L10n::t("Done. You can now login with your username and password"));
$a->redirect('login'); $a->internalRedirect('login');
} }
} }

View File

@ -1639,7 +1639,7 @@ class Contact extends BaseObject
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName()); $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName());
} }
$a->redirect($ret['request'] . "&addr=$myaddr"); $a->internalRedirect($ret['request'] . "&addr=$myaddr");
// NOTREACHED // NOTREACHED
} }
@ -2025,7 +2025,7 @@ class Contact extends BaseObject
* @brief Returns a magic link to authenticate remote visitors * @brief Returns a magic link to authenticate remote visitors
* *
* @param string $contact_url The address of the target contact profile * @param string $contact_url The address of the target contact profile
* @param integer $url An url that we will be redirected to after the authentication * @param string $url An url that we will be redirected to after the authentication
* *
* @return string with "redir" link * @return string with "redir" link
*/ */
@ -2058,7 +2058,7 @@ class Contact extends BaseObject
* @brief Returns a magic link to authenticate remote visitors * @brief Returns a magic link to authenticate remote visitors
* *
* @param array $contact The contact array with "uid", "network" and "url" * @param array $contact The contact array with "uid", "network" and "url"
* @param integer $url An url that we will be redirected to after the authentication * @param string $url An url that we will be redirected to after the authentication
* *
* @return string with "redir" link * @return string with "redir" link
*/ */

View File

@ -1062,7 +1062,7 @@ class Profile
$serverret = Network::curl($basepath . '/magic'); $serverret = Network::curl($basepath . '/magic');
if ($serverret->isSuccess()) { if ($serverret->isSuccess()) {
logger('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, LOGGER_DEBUG); logger('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, LOGGER_DEBUG);
$a->redirect($magic_path); System::externalRedirect($magic_path);
} }
} }
} }

View File

@ -450,7 +450,7 @@ class User
} catch (Exception $e) { } catch (Exception $e) {
throw new Exception(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . EOL . EOL . L10n::t('The error message was:') . $e->getMessage(), 0, $e); throw new Exception(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . EOL . EOL . L10n::t('The error message was:') . $e->getMessage(), 0, $e);
} }
$a->redirect($authurl); System::externalRedirect($authurl);
// NOTREACHED // NOTREACHED
} }
@ -809,7 +809,7 @@ class User
if ($uid == local_user()) { if ($uid == local_user()) {
unset($_SESSION['authenticated']); unset($_SESSION['authenticated']);
unset($_SESSION['uid']); unset($_SESSION['uid']);
$a->redirect(); $a->internalRedirect();
} }
} }
} }

View File

@ -4,6 +4,7 @@ namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Core\System;
/** /**
* Redirects to another URL based on the parameter 'addr' * Redirects to another URL based on the parameter 'addr'
@ -18,7 +19,7 @@ class Acctlink extends BaseModule
$url = defaults(Probe::uri(trim($addr)), 'url', false); $url = defaults(Probe::uri(trim($addr)), 'url', false);
if ($url) { if ($url) {
self::getApp()->redirect($url); System::externalRedirect($url);
exit(); exit();
} }
} }

View File

@ -66,9 +66,9 @@ class Contact extends BaseModule
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
if ($contact['self']) { if ($contact['self']) {
if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) { if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
$a->redirect('profile/' . $contact['nick']); $a->internalRedirect('profile/' . $contact['nick']);
} else { } else {
$a->redirect('profile/' . $contact['nick'] . '?tab=profile'); $a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
} }
} }
@ -168,7 +168,7 @@ class Contact extends BaseModule
info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions)); info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
} }
$a->redirect('contact'); $a->internalRedirect('contact');
} }
public static function post() public static function post()
@ -191,7 +191,7 @@ class Contact extends BaseModule
if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) { if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
notice(L10n::t('Could not access contact record.') . EOL); notice(L10n::t('Could not access contact record.') . EOL);
$a->redirect('contact'); $a->internalRedirect('contact');
return; // NOTREACHED return; // NOTREACHED
} }
@ -374,19 +374,19 @@ class Contact extends BaseModule
$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]); $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
if (!DBA::isResult($orig_record)) { if (!DBA::isResult($orig_record)) {
notice(L10n::t('Could not access contact record.') . EOL); notice(L10n::t('Could not access contact record.') . EOL);
$a->redirect('contact'); $a->internalRedirect('contact');
return; // NOTREACHED return; // NOTREACHED
} }
if ($cmd === 'update' && ($orig_record['uid'] != 0)) { if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
self::updateContactFromPoll($contact_id); self::updateContactFromPoll($contact_id);
$a->redirect('contact/' . $contact_id); $a->internalRedirect('contact/' . $contact_id);
// NOTREACHED // NOTREACHED
} }
if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) { if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
self::updateContactFromProbe($contact_id); self::updateContactFromProbe($contact_id);
$a->redirect('crepair/' . $contact_id); $a->internalRedirect('crepair/' . $contact_id);
// NOTREACHED // NOTREACHED
} }
@ -396,7 +396,7 @@ class Contact extends BaseModule
$blocked = Model\Contact::isBlockedByUser($contact_id, local_user()); $blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL); info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
$a->redirect('contact/' . $contact_id); $a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
} }
@ -406,7 +406,7 @@ class Contact extends BaseModule
$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user()); $ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL); info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
$a->redirect('contact/' . $contact_id); $a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
} }
@ -417,7 +417,7 @@ class Contact extends BaseModule
info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL); info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
} }
$a->redirect('contact/' . $contact_id); $a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
} }
@ -451,13 +451,13 @@ class Contact extends BaseModule
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) { if (!empty($_REQUEST['canceled'])) {
$a->redirect('contact'); $a->internalRedirect('contact');
} }
self::dropContact($orig_record); self::dropContact($orig_record);
info(L10n::t('Contact has been removed.') . EOL); info(L10n::t('Contact has been removed.') . EOL);
$a->redirect('contact'); $a->internalRedirect('contact');
return; // NOTREACHED return; // NOTREACHED
} }
if ($cmd === 'posts') { if ($cmd === 'posts') {

View File

@ -40,7 +40,7 @@ class Login extends BaseModule
} }
if (local_user()) { if (local_user()) {
$a->redirect(); $a->internalRedirect();
} }
return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED); return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
@ -89,19 +89,18 @@ class Login extends BaseModule
// if it's an email address or doesn't resolve to a URL, fail. // if it's an email address or doesn't resolve to a URL, fail.
if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) { if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
notice(L10n::t('Login failed.') . EOL); notice(L10n::t('Login failed.') . EOL);
$a->redirect(); $a->internalRedirect();
// NOTREACHED // NOTREACHED
} }
// Otherwise it's probably an openid. // Otherwise it's probably an openid.
try { try {
$a = get_app();
$openid = new LightOpenID($a->getHostName()); $openid = new LightOpenID($a->getHostName());
$openid->identity = $openid_url; $openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url; $_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $remember; $_SESSION['remember'] = $remember;
$openid->returnUrl = self::getApp()->getBaseURL(true) . '/openid'; $openid->returnUrl = $a->getBaseURL(true) . '/openid';
$a->redirect($openid->authUrl()); System::externalRedirect($openid->authUrl());
} catch (Exception $e) { } catch (Exception $e) {
notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . L10n::t('The error message was:') . ' ' . $e->getMessage()); notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . L10n::t('The error message was:') . ' ' . $e->getMessage());
} }
@ -149,7 +148,7 @@ class Login extends BaseModule
} catch (Exception $e) { } catch (Exception $e) {
logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']); logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
info('Login failed. Please check your credentials.' . EOL); info('Login failed. Please check your credentials.' . EOL);
$a->redirect(); $a->internalRedirect();
} }
if (!$remember) { if (!$remember) {
@ -168,7 +167,7 @@ class Login extends BaseModule
$return_url = ''; $return_url = '';
} }
$a->redirect($return_url); $a->internalRedirect($return_url);
} }
/** /**
@ -198,7 +197,7 @@ class Login extends BaseModule
if ($data->hash != Authentication::getCookieHashForUser($user)) { if ($data->hash != Authentication::getCookieHashForUser($user)) {
logger("Hash for user " . $data->uid . " doesn't fit."); logger("Hash for user " . $data->uid . " doesn't fit.");
Authentication::deleteSession(); Authentication::deleteSession();
$a->redirect(); $a->internalRedirect();
} }
// Renew the cookie // Renew the cookie
@ -235,7 +234,7 @@ class Login extends BaseModule
logger('Session address changed. Paranoid setting in effect, blocking session. ' . logger('Session address changed. Paranoid setting in effect, blocking session. ' .
$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
Authentication::deleteSession(); Authentication::deleteSession();
$a->redirect(); $a->internalRedirect();
} }
$user = DBA::selectFirst('user', [], $user = DBA::selectFirst('user', [],
@ -249,7 +248,7 @@ class Login extends BaseModule
); );
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {
Authentication::deleteSession(); Authentication::deleteSession();
$a->redirect(); $a->internalRedirect();
} }
// Make sure to refresh the last login time for the user if the user // Make sure to refresh the last login time for the user if the user

View File

@ -27,6 +27,6 @@ class Logout extends BaseModule
Addon::callHooks("logging_out"); Addon::callHooks("logging_out");
Authentication::deleteSession(); Authentication::deleteSession();
info(L10n::t('Logged out.') . EOL); info(L10n::t('Logged out.') . EOL);
self::getApp()->redirect(); self::getApp()->internalRedirect();
} }
} }

View File

@ -42,7 +42,7 @@ class Magic extends BaseModule
if (!$cid) { if (!$cid) {
logger('No contact record found: ' . print_r($_REQUEST, true), LOGGER_DEBUG); logger('No contact record found: ' . print_r($_REQUEST, true), LOGGER_DEBUG);
$a->redirect($dest); $a->internalRedirect($dest);
} }
$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]); $contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
@ -56,7 +56,7 @@ class Magic extends BaseModule
} }
logger('Contact is already authenticated', LOGGER_DEBUG); logger('Contact is already authenticated', LOGGER_DEBUG);
$a->redirect($dest); $a->internalRedirect($dest);
} }
if (local_user()) { if (local_user()) {
@ -100,10 +100,10 @@ class Magic extends BaseModule
$x = strpbrk($dest, '?&'); $x = strpbrk($dest, '?&');
$args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token); $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token);
$a->redirect($dest . $args); $a->internalRedirect($dest . $args);
} }
} }
$a->redirect($dest); $a->internalRedirect($dest);
} }
} }
@ -112,6 +112,6 @@ class Magic extends BaseModule
return $ret; return $ret;
} }
$a->redirect($dest); $a->internalRedirect($dest);
} }
} }

View File

@ -24,7 +24,7 @@ class Objects extends BaseModule
} }
if (!ActivityPub::isRequest()) { if (!ActivityPub::isRequest()) {
$a->redirect(str_replace('objects/', 'display/', $a->query_string)); $a->internalRedirect(str_replace('objects/', 'display/', $a->query_string));
} }
$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'wall' => true, 'private' => false]); $item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'wall' => true, 'private' => false]);

View File

@ -49,7 +49,7 @@ class Tos extends BaseModule
public static function init() public static function init()
{ {
if (strlen(Config::get('system','singleuser'))) { if (strlen(Config::get('system','singleuser'))) {
self::getApp()->redirect('profile/' . Config::get('system','singleuser')); self::getApp()->internalRedirect('profile/' . Config::get('system','singleuser'));
} }
} }
/** /**

View File

@ -3037,7 +3037,7 @@ class DFRN
logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
$dest = (($url) ? '&destination_url=' . $url : ''); $dest = (($url) ? '&destination_url=' . $url : '');
$a->redirect($r[0]['poll'] . '?dfrn_id=' . $dfrn_id System::externalRedirect($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest); . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest);
} }