bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Renamed System::redirect() to $a->redirect()

Browse source
This commit is contained in:
Philipp Holzer 2018-10-13 20:02:04 +02:00
commit 2ef81108b3
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
62 changed files with 269 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mod/settings.php
View file

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