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

App::get_baseurl is now replaced with System::baseUrl

Browse source
This commit is contained in:
Michael 2017-08-26 07:32:10 +00:00
commit 5adfeb0bd5
134 changed files with 603 additions and 624 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mod/settings.php
View file

@ -143,7 +143,7 @@ function settings_post(App $a) {
q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
dbesc($key),
local_user());
goaway(App::get_baseurl(true)."/settings/oauth/");
goaway(System::baseUrl(true)."/settings/oauth/");
return;
}
@ -188,7 +188,7 @@ function settings_post(App $a) {
local_user());
}
}
goaway(App::get_baseurl(true)."/settings/oauth/");
goaway(System::baseUrl(true)."/settings/oauth/");
return;
}
@ -723,7 +723,7 @@ function settings_content(App $a) {
$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
dbesc($a->argv[3]),
local_user());
goaway(App::get_baseurl(true)."/settings/oauth/");
goaway(System::baseUrl(true)."/settings/oauth/");
return;
}
@ -739,7 +739,7 @@ function settings_content(App $a) {
$tpl = get_markup_template("settings_oauth.tpl");
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
'$baseurl' => App::get_baseurl(true),
'$baseurl' => System::baseUrl(true),
'$title' => t('Connected Apps'),
'$add' => t('Add application'),
'$edit' => t('Edit'),
@ -829,7 +829,7 @@ function settings_content(App $a) {
/// @TODO Found to much different usage to test empty/non-empty strings (e.g. empty(), trim() == '' ) which is wanted?
if ($legacy_contact != "") {
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_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).'">';
}
$settings_connectors .= '<div id="legacy-contact-wrapper" class="field input">';
@ -838,7 +838,7 @@ function settings_content(App $a) {
$settings_connectors .= '<span class="field_help">'.t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.').'</span>';
$settings_connectors .= '</div>';
$settings_connectors .= '<p><a href="'.App::get_baseurl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
$settings_connectors .= '<p><a href="'.System::baseUrl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
$settings_connectors .= '<div class="settings-submit-wrapper" ><input type="submit" name="general-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
@ -1005,7 +1005,7 @@ function settings_content(App $a) {
'$ptitle' => t('Display Settings'),
'$form_security_token' => get_form_security_token("settings_display"),
'$submit' => t('Save Settings'),
'$baseurl' => App::get_baseurl(true),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
'$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, true),
@ -1223,7 +1223,7 @@ function settings_content(App $a) {
$tpl_addr = get_markup_template("settings_nick_set.tpl");
$prof_addr = replace_macros($tpl_addr,array(
'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), App::get_baseurl().'/profile/'.$nickname),
'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), System::baseUrl().'/profile/'.$nickname),
'$basepath' => $a->get_hostname()
));
@ -1271,7 +1271,7 @@ function settings_content(App $a) {
'$ptitle' => t('Account Settings'),
'$submit' => t('Save Settings'),
'$baseurl' => App::get_baseurl(true),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
'$form_security_token' => get_form_security_token("settings"),
'$nickname_block' => $prof_addr,