Browse Source

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

pull/5907/head
Philipp Holzer 3 years ago
parent
commit
d00ddc01af
No known key found for this signature in database GPG Key ID: 517BE60E2CE5C8A5
61 changed files with 285 additions and 265 deletions
  1. +1
    -2
      include/api.php
  2. +4
    -4
      include/items.php
  3. +29
    -29
      mod/admin.php
  4. +1
    -1
      mod/api.php
  5. +2
    -2
      mod/cal.php
  6. +4
    -4
      mod/delegate.php
  7. +2
    -2
      mod/dfrn_confirm.php
  8. +30
    -28
      mod/dfrn_poll.php
  9. +10
    -10
      mod/dfrn_request.php
  10. +1
    -1
      mod/display.php
  11. +4
    -4
      mod/events.php
  12. +1
    -1
      mod/filerm.php
  13. +10
    -10
      mod/follow.php
  14. +6
    -6
      mod/group.php
  15. +2
    -2
      mod/home.php
  16. +1
    -1
      mod/ignored.php
  17. +8
    -8
      mod/item.php
  18. +1
    -1
      mod/like.php
  19. +3
    -3
      mod/lostpass.php
  20. +1
    -1
      mod/manage.php
  21. +6
    -6
      mod/message.php
  22. +4
    -4
      mod/network.php
  23. +1
    -1
      mod/nogroup.php
  24. +1
    -1
      mod/notice.php
  25. +3
    -3
      mod/notifications.php
  26. +2
    -2
      mod/notify.php
  27. +6
    -6
      mod/openid.php
  28. +1
    -1
      mod/ostatus_subscribe.php
  29. +10
    -10
      mod/photos.php
  30. +1
    -1
      mod/profile.php
  31. +4
    -4
      mod/profile_photo.php
  32. +7
    -7
      mod/profiles.php
  33. +2
    -2
      mod/randprof.php
  34. +8
    -8
      mod/redir.php
  35. +4
    -4
      mod/register.php
  36. +2
    -2
      mod/regmod.php
  37. +1
    -1
      mod/removeme.php
  38. +1
    -1
      mod/repair_ostatus.php
  39. +7
    -7
      mod/settings.php
  40. +1
    -1
      mod/starred.php
  41. +8
    -8
      mod/tagrm.php
  42. +1
    -1
      mod/toggle_mobile.php
  43. +9
    -9
      mod/unfollow.php
  44. +4
    -4
      mod/videos.php
  45. +1
    -1
      mod/wallmessage.php
  46. +9
    -8
      src/App.php
  47. +2
    -2
      src/BaseModule.php
  48. +1
    -1
      src/Core/Authentication.php
  49. +18
    -0
      src/Core/System.php
  50. +1
    -1
      src/Core/UserImport.php
  51. +3
    -3
      src/Model/Contact.php
  52. +1
    -1
      src/Model/Profile.php
  53. +2
    -2
      src/Model/User.php
  54. +2
    -1
      src/Module/Acctlink.php
  55. +12
    -12
      src/Module/Contact.php
  56. +9
    -10
      src/Module/Login.php
  57. +1
    -1
      src/Module/Logout.php
  58. +5
    -5
      src/Module/Magic.php
  59. +1
    -1
      src/Module/Objects.php
  60. +1
    -1
      src/Module/Tos.php
  61. +1
    -1
      src/Protocol/DFRN.php

+ 1
- 2
include/api.php View File

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


+ 4
- 4
include/items.php View File

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


+ 29
- 29
mod/admin.php View File

@ -82,7 +82,7 @@ function admin_post(App $a)
if ($a->isAjax()) {
return;
}
$a->redirect('admin/');
$a->internalRedirect('admin/');
return;
}
@ -135,7 +135,7 @@ function admin_post(App $a)
}
}
$a->redirect($return_path);
$a->internalRedirect($return_path);
return; // NOTREACHED
}
@ -340,7 +340,7 @@ function admin_page_tos_post(App $a)
Config::set('system', 'tosprivstatement', $displayprivstatement);
Config::set('system', 'tostext', $tostext);
$a->redirect('admin/tos');
$a->internalRedirect('admin/tos');
return; // NOTREACHED
}
@ -429,7 +429,7 @@ function admin_page_blocklist_post(App $a)
Config::set('system', 'blocklist', $blocklist);
info(L10n::t('Site blocklist updated.') . EOL);
}
$a->redirect('admin/blocklist');
$a->internalRedirect('admin/blocklist');
return; // NOTREACHED
}
@ -461,7 +461,7 @@ function admin_page_contactblock_post(App $a)
}
notice(L10n::tt("%s contact unblocked", "%s contacts unblocked", count($contacts)));
}
$a->redirect('admin/contactblock');
$a->internalRedirect('admin/contactblock');
return; // NOTREACHED
}
@ -569,7 +569,7 @@ function admin_page_deleteitem_post(App $a)
}
info(L10n::t('Item marked for deletion.') . EOL);
$a->redirect('admin/deleteitem');
$a->internalRedirect('admin/deleteitem');
return; // NOTREACHED
}
@ -965,7 +965,7 @@ function admin_page_site_post(App $a)
$parsed = @parse_url($new_url);
if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) {
notice(L10n::t("Can not parse base url. Must have at least <scheme>://<domain>"));
$a->redirect('admin/site');
$a->internalRedirect('admin/site');
}
/* steps:
@ -973,13 +973,13 @@ function admin_page_site_post(App $a)
* 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
$new_host = str_replace("http://", "@", normalise_link($new_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);
$dbnew = DBA::escape($new_url);
@ -995,20 +995,20 @@ function admin_page_site_post(App $a)
if (!DBA::isResult($r)) {
notice("Failed updating '$table_name': " . DBA::errorMessage());
$a->redirect('admin/site');
$a->internalRedirect('admin/site');
}
}
// update tables
// update profile links in the format "http://server.tld"
update_table("profile", ['photo', 'thumb'], $old_url, $new_url);
update_table("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("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, "profile", ['photo', 'thumb'], $old_url, $new_url);
update_table($a, "term", ['url'], $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($a, "gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $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_table("contact", ['addr'], $old_host, $new_host);
update_table("gcontact", ['connect', 'addr'], $old_host, $new_host);
update_table($a, "contact", ['addr'], $old_host, $new_host);
update_table($a, "gcontact", ['connect', 'addr'], $old_host, $new_host);
// update config
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.");
$a->redirect('admin/site');
$a->internalRedirect('admin/site');
}
// end relocate
@ -1298,7 +1298,7 @@ function admin_page_site_post(App $a)
Config::set('system', 'rino_encrypt', $rino);
info(L10n::t('Site settings updated.') . EOL);
$a->redirect('admin/site');
$a->internalRedirect('admin/site');
return; // NOTREACHED
}
@ -1570,7 +1570,7 @@ function admin_page_dbsync(App $a)
Config::set('system', 'build', intval($curr) + 1);
}
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'))) {
@ -1745,7 +1745,7 @@ function admin_page_users_post(App $a)
user_deny($hash);
}
}
$a->redirect('admin/users');
$a->internalRedirect('admin/users');
return; // NOTREACHED
}
@ -1768,7 +1768,7 @@ function admin_page_users(App $a)
$user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
if (!DBA::isResult($user)) {
notice('User not found' . EOL);
$a->redirect('admin/users');
$a->internalRedirect('admin/users');
return ''; // NOTREACHED
}
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);
break;
}
$a->redirect('admin/users');
$a->internalRedirect('admin/users');
return ''; // NOTREACHED
}
@ -1986,7 +1986,7 @@ function admin_page_addons(App $a)
info(L10n::t("Addon %s enabled.", $addon));
}
Config::set("system", "addon", implode(", ", $a->addons));
$a->redirect('admin/addons');
$a->internalRedirect('admin/addons');
return ''; // NOTREACHED
}
@ -2045,7 +2045,7 @@ function admin_page_addons(App $a)
BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't');
Addon::reload();
info("Addons reloaded");
$a->redirect('admin/addons');
$a->internalRedirect('admin/addons');
}
$addons = [];
@ -2235,7 +2235,7 @@ function admin_page_themes(App $a)
}
Config::set('system', 'allowed_themes', $s);
$a->redirect('admin/themes');
$a->internalRedirect('admin/themes');
return ''; // NOTREACHED
}
@ -2316,7 +2316,7 @@ function admin_page_themes(App $a)
}
}
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."));
$a->redirect('admin/logs');
$a->internalRedirect('admin/logs');
return; // NOTREACHED
}
@ -2513,7 +2513,7 @@ function admin_page_features_post(App $a)
}
}
$a->redirect('admin/features');
$a->internalRedirect('admin/features');
return; // NOTREACHED
}


+ 1
- 1
mod/api.php View File

@ -77,7 +77,7 @@ function api_content(App $a)
if (strstr($consumer->callback_url, $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();
}


+ 2
- 2
mod/cal.php 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
if ((local_user() !== intval($owner_uid)) && !Feature::isEnabled($owner_uid, "export_calendar")) {
notice(L10n::t('Permission denied.') . EOL);
$a->redirect('cal/' . $nick);
$a->internalRedirect('cal/' . $nick);
}
// Get the export data by uid
@ -322,7 +322,7 @@ function cal_content(App $a)
$return_path = "cal/" . $nick;
}
$a->redirect($return_path);
$a->internalRedirect($return_path);
}
// If nothing went wrong we can echo the export content


+ 4
- 4
mod/delegate.php View File

@ -62,7 +62,7 @@ function delegate_content(App $a)
if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) {
$a->redirect('delegate');
$a->internalRedirect('delegate');
}
$user_id = $a->argv[2];
@ -77,17 +77,17 @@ function delegate_content(App $a)
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])) {
// delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) {
$a->redirect('delegate');
$a->internalRedirect('delegate');
}
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


+ 2
- 2
mod/dfrn_confirm.php 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
// do anything special with this new friend.
if ($handsfree === null) {
$a->redirect('contact/' . intval($contact_id));
$a->internalRedirect('contact/' . intval($contact_id));
} else {
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.
$a->redirect();
$a->internalRedirect();
// NOTREACHED
}

+ 30
- 28
mod/dfrn_poll.php View File

@ -90,7 +90,7 @@ function dfrn_poll_init(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
$a->redirect();
$a->internalRedirect();
break; // NOTREACHED
}
@ -109,7 +109,7 @@ function dfrn_poll_init(App $a)
if (strlen($s)) {
$xml = XML::parseString($s);
if ((int) $xml->status === 1) {
if ((int)$xml->status === 1) {
$_SESSION['authenticated'] = 1;
if (!x($_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) {
@ -325,7 +330,7 @@ function dfrn_poll_post(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
$a->redirect();
$a->internalRedirect();
break; // NOTREACHED
}
@ -446,7 +451,7 @@ function dfrn_poll_content(App $a)
$my_id = '0:' . $dfrn_id;
break;
default:
$a->redirect();
$a->internalRedirect();
break; // NOTREACHED
}
@ -505,25 +510,6 @@ function dfrn_poll_content(App $a)
])->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);
if (strlen($s) && strstr($s, '<?xml')) {
@ -557,10 +543,26 @@ function dfrn_poll_content(App $a)
DBA::escape($session_id)
);
}
}
$profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
$a->redirect($dest);
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;
}
$a->redirect($dest);
// NOTREACHED
} else {
// XML reply


+ 10
- 10
mod/dfrn_request.php View File

@ -62,7 +62,7 @@ function dfrn_request_post(App $a)
}
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)
$a->redirect($forwardurl);
$a->internalRedirect($forwardurl);
return; // NOTREACHED
}
}
// invalid/bogus request
notice(L10n::t('Unrecoverable protocol error.') . EOL);
$a->redirect();
$a->internalRedirect();
return; // NOTREACHED
}
@ -331,19 +331,19 @@ function dfrn_request_post(App $a)
$url = Network::isUrlValid($url);
if (!$url) {
notice(L10n::t('Invalid profile URL.') . EOL);
$a->redirect($a->cmd);
$a->internalRedirect($a->cmd);
return; // NOTREACHED
}
if (!Network::isUrlAllowed($url)) {
notice(L10n::t('Disallowed profile URL.') . EOL);
$a->redirect($a->cmd);
$a->internalRedirect($a->cmd);
return; // NOTREACHED
}
if (Network::isUrlBlocked($url)) {
notice(L10n::t('Blocked domain') . EOL);
$a->redirect($a->cmd);
$a->internalRedirect($a->cmd);
return; // NOTREACHED
}
@ -351,7 +351,7 @@ function dfrn_request_post(App $a)
if (!count($parms)) {
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
$a->redirect($a->cmd);
$a->internalRedirect($a->cmd);
} else {
if (!x($parms, 'fn')) {
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.
$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
$dfrn_url = bin2hex($a->getBaseURL() . '/profile/' . $nickname);
$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
. '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "")
@ -463,7 +463,7 @@ function dfrn_request_post(App $a)
}
$url = str_replace('{uri}', $uri, $url);
$a->redirect($url);
System::externalRedirect($url);
// NOTREACHED
// END $network != Protocol::PHANTOM
} else {


+ 1
- 1
mod/display.php View File

@ -79,7 +79,7 @@ function display_init(App $a)
}
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"]) {


+ 4
- 4
mod/events.php View File

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

+ 1
- 1
mod/filerm.php View File

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

+ 10
- 10
mod/follow.php View File

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


+ 6
- 6
mod/group.php View File

@ -38,12 +38,12 @@ function group_post(App $a) {
info(L10n::t('Group created.') . EOL);
$r = Model\Group::getIdByName(local_user(), $name);
if ($r) {
$a->redirect('group/' . $r);
$a->internalRedirect('group/' . $r);
}
} else {
notice(L10n::t('Could not create group.') . EOL);
}
$a->redirect('group');
$a->internalRedirect('group');
return; // NOTREACHED
}
@ -56,7 +56,7 @@ function group_post(App $a) {
);
if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL);
$a->redirect('contact');
$a->internalRedirect('contact');
return; // NOTREACHED
}
$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
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
@ -159,7 +159,7 @@ function group_content(App $a) {
notice(L10n::t('Unable to remove group.') . EOL);
}
}
$a->redirect('group');
$a->internalRedirect('group');
// NOTREACHED
}
@ -183,7 +183,7 @@ function group_content(App $a) {
if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL);
$a->redirect('contact');
$a->internalRedirect('contact');
}
$group = $r[0];


+ 2
- 2
mod/home.php View File

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


+ 1
- 1
mod/ignored.php View File

@ -43,7 +43,7 @@ function ignored_init(App $a)
$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


+ 8
- 8
mod/item.php View File

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


+ 1
- 1
mod/like.php View File

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


+ 3
- 3
mod/lostpass.php View File

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


+ 1
- 1
mod/manage.php View File

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


+ 6
- 6
mod/message.php View File

@ -87,7 +87,7 @@ function message_post(App $a)
$a->argc = 2;
$a->argv[1] = 'new';
} 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
if (!empty($_REQUEST['canceled'])) {
$a->redirect('message');
$a->internalRedirect('message');
}
$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()]);
if(!DBA::isResult($message)){
info(L10n::t('Conversation not found.') . EOL);
$a->redirect('message');
$a->internalRedirect('message');
}
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()]);
if(!DBA::isResult($conversation)){
info(L10n::t('Conversation removed.') . EOL);
$a->redirect('message');
$a->internalRedirect('message');
}
$a->redirect('message/' . $conversation['id'] );
$a->internalRedirect('message/' . $conversation['id'] );
} else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
@ -190,7 +190,7 @@ function message_content(App $a)
info(L10n::t('Conversation removed.') . EOL);
}
}
$a->redirect('message');
$a->internalRedirect('message');
}
}


+ 4
- 4
mod/network.php View File

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


+ 1
- 1
mod/nogroup.php View File

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

+ 1
- 1
mod/notice.php 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));
if (DBA::isResult($r)) {
$nick = $r[0]['nickname'];
$a->redirect('display/' . $nick . '/' . $id);
$a->internalRedirect('display/' . $nick . '/' . $id);
} else {
$a->error = 404;
notice(L10n::t('Item not found.') . EOL);


+ 3
- 3
mod/notifications.php View File

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


+ 2
- 2
mod/notify.php 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') {


+ 6
- 6
mod/openid.php View File

@ -14,7 +14,7 @@ function openid_content(App $a) {
$noid = Config::get('system','no_openid');
if($noid)
$a->redirect();
$a->internalRedirect();
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
@ -28,7 +28,7 @@ function openid_content(App $a) {
if(! strlen($authid)) {
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
@ -56,7 +56,7 @@ function openid_content(App $a) {
// just in case there was no return url set
// and we fell through
$a->redirect();
$a->internalRedirect();
}
// 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) {
notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
$a->redirect();
$a->internalRedirect();
}
unset($_SESSION['register']);
@ -108,12 +108,12 @@ function openid_content(App $a) {
$args .= '&openid_url=' . urlencode(notags(trim($authid)));
$a->redirect('register?' . $args);
$a->internalRedirect('register?' . $args);
// NOTREACHED
}
}
notice(L10n::t('Login failed.') . EOL);
$a->redirect();
$a->internalRedirect();
// NOTREACHED
}

+ 1
- 1
mod/ostatus_subscribe.php View File

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


+ 10
- 10
mod/photos.php View File

@ -196,7 +196,7 @@ function photos_post(App $a)
$album = hex2bin($a->argv[3]);
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
}
@ -207,13 +207,13 @@ function photos_post(App $a)
if (!DBA::isResult($r)) {
notice(L10n::t('Album not found.') . EOL);
$a->redirect($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query
if (!empty($_REQUEST['canceled'])) {
$a->redirect($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
}
// RENAME photo album
@ -227,7 +227,7 @@ function photos_post(App $a)
// Update the photo albums cache
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
}
@ -280,7 +280,7 @@ function photos_post(App $a)
$res[] = "'" . DBA::escape($rr['rid']) . "'" ;
}
} else {
$a->redirect($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
@ -298,14 +298,14 @@ function photos_post(App $a)
Photo::clearAlbumCache($page_owner_uid);
}
$a->redirect('photos/' . $a->data['user']['nickname']);
$a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query for a single photo
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')) {
@ -355,7 +355,7 @@ function photos_post(App $a)
Photo::clearAlbumCache($page_owner_uid);
}
$a->redirect('photos/' . $a->data['user']['nickname']);
$a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
@ -696,7 +696,7 @@ function photos_post(App $a)
}
}
}
$a->redirect($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
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
// if they do not wish to be redirected
$a->redirect($_SESSION['photo_return']);
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}


+ 1
- 1
mod/profile.php View File

@ -34,7 +34,7 @@ function profile_init(App $a)
} 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");
if (DBA::isResult($r)) {
$a->redirect('profile/' . $r[0]['nickname']);
$a->internalRedirect('profile/' . $r[0]['nickname']);
} else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
notice(L10n::t('Requested profile is not available.') . EOL);


+ 4
- 4
mod/profile_photo.php 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),
DBA::escape(local_user()), intval($scale));
$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
$url = 'profile/' . $a->user['nickname'];
if (DBA::isResult($r)) {
$base_image = $r[0];
@ -135,7 +135,7 @@ function profile_photo_post(App $a)
}
}
$a->redirect($url);
$a->internalRedirect($url);
return; // NOTREACHED
}
@ -168,7 +168,7 @@ function profile_photo_post(App $a)
@unlink($src);
$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)
@ -225,7 +225,7 @@ function profile_photo_content(App $a)
Worker::add(PRIORITY_LOW, "Directory", $url);
}
$a->redirect('profile/' . $a->user['nickname']);
$a->internalRedirect('profile/' . $a->user['nickname']);
return; // NOTREACHED
}
$ph = new Image($r[0]['data'], $r[0]['type']);


+ 7
- 7
mod/profiles.php View File

@ -38,7 +38,7 @@ function profiles_init(App $a) {
);
if (! DBA::isResult($r)) {
notice(L10n::t('Profile not found.') . EOL);
$a->redirect('profiles');
$a->internalRedirect('profiles');
return; // NOTREACHED
}
@ -59,7 +59,7 @@ function profiles_init(App $a) {
info(L10n::t('Profile deleted.').EOL);
}
$a->redirect('profiles');
$a->internalRedirect('profiles');
return; // NOTREACHED
}
@ -93,10 +93,10 @@ function profiles_init(App $a) {
info(L10n::t('New profile created.') . EOL);
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')) {
@ -132,10 +132,10 @@ function profiles_init(App $a) {
);
info(L10n::t('New profile created.') . EOL);
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
}
@ -654,7 +654,7 @@ function profiles_content(App $a) {