Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 09:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-19 14:26:13 +01:00
parent a96eb3428d
commit e1f3661645
108 changed files with 407 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mod/dfrn_request.php
View file

@ -193,9 +193,9 @@ function dfrn_request_post(&$a) {
if (isset($photo))
update_contact_avatar($photo, local_user(), $r[0]["id"], true);
$forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id'];
$forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
} else
$forwardurl = $a->get_baseurl()."/contacts";
$forwardurl = App::get_baseurl()."/contacts";
/*
* Allow the blocked remote notification to complete
@ -501,13 +501,13 @@ function dfrn_request_post(&$a) {
else {
if(! validate_url($url)) {
notice( t('Invalid profile URL.') . EOL);
goaway($a->get_baseurl() . '/' . $a->cmd);
goaway(App::get_baseurl() . '/' . $a->cmd);
return; // NOTREACHED
}
if(! allowed_url($url)) {
notice( t('Disallowed profile URL.') . EOL);
goaway($a->get_baseurl() . '/' . $a->cmd);
goaway(App::get_baseurl() . '/' . $a->cmd);
return; // NOTREACHED
}
@ -518,7 +518,7 @@ function dfrn_request_post(&$a) {
if(! count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL );
goaway($a->get_baseurl() . '/' . $a->cmd);
goaway(App::get_baseurl() . '/' . $a->cmd);
}
else {
if(! x($parms,'fn'))
@ -605,7 +605,7 @@ function dfrn_request_post(&$a) {
// "Homecoming" - send the requestor back to their site to record the introduction.
$dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
$dfrn_url = bin2hex(App::get_baseurl() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@ -634,7 +634,7 @@ function dfrn_request_post(&$a) {
$uri = urlencode($uri);
} else
$uri = $a->get_baseurl().'/profile/'.$nickname;
$uri = App::get_baseurl().'/profile/'.$nickname;
$url = str_replace('{uri}', $uri, $url);
goaway($url);
@ -742,7 +742,7 @@ function dfrn_request_content(&$a) {
'to_name' => $r[0]['username'],
'to_email' => $r[0]['email'],
'uid' => $r[0]['uid'],
'link' => $a->get_baseurl() . '/notifications/intros',
'link' => App::get_baseurl() . '/notifications/intros',
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
'source_link' => $r[0]['url'],
'source_photo' => $r[0]['photo'],
@ -806,7 +806,7 @@ function dfrn_request_content(&$a) {
$myaddr = $_GET['address'];
elseif(local_user()) {
if(strlen($a->path)) {
$myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
$myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
}
else {
$myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );