Browse Source

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

Signed-off-by: Roland Häder <roland@mxchange.org>
tags/3.5.1
Roland Häder 3 years ago
parent
commit
e1f3661645
100 changed files with 394 additions and 424 deletions
  1. +7
    -9
      include/Contact.php
  2. +12
    -14
      include/Photo.php
  3. +1
    -2
      include/auth.php
  4. +2
    -4
      include/bb2diaspora.php
  5. +5
    -7
      include/bbcode.php
  6. +1
    -2
      include/contact_widgets.php
  7. +4
    -4
      include/conversation.php
  8. +2
    -2
      include/dbstructure.php
  9. +1
    -1
      include/delivery.php
  10. +4
    -6
      include/enotify.php
  11. +1
    -1
      include/event.php
  12. +1
    -1
      include/follow.php
  13. +18
    -18
      include/identity.php
  14. +17
    -20
      include/items.php
  15. +2
    -2
      include/like.php
  16. +5
    -8
      include/message.php
  17. +2
    -2
      include/nav.php
  18. +2
    -4
      include/network.php
  19. +1
    -1
      include/notifier.php
  20. +1
    -1
      include/oauth.php
  21. +2
    -3
      include/plugin.php
  22. +1
    -1
      include/pubsubpublish.php
  23. +1
    -1
      include/redir.php
  24. +4
    -4
      include/security.php
  25. +4
    -6
      include/socgraph.php
  26. +2
    -4
      include/tags.php
  27. +1
    -1
      include/text.php
  28. +1
    -3
      include/threads.php
  29. +2
    -2
      include/uimport.php
  30. +18
    -18
      mod/admin.php
  31. +1
    -1
      mod/allfriends.php
  32. +1
    -1
      mod/bookmarklet.php
  33. +6
    -6
      mod/cal.php
  34. +5
    -5
      mod/contacts.php
  35. +4
    -4
      mod/content.php
  36. +7
    -7
      mod/delegate.php
  37. +4
    -4
      mod/dfrn_confirm.php
  38. +4
    -4
      mod/dfrn_poll.php
  39. +9
    -9
      mod/dfrn_request.php
  40. +1
    -1
      mod/dirfind.php
  41. +3
    -3
      mod/display.php
  42. +3
    -3
      mod/editpost.php
  43. +10
    -10
      mod/events.php
  44. +6
    -5
      mod/fbrowser.php
  45. +2
    -2
      mod/friendica.php
  46. +5
    -5
      mod/group.php
  47. +4
    -4
      mod/hcard.php
  48. +4
    -4
      mod/home.php
  49. +1
    -1
      mod/ignored.php
  50. +7
    -9
      mod/install.php
  51. +2
    -2
      mod/invite.php
  52. +10
    -10
      mod/item.php
  53. +1
    -1
      mod/like.php
  54. +1
    -1
      mod/localtime.php
  55. +5
    -7
      mod/lostpass.php
  56. +1
    -1
      mod/manage.php
  57. +11
    -11
      mod/message.php
  58. +1
    -1
      mod/mood.php
  59. +2
    -2
      mod/msearch.php
  60. +1
    -1
      mod/navigation.php
  61. +1
    -1
      mod/network.php
  62. +1
    -1
      mod/nodeinfo.php
  63. +2
    -2
      mod/noscrape.php
  64. +1
    -1
      mod/notice.php
  65. +3
    -3
      mod/notify.php
  66. +2
    -2
      mod/oexchange.php
  67. +1
    -1
      mod/openid.php
  68. +1
    -1
      mod/opensearch.php
  69. +2
    -2
      mod/ostatus_subscribe.php
  70. +10
    -10
      mod/photos.php
  71. +5
    -5
      mod/ping.php
  72. +4
    -4
      mod/poke.php
  73. +8
    -8
      mod/profile.php
  74. +10
    -10
      mod/profile_photo.php
  75. +3
    -3
      mod/profiles.php
  76. +4
    -4
      mod/proxy.php
  77. +1
    -1
      mod/randprof.php
  78. +5
    -5
      mod/register.php
  79. +4
    -4
      mod/regmod.php
  80. +1
    -1
      mod/repair_ostatus.php
  81. +1
    -1
      mod/rsd_xml.php
  82. +9
    -9
      mod/settings.php
  83. +1
    -1
      mod/starred.php
  84. +3
    -3
      mod/suggest.php
  85. +8
    -8
      mod/tagger.php
  86. +8
    -8
      mod/tagrm.php
  87. +1
    -1
      mod/toggle_mobile.php
  88. +2
    -2
      mod/uexport.php
  89. +14
    -14
      mod/videos.php
  90. +6
    -6
      mod/wall_upload.php
  91. +10
    -10
      mod/xrd.php
  92. +1
    -1
      view/php/default.php
  93. +1
    -1
      view/php/minimal.php
  94. +4
    -4
      view/theme/duepuntozero/config.php
  95. +1
    -1
      view/theme/frio/config.php
  96. +2
    -2
      view/theme/frio/php/default.php
  97. +2
    -2
      view/theme/frio/php/standard.php
  98. +1
    -1
      view/theme/frio/theme.php
  99. +1
    -1
      view/theme/frost-mobile/php/default.php
  100. +2
    -2
      view/theme/frost-mobile/theme.php

+ 7
- 9
include/Contact.php View File

@@ -8,7 +8,6 @@
function user_remove($uid) {
if(! $uid)
return;
$a = get_app();
logger('Removing user: ' . $uid);

$r = q("select * from user where uid = %d limit 1", intval($uid));
@@ -54,7 +53,7 @@ function user_remove($uid) {
if($uid == local_user()) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
goaway($a->get_baseurl());
goaway(App::get_baseurl());
}
}

@@ -86,7 +85,6 @@ function contact_remove($id) {

function terminate_friendship($user,$self,$contact) {


$a = get_app();

require_once('include/datetime.php');
@@ -361,7 +359,7 @@ function contact_photo_menu($contact, $uid = 0)
$sparkle = false;
if ($contact['network'] === NETWORK_DFRN) {
$sparkle = true;
$profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
$profile_link = App::get_baseurl() . '/redir/' . $contact['id'];
} else {
$profile_link = $contact['url'];
}
@@ -377,17 +375,17 @@ function contact_photo_menu($contact, $uid = 0)
}

if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
$pm_url = App::get_baseurl() . '/message/new/' . $contact['id'];
}

if ($contact['network'] == NETWORK_DFRN) {
$poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
$poke_link = App::get_baseurl() . '/poke/?f=&c=' . $contact['id'];
}

$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
$contact_url = App::get_baseurl() . '/contacts/' . $contact['id'];

$posts_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
$contact_drop_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
$posts_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
$contact_drop_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';

/**
* menu array:


+ 12
- 14
include/Photo.php View File

@@ -794,8 +794,6 @@ function update_contact_avatar($avatar, $uid, $cid, $force = false) {

function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {

$a = get_app();

$r = q("SELECT `resource-id` FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `scale` = 4 AND `album` = 'Contact Photos' LIMIT 1",
intval($uid),
intval($cid)
@@ -841,9 +839,9 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
$photo_failure = true;
}

$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
$micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
$photo = App::get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
$thumb = App::get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
$micro = App::get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
} else {
$photo_failure = true;
}
@@ -853,9 +851,9 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
}

if ($photo_failure) {
$photo = $a->get_baseurl() . '/images/person-175.jpg';
$thumb = $a->get_baseurl() . '/images/person-80.jpg';
$micro = $a->get_baseurl() . '/images/person-48.jpg';
$photo = App::get_baseurl() . '/images/person-175.jpg';
$thumb = App::get_baseurl() . '/images/person-80.jpg';
$micro = App::get_baseurl() . '/images/person-48.jpg';
}

return(array($photo,$thumb,$micro));
@@ -1044,18 +1042,18 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
return(array());
}

$image = array("page" => $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
"full" => $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
$image = array("page" => App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
"full" => App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt());

if ($width > 800 || $height > 800) {
$image["large"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
$image["large"] = App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
}

if ($width > 640 || $height > 640) {
$ph->scaleImage(640);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
if ($r) {
$image["medium"] = $a->get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
$image["medium"] = App::get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
}
}

@@ -1063,7 +1061,7 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
$ph->scaleImage(320);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
if ($r) {
$image["small"] = $a->get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
$image["small"] = App::get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
}
}

@@ -1088,7 +1086,7 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {

$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
if ($r) {
$image["thumb"] = $a->get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
$image["thumb"] = App::get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
}
}



+ 1
- 2
include/auth.php View File

@@ -125,8 +125,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
$openid = new LightOpenID;
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$a = get_app();
$openid->returnUrl = $a->get_baseurl(true).'/openid';
$openid->returnUrl = App::get_baseurl(true).'/openid';
goaway($openid->authUrl());
} catch (Exception $e) {
notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'.t('The error message was:').' '.$e->getMessage());


+ 2
- 4
include/bb2diaspora.php View File

@@ -144,8 +144,6 @@ function unescape_underscores_in_links($m) {

function format_event_diaspora($ev) {

$a = get_app();

if(! ((is_array($ev)) && count($ev)))
return '';

@@ -160,7 +158,7 @@ function format_event_diaspora($ev) {
$ev['start'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$ev['start'] , $bd_format)))
. '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
. '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";

if(! $ev['nofinish'])
$o .= t('Finishes:') . ' ' . '['
@@ -168,7 +166,7 @@ function format_event_diaspora($ev) {
$ev['finish'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$ev['finish'] , $bd_format )))
. '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
. '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";

if(strlen($ev['location']))
$o .= t('Location:') . bb2diaspora($ev['location'])


+ 5
- 7
include/bbcode.php View File

@@ -613,9 +613,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
}

function bb_DiasporaLinks($match) {
$a = get_app();

return "[url=".$a->get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
return "[url=".App::get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
}

function bb_RemovePictureLinks($match) {
@@ -894,7 +892,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// we may need to restrict this further if it picks up too many strays
// link acct:user@host to a webfinger profile redirector

$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text);
$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text);

// Perform MAIL Search
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
@@ -1063,9 +1061,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
return(bb_ShareAttributes($match, $simplehtml));
},$Text);

$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);


// Try to Oembed


+ 1
- 2
include/contact_widgets.php View File

@@ -116,7 +116,6 @@ function networks_widget($baseurl,$selected = '') {
}

function fileas_widget($baseurl,$selected = '') {
$a = get_app();
if(! local_user())
return '';

@@ -235,7 +234,7 @@ function common_friends_visitor_widget($profile_uid) {

return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
'$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
'$base' => $a->get_baseurl(),
'$base' => App::get_baseurl(),
'$uid' => $profile_uid,
'$cid' => (($cid) ? $cid : '0'),
'$linkmore' => (($t > 5) ? 'true' : ''),


+ 4
- 4
include/conversation.php View File

@@ -864,7 +864,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}

$o = replace_macros($page_template, array(
'$baseurl' => $a->get_baseurl($ssl_state),
'$baseurl' => App::get_baseurl($ssl_state),
'$return_path' => $a->query_string,
'$live_update' => $live_update_div,
'$remove' => t('remove'),
@@ -1183,7 +1183,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$tpl = get_markup_template('jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$newpost' => 'true',
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$geotag' => $geotag,
'$nickname' => $x['nickname'],
@@ -1201,7 +1201,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$tpl = get_markup_template('jot-end.tpl');
$a->page['end'] .= replace_macros($tpl, array(
'$newpost' => 'true',
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$geotag' => $geotag,
'$nickname' => $x['nickname'],
@@ -1267,7 +1267,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
'$content' => $x['content'],
'$post_id' => $x['post_id'],
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$defloc' => $x['default_location'],
'$visitor' => $x['visitor'],
'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),


+ 2
- 2
include/dbstructure.php View File

@@ -56,11 +56,11 @@ function update_fail($update_id, $error_message){
$email_tpl = get_intltext_template("update_fail_eml.tpl");
$email_msg = replace_macros($email_tpl, array(
'$sitename' => $a->config['sitename'],
'$siteurl' => $a->get_baseurl(),
'$siteurl' => App::get_baseurl(),
'$update' => DB_UPDATE_VERSION,
'$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
));
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
$subject=sprintf(t('Update Error at %s'), App::get_baseurl());
require_once('include/email.php');
$subject = email_header_encode($subject,'UTF-8');
mail($a->config['admin_email'], $subject, $email_msg,


+ 1
- 1
include/delivery.php View File

@@ -323,7 +323,7 @@ function delivery_run(&$argv, &$argc){

// perform local delivery if we are on the same site

if (link_compare($basepath,$a->get_baseurl())) {
if (link_compare($basepath,App::get_baseurl())) {

$nickname = basename($contact['url']);
if ($contact['issued-id'])


+ 4
- 6
include/enotify.php View File

@@ -23,7 +23,7 @@ function notification($params) {

$banner = t('Friendica Notification');
$product = FRIENDICA_PLATFORM;
$siteurl = $a->get_baseurl(true);
$siteurl = App::get_baseurl(true);
$thanks = t('Thank You,');
$sitename = $a->config['sitename'];
if (!x($a->config['admin_name']))
@@ -58,7 +58,7 @@ function notification($params) {
$additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n";
$additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n";
$additional_mail_header .= "List-ID: <notification.".$hostname.">\n";
$additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n";
$additional_mail_header .= "List-Archive: <".App::get_baseurl()."/notifications/system>\n";

if (array_key_exists('item', $params)) {
$title = $params['item']['title'];
@@ -494,7 +494,7 @@ function notification($params) {
}


$itemlink = $a->get_baseurl().'/notify/view/'.$notify_id;
$itemlink = App::get_baseurl().'/notify/view/'.$notify_id;
$msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
$r = q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
@@ -648,8 +648,6 @@ function notification($params) {
* @param str $defaulttype (Optional) Forces a notification with this type.
*/
function check_item_notification($itemid, $uid, $defaulttype = "") {
$a = get_app();

$notification_data = array("uid" => $uid, "profiles" => array());
call_hooks('check_item_notification', $notification_data);

@@ -667,7 +665,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$profiles[] = $owner[0]["url"];

// Notifications from Diaspora are often with an URL in the Diaspora format
$profiles[] = $a->get_baseurl()."/u/".$user[0]["nickname"];
$profiles[] = App::get_baseurl()."/u/".$user[0]["nickname"];

$profiles2 = array();



+ 1
- 1
include/event.php View File

@@ -408,7 +408,7 @@ function event_store($arr) {
intval($arr['uid'])
);
//if (dbm::is_result($r))
// $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
// $plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;


if($item_id) {


+ 1
- 1
include/follow.php View File

@@ -99,7 +99,7 @@ function new_contact($uid,$url,$interactive = false) {
if($ret['network'] === NETWORK_DFRN) {
if($interactive) {
if(strlen($a->path))
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
$myaddr = bin2hex(App::get_baseurl() . '/profile/' . $a->user['nickname']);
else
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());



+ 18
- 18
include/identity.php View File

@@ -232,7 +232,7 @@ function profile_sidebar($profile, $block = 0) {
if (isset($profile["url"]))
$profile_url = normalise_link($profile["url"]);
else
$profile_url = normalise_link($a->get_baseurl()."/profile/".$profile["nickname"]);
$profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);

$r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
local_user(), $profile_url);
@@ -279,7 +279,7 @@ function profile_sidebar($profile, $block = 0) {

// show edit profile to yourself
if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
$profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
local_user());

@@ -308,7 +308,7 @@ function profile_sidebar($profile, $block = 0) {
}
}
if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
$profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
$profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
'cr_new' => null,
@@ -349,15 +349,15 @@ function profile_sidebar($profile, $block = 0) {
if ($profile['guid'] != "")
$diaspora = array(
'guid' => $profile['guid'],
'podloc' => $a->get_baseurl(),
'podloc' => App::get_baseurl(),
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
'nickname' => $profile['nickname'],
'fullname' => $profile['name'],
'firstname' => $firstname,
'lastname' => $lastname,
'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
'photo50' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
'photo300' => App::get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
'photo100' => App::get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
'photo50' => App::get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
);
else
$diaspora = false;
@@ -489,7 +489,7 @@ function get_birthdays() {
$url = $rr['url'];
if($rr['network'] === NETWORK_DFRN) {
$sparkle = " sparkle";
$url = $a->get_baseurl() . '/redir/' . $rr['cid'];
$url = App::get_baseurl() . '/redir/' . $rr['cid'];
}

$rr['link'] = $url;
@@ -503,7 +503,7 @@ function get_birthdays() {
}
$tpl = get_markup_template("birthdays_reminder.tpl");
return replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$classtoday' => $classtoday,
'$count' => $total,
'$event_reminders' => t('Birthday Reminders'),
@@ -587,7 +587,7 @@ function get_events() {

$tpl = get_markup_template("events_reminder.tpl");
return replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$classtoday' => $classtoday,
'$count' => count($r) - $skip,
'$event_reminders' => t('Event Reminders'),
@@ -685,7 +685,7 @@ function advanced_profile(&$a) {
}

if ($a->profile['uid'] == local_user())
$profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));

return replace_macros($tpl, array(
'$title' => t('Profile'),
@@ -707,7 +707,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));

$url = $a->get_baseurl() . '/profile/' . $nickname;
$url = App::get_baseurl() . '/profile/' . $nickname;

$tabs = array(
array(
@@ -728,7 +728,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
),
array(
'label' => t('Photos'),
'url' => $a->get_baseurl() . '/photos/' . $nickname,
'url' => App::get_baseurl() . '/photos/' . $nickname,
'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
'title' => t('Photo Albums'),
'id' => 'photo-tab',
@@ -736,7 +736,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
),
array(
'label' => t('Videos'),
'url' => $a->get_baseurl() . '/videos/' . $nickname,
'url' => App::get_baseurl() . '/videos/' . $nickname,
'sel' => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
'title' => t('Videos'),
'id' => 'video-tab',
@@ -748,7 +748,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
if ($is_owner && $a->theme_events_in_profile) {
$tabs[] = array(
'label' => t('Events'),
'url' => $a->get_baseurl() . '/events',
'url' => App::get_baseurl() . '/events',
'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
'title' => t('Events and Calendar'),
'id' => 'events-tab',
@@ -759,7 +759,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
} elseif (! $is_owner) {
$tabs[] = array(
'label' => t('Events'),
'url' => $a->get_baseurl() . '/cal/' . $nickname,
'url' => App::get_baseurl() . '/cal/' . $nickname,
'sel' =>((!isset($tab)&&$a->argv[0]=='cal')?'active':''),
'title' => t('Events and Calendar'),
'id' => 'events-tab',
@@ -770,7 +770,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
if ($is_owner){
$tabs[] = array(
'label' => t('Personal Notes'),
'url' => $a->get_baseurl() . '/notes',
'url' => App::get_baseurl() . '/notes',
'sel' =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
'title' => t('Only You Can See This'),
'id' => 'notes-tab',
@@ -781,7 +781,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) {
$tabs[] = array(
'label' => t('Contacts'),
'url' => $a->get_baseurl() . '/viewcontacts/' . $nickname,
'url' => App::get_baseurl() . '/viewcontacts/' . $nickname,
'sel' => ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
'title' => t('Contacts'),
'id' => 'viewcontacts-tab',


+ 17
- 20
include/items.php View File

@@ -208,13 +208,12 @@ function add_page_info_data($data) {

$hashtags = "";
if (isset($data["keywords"]) AND count($data["keywords"])) {
$a = get_app();
$hashtags = "\n";
foreach ($data["keywords"] AS $keyword) {
/// @todo make a positive list of allowed characters
$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"),
array("","", "", "", "", "", "", "", "", "", "", ""), $keyword);
$hashtags .= "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] ";
$hashtags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] ";
}
}

@@ -251,7 +250,6 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa

$tags = "";
if (isset($data["keywords"]) AND count($data["keywords"])) {
$a = get_app();
foreach ($data["keywords"] AS $keyword) {
$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"),
array("","", "", "", "", ""), $keyword);
@@ -259,7 +257,7 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa
if ($tags != "")
$tags .= ",";

$tags .= "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]";
$tags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]";
}
}

@@ -557,8 +555,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG);

if ($arr['plink'] == "") {
$a = get_app();
$arr['plink'] = $a->get_baseurl().'/display/'.urlencode($arr['guid']);
$arr['plink'] = App::get_baseurl().'/display/'.urlencode($arr['guid']);
}

if ($arr['network'] == "") {
@@ -709,7 +706,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
if (count($u)) {
$a = get_app();
$self = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
$self = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
if ((normalise_link($arr['author-link']) == $self) OR (normalise_link($arr['owner-link']) == $self)) {
q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", intval($parent_id));
@@ -1068,10 +1065,10 @@ function item_body_set_hashtags(&$item) {

// All hashtags should point to the home server
//$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
// "#[url=".$a->get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]);
// "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]);

//$item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
// "#[url=".$a->get_baseurl()."/search?tag=$2]$2[/url]", $item["tag"]);
// "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["tag"]);

// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
$item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
@@ -1103,7 +1100,7 @@ function item_body_set_hashtags(&$item) {

$basetag = str_replace('_',' ',substr($tag,1));

$newtag = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]';
$newtag = '#[url='.App::get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]';

$item["body"] = str_replace($tag, $newtag, $item["body"]);

@@ -1207,12 +1204,12 @@ function tag_deliver($uid,$item_id) {

$item = $i[0];

$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
$link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);

// Diaspora uses their own hardwired link URL in @-tags
// instead of the one we supply with webfinger

$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
$dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']);

$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
if ($cnt) {
@@ -1312,12 +1309,12 @@ function tgroup_check($uid,$item) {
$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);


$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
$link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);

// Diaspora uses their own hardwired link URL in @-tags
// instead of the one we supply with webfinger

$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
$dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']);

$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
if ($cnt) {
@@ -1572,7 +1569,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
'to_name' => $r[0]['username'],
'to_email' => $r[0]['email'],
'uid' => $r[0]['uid'],
'link' => $a->get_baseurl() . '/notifications/intro',
'link' => App::get_baseurl() . '/notifications/intro',
'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : t('[Name Withheld]')),
'source_link' => $contact_record['url'],
'source_photo' => $contact_record['photo'],
@@ -1665,7 +1662,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
$a = get_app();

logger('fix_private_photos: check for photos', LOGGER_DEBUG);
$site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
$site = substr(App::get_baseurl(),strpos(App::get_baseurl(),'://'));

$orig_body = $s;
$new_body = '';
@@ -1929,7 +1926,7 @@ function drop_item($id,$interactive = true) {
if (! $interactive)
return 0;
notice( t('Item not found.') . EOL);
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
}

$item = $r[0];
@@ -1977,7 +1974,7 @@ function drop_item($id,$interactive = true) {
}
// Now check how the user responded to the confirmation query
if ($_REQUEST['canceled']) {
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
}

logger('delete item: ' . $item['id'], LOGGER_DEBUG);
@@ -2127,13 +2124,13 @@ function drop_item($id,$interactive = true) {

if (! $interactive)
return $owner;
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
//NOTREACHED
} else {
if (! $interactive)
return 0;
notice( t('Permission denied.') . EOL);
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
//NOTREACHED
}



+ 2
- 2
include/like.php View File

@@ -164,7 +164,7 @@ function do_like($item_id, $verb) {
if($item['object-type'] === ACTIVITY_OBJ_EVENT)
$post_type = t('event');
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
$body = $item['body'];

$obj = <<< EOT
@@ -214,7 +214,7 @@ EOT;

$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
$plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );

$arr['verb'] = $activity;


+ 5
- 8
include/message.php View File

@@ -27,7 +27,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
}

$guid = get_guid(32);
$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;

$convid = 0;
$reply = false;
@@ -53,7 +53,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$recip_host = substr($recip_host,0,strpos($recip_host,'/'));

$recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
$sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
$sender_handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);

$conv_guid = get_guid(32);
$convuri = $recip_handle.':'.$conv_guid;
@@ -134,7 +134,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$images = $match[1];
if(count($images)) {
foreach($images as $image) {
if(! stristr($image,$a->get_baseurl() . '/photo/'))
if(! stristr($image,App::get_baseurl() . '/photo/'))
continue;
$image_uri = substr($image,strrpos($image,'/') + 1);
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
@@ -164,16 +164,13 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){

function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){

$a = get_app();


if(! $recipient) return -1;

if(! strlen($subject))
$subject = t('[no subject]');

$guid = get_guid(32);
$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;

$convid = 0;
$reply = false;
@@ -187,7 +184,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){

$conv_guid = get_guid(32);

$recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
$recip_handle = $recipient['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);

$sender_nick = basename($replyto);
$sender_host = substr($replyto,strpos($replyto,'://')+3);


+ 2
- 2
include/nav.php View File

@@ -28,7 +28,7 @@ function nav(&$a) {
$tpl = get_markup_template('nav.tpl');

$a->page['nav'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$sitelocation' => $nav_info['sitelocation'],
'$nav' => $nav_info['nav'],
'$banner' => $nav_info['banner'],
@@ -65,7 +65,7 @@ function nav_info(App $a)

$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');

$sitelocation = $myident . substr($a->get_baseurl($ssl_state), strpos($a->get_baseurl($ssl_state), '//') + 2 );
$sitelocation = $myident . substr(App::get_baseurl($ssl_state), strpos(App::get_baseurl($ssl_state), '//') + 2 );

// nav links: array of array('href', 'text', 'extra css classes', 'title')
$nav = array();


+ 2
- 4
include/network.php View File

@@ -513,8 +513,6 @@ function allowed_email($email) {

function avatar_img($email) {

$a = get_app();

$avatar['size'] = 175;
$avatar['email'] = $email;
$avatar['url'] = '';
@@ -523,7 +521,7 @@ function avatar_img($email) {
call_hooks('avatar_lookup', $avatar);

if(! $avatar['success'])
$avatar['url'] = $a->get_baseurl() . '/images/person-175.jpg';
$avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';

logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
return $avatar['url'];
@@ -569,7 +567,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
foreach($matches as $mtch) {
logger('scale_external_image: ' . $mtch[1]);

$hostname = str_replace('www.','',substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3));
$hostname = str_replace('www.','',substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3));
if(stristr($mtch[1],$hostname))
continue;



+ 1
- 1
include/notifier.php View File

@@ -649,7 +649,7 @@ function notifier_run(&$argv, &$argc){

} else {

$params = 'hub.mode=publish&hub.url=' . urlencode( $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
$params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
post_url($h,$params);
logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
}


+ 1
- 1
include/oauth.php View File

@@ -148,7 +148,7 @@ class FKOAuth1 extends OAuthServer {
$_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
$_SESSION['authenticated'] = 1;
$_SESSION['page_flags'] = $record['page-flags'];
$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
$_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $record['nickname'];
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
$_SESSION["allow_api"] = true;



+ 2
- 3
include/plugin.php View File

@@ -410,13 +410,12 @@ function get_theme_info($theme){
* @return string
*/
function get_theme_screenshot($theme) {
$a = get_app();
$exts = array('.png','.jpg');
foreach($exts as $ext) {
if(file_exists('view/theme/' . $theme . '/screenshot' . $ext))
return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
}
return($a->get_baseurl() . '/images/blank.png');
return(App::get_baseurl() . '/images/blank.png');
}

// install and uninstall theme


+ 1
- 1
include/pubsubpublish.php View File

@@ -21,7 +21,7 @@ function handle_pubsubhubbub($id) {

$headers = array("Content-type: application/atom+xml",
sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
$a->get_baseurl().'/pubsubhubbub',
App::get_baseurl().'/pubsubhubbub',
$rr['topic']),
"X-Hub-Signature: sha1=".$hmac_sig);



+ 1
- 1
include/redir.php View File

@@ -20,7 +20,7 @@ function auto_redir(&$a, $contact_nick) {
//
// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.

$baseurl = $a->get_baseurl();
$baseurl = App::get_baseurl();
$domain_st = strpos($baseurl, "://");
if($domain_st === false)
return;


+ 4
- 4
include/security.php View File

@@ -9,8 +9,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme');
$_SESSION['authenticated'] = 1;
$_SESSION['page_flags'] = $user_record['page-flags'];
$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $user_record['nickname'];
$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
$_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $user_record['nickname'];
$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];

$a->user = $user_record;
@@ -98,7 +98,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
call_hooks('logged_in', $a->user);

if(($a->module !== 'home') && isset($_SESSION['return_url']))
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
}

}
@@ -378,7 +378,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
notice( check_form_security_std_err_msg() );
goaway($a->get_baseurl() . $err_redirect );
goaway(App::get_baseurl() . $err_redirect );
}
}
function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {


+ 4
- 6
include/socgraph.php View File

@@ -207,7 +207,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
$orig_updated = $updated;

// The global contacts should contain the original picture, not the cached one
if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link($a->get_baseurl()."/photo/")))
if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link(App::get_baseurl()."/photo/")))
$profile_photo = "";

$r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
@@ -1181,9 +1181,9 @@ function update_suggestions() {
$done = array();

/// TODO Check if it is really neccessary to poll the own server
poco_load(0,0,0,$a->get_baseurl() . '/poco');
poco_load(0,0,0,App::get_baseurl() . '/poco');

$done[] = $a->get_baseurl() . '/poco';
$done[] = App::get_baseurl() . '/poco';

if(strlen(get_config('system','directory'))) {
$x = fetch_url(get_server()."/pubsites");
@@ -1771,8 +1771,6 @@ function gs_fetch_users($server) {

logger("Fetching users from GNU Social server ".$server, LOGGER_DEBUG);

$a = get_app();

$url = $server."/main/statistics";

$result = z_fetch_url($url);
@@ -1811,7 +1809,7 @@ function gs_fetch_users($server) {
"nick" => $user->nickname,
"about" => $user->bio,
"network" => NETWORK_OSTATUS,
"photo" => $a->get_baseurl()."/images/person-175.jpg");
"photo" => App::get_baseurl()."/images/person-175.jpg");
get_gcontact_id($contact);
}
}


+ 2
- 4
include/tags.php View File

@@ -1,13 +1,11 @@
<?php
function create_tags_from_item($itemid) {
$a = get_app();

$profile_base = $a->get_baseurl();
$profile_base = App::get_baseurl();
$profile_data = parse_url($profile_base);
$profile_base_friendica = $profile_data['host'].$profile_data['path']."/profile/";
$profile_base_diaspora = $profile_data['host'].$profile_data['path']."/u/";

$searchpath = $a->get_baseurl()."/search?tag=";
$searchpath = App::get_baseurl()."/search?tag=";

$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `created`, `received`, `title`, `body`, `tag`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));



+ 1
- 1
include/text.php View File

@@ -23,7 +23,7 @@ function replace_macros($s,$r) {
$a = get_app();

// pass $baseurl to all templates
$r['$baseurl'] = $a->get_baseurl();
$r['$baseurl'] = App::get_baseurl();


$t = $a->template_engine();


+ 1
- 3
include/threads.php View File

@@ -267,12 +267,10 @@ function update_threads() {
}

function update_threads_mention() {
$a = get_app();

$users = q("SELECT `uid`, `nickname` FROM `user` ORDER BY `uid`");

foreach ($users AS $user) {
$self = normalise_link($a->get_baseurl() . '/profile/' . $user['nickname']);
$self = normalise_link(App::get_baseurl() . '/profile/' . $user['nickname']);
$selfhttps = str_replace("http://", "https://", $self);
$parents = q("SELECT DISTINCT(`parent`) FROM `item` WHERE `uid` = %d AND
((`owner-link` IN ('%s', '%s')) OR (`author-link` IN ('%s', '%s')))",


+ 2
- 2
include/uimport.php View File

@@ -133,7 +133,7 @@ function import_account(&$a, $file) {
}
$oldbaseurl = $account['baseurl'];
$newbaseurl = $a->get_baseurl();
$newbaseurl = App::get_baseurl();
$olduid = $account['user']['uid'];
unset($account['user']['uid']);
@@ -290,5 +290,5 @@ function import_account(&$a, $file) {
proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
info(t("Done. You can now login with your username and password"));
goaway($a->get_baseurl() . "/login");
goaway(App::get_baseurl() . "/login");
}

+ 18
- 18
mod/admin.php View File

@@ -376,7 +376,7 @@ function admin_page_federation(&$a) {
'$counts' => $counts,
'$version' => FRIENDICA_VERSION,
'$legendtext' => sprintf(t('Currently this node is aware of %d nodes from the following platforms:'), $total),
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
));
}

@@ -489,7 +489,7 @@ function admin_page_summary(&$a) {
'$accounts' => $accounts,
'$pending' => array(t('Pending registrations'), $pending),
'$version' => array(t('Version'), FRIENDICA_VERSION),
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
'$build' => get_config('system','build'),
@@ -527,7 +527,7 @@ function admin_page_site_post(&$a) {
* send relocate for every local user
* */

$old_url = $a->get_baseurl(true);
$old_url = App::get_baseurl(true);

// Generate host names for relocation the addresses in the format user@address.tld
$new_host = str_replace("http://", "@", normalise_link($new_url));
@@ -961,7 +961,7 @@ function admin_page_site(&$a) {
'$performance' => t('Performance'),
'$worker_title' => t('Worker'),
'$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
// name, label, value, help string, extra data...
'$sitename' => array('sitename', t("Site name"), $a->config['sitename'],''),
'$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""),
@@ -1043,7 +1043,7 @@ function admin_page_site(&$a) {
'$old_pager' => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
'$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),

'$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
'$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),

'$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
'$embedly' => array('embedly', t("Embedly API key"), get_config('system','embedly'), t("<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for web pages. This is an optional parameter.")),
@@ -1131,13 +1131,13 @@ function admin_page_dbsync(&$a) {
}
if(! count($failed)) {
$o = replace_macros(get_markup_template('structure_check.tpl'),array(
'$base' => $a->get_baseurl(true),
'$base' => App::get_baseurl(true),
'$banner' => t('No failed updates.'),
'$check' => t('Check database structure'),
));
} else {
$o = replace_macros(get_markup_template('failed_updates.tpl'),array(
'$base' => $a->get_baseurl(true),
'$base' => App::get_baseurl(true),
'$banner' => t('Failed Updates'),
'$desc' => t('This does not include updates prior to 1139, which did not return a status.'),
'$mark' => t('Mark success (if update was manually applied)'),
@@ -1205,7 +1205,7 @@ function admin_page_users_post(&$a){
Thank you and welcome to %4$s.'));

$preamble = sprintf($preamble, $nu['username'], $a->config['sitename']);
$body = sprintf($body, $a->get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']);
$body = sprintf($body, App::get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']);

notification(array(
'type' => "SYSTEM_EMAIL",
@@ -1430,7 +1430,7 @@ function admin_page_users(&$a){
'$form_security_token' => get_form_security_token("admin_users"),

// values //
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),

'$pending' => $pending,
'deleted' => $deleted,
@@ -1522,7 +1522,7 @@ function admin_page_plugins(&$a){
'$page' => t('Plugins'),
'$toggle' => t('Toggle'),
'$settings' => t('Settings'),
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),

'$plugin' => $plugin,
'$status' => $status,
@@ -1547,10 +1547,10 @@ function admin_page_plugins(&$a){
*/

if(x($_GET,"a") && $_GET['a']=="r") {
check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/plugins', 'admin_themes', 't');
check_form_security_token_redirectOnErr(App::get_baseurl().'/admin/plugins', 'admin_themes', 't');
reload_plugins();
info("Plugins reloaded");
goaway($a->get_baseurl().'/admin/plugins');
goaway(App::get_baseurl().'/admin/plugins');
}

$plugins = array();
@@ -1582,7 +1582,7 @@ function admin_page_plugins(&$a){
'$page' => t('Plugins'),
'$submit' => t('Save Settings'),
'$reload' => t('Reload active plugins'),
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$function' => 'plugins',
'$plugins' => $plugins,
'$pcount' => count($plugins),
@@ -1780,7 +1780,7 @@ function admin_page_themes(&$a){
'$page' => t('Themes'),
'$toggle' => t('Toggle'),
'$settings' => t('Settings'),
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$plugin' => $theme,
'$status' => $status,
'$action' => $action,
@@ -1799,7 +1799,7 @@ function admin_page_themes(&$a){

// reload active themes
if(x($_GET,"a") && $_GET['a']=="r") {
check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/themes', 'admin_themes', 't');
check_form_security_token_redirectOnErr(App::get_baseurl().'/admin/themes', 'admin_themes', 't');
if($themes) {
foreach($themes as $th) {
if($th['allowed']) {
@@ -1809,7 +1809,7 @@ function admin_page_themes(&$a){
}
}
info("Themes reloaded");
goaway($a->get_baseurl().'/admin/themes');
goaway(App::get_baseurl().'/admin/themes');
}

/*
@@ -1830,7 +1830,7 @@ function admin_page_themes(&$a){
'$page' => t('Themes'),
'$submit' => t('Save Settings'),
'$reload' => t('Reload active themes'),
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$function' => 'themes',
'$plugins' => $xthemes,
'$pcount' => count($themes),
@@ -1904,7 +1904,7 @@ function admin_page_logs(&$a){
'$page' => t('Logs'),
'$submit' => t('Save Settings'),
'$clear' => t('Clear'),
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$logname' => get_config('system','logfile'),

// name, label, value, help string, extra data...


+ 1
- 1
mod/allfriends.php View File

@@ -60,7 +60,7 @@ function allfriends_content(&$a) {
$photo_menu = contact_photo_menu ($rr);
}
else {
$connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['url'];
$connlnk = App::get_baseurl() . '/follow/?url=' . $rr['url'];
$photo_menu = array(
'profile' => array(t("View Profile"), zrl($rr['url'])),
'follow' => array(t("Connect/Follow"), $connlnk)


+ 1
- 1
mod/bookmarklet.php View File

@@ -15,7 +15,7 @@ function bookmarklet_content(&$a) {
}

$referer = normalise_link($_SERVER["HTTP_REFERER"]);
$page = normalise_link($a->get_baseurl()."/bookmarklet");
$page = normalise_link(App::get_baseurl()."/bookmarklet");

if (!strstr($referer, $page)) {
$content = add_page_info($_REQUEST["url"]);


+ 6
- 6
mod/cal.php View File

@@ -80,7 +80,7 @@ function cal_content(&$a) {

$htpl = get_markup_template('event_head.tpl');
$a->page['htmlhead'] .= replace_macros($htpl,array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$module_url' => '/cal/' . $a->data['user']['nickname'],
'$modparams' => 2,
'$i18n' => $i18n,
@@ -89,7 +89,7 @@ function cal_content(&$a) {

$etpl = get_markup_template('event_end.tpl');
$a->page['end'] .= replace_macros($etpl,array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$editselect' => $editselect
));

@@ -232,7 +232,7 @@ function cal_content(&$a) {
foreach($r as $rr) {
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
if(! x($links,$j))
$links[$j] = $a->get_baseurl() . '/' . $a->cmd . '#link-' . $j;
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
}
}

@@ -270,12 +270,12 @@ function cal_content(&$a) {
}

$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$tabs' => $tabs,
'$title' => t('Events'),
'$view' => t('View'),
'$previus' => array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
'$previus' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
'$calendar' => cal($y,$m,$links, ' eventcal'),

'$events' => $events,


+ 5
- 5
mod/contacts.php View File

@@ -78,13 +78,13 @@ function contacts_init(&$a) {
$base = z_root();
$tpl = get_markup_template("contacts-head.tpl");
$a->page['htmlhead'] .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$base' => $base
));

$tpl = get_markup_template("contacts-end.tpl");
$a->page['end'] .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$base' => $base
));

@@ -480,11 +480,11 @@ function contacts_content(&$a) {
$editselect = 'exact';

$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$editselect' => $editselect,
));
$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
'$baseurl' => $a->get_baseurl(true),
'$baseurl' => App::get_baseurl(true),
'$editselect' => $editselect,
));

@@ -564,7 +564,7 @@ function contacts_content(&$a) {

if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
($contact['rel'] == CONTACT_IS_FOLLOWER))
$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
$follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);

// Load contactact related actions like hide, suggest, delete and others
$contact_actions = contact_actions($contact);


+ 4
- 4
mod/content.php View File

@@ -117,7 +117,7 @@ function content_content(&$a, $update = 0) {
if($update)
killme();
notice( t('No such group') . EOL );
goaway($a->get_baseurl(true) . '/network');
goaway(App::get_baseurl(true) . '/network');
// NOTREACHED
}

@@ -509,8 +509,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
'like' => '',
'dislike' => '',
'comment' => '',
//'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state).'/display/'.$item['guid'], 'title'=> t('View in context'))),
//'conv' => (($preview) ? '' : array('href'=> App::get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
'conv' => (($preview) ? '' : array('href'=> App::get_baseurl($ssl_state).'/display/'.$item['guid'], 'title'=> t('View in context'))),
'previewing' => $previewing,
'wait' => t('Please wait'),
);
@@ -743,7 +743,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
}

if(local_user() && link_compare($a->contact['url'],$item['author-link']))
$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
$edpost = array(App::get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
else
$edpost = false;



+ 7
- 7
mod/delegate.php View File

@@ -18,7 +18,7 @@ function delegate_content(&$a) {
// delegated admins can view but not change delegation permissions

if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
goaway($a->get_baseurl() . '/delegate');
goaway(App::get_baseurl() . '/delegate');


$id = $a->argv[2];
@@ -29,7 +29,7 @@ function delegate_content(&$a) {
if (dbm::is_result($r)) {
$r = q("select id from contact where uid = %d and nurl = '%s' limit 1",
intval(local_user()),
dbesc(normalise_link($a->get_baseurl() . '/profile/' . $r[0]['nickname']))
dbesc(normalise_link(App::get_baseurl() . '/profile/' . $r[0]['nickname']))
);
if (dbm::is_result($r)) {
q("insert into manage ( uid, mid ) values ( %d , %d ) ",
@@ -38,7 +38,7 @@ function delegate_content(&$a) {
);
}
}
goaway($a->get_baseurl() . '/delegate');
goaway(App::get_baseurl() . '/delegate');
}

if($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
@@ -46,13 +46,13 @@ function delegate_content(&$a) {
// delegated admins can view but not change delegation permissions

if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
goaway($a->get_baseurl() . '/delegate');
goaway(App::get_baseurl() . '/delegate');

q("delete from manage where uid = %d and mid = %d limit 1",
intval($a->argv[2]),
intval(local_user())
);
goaway($a->get_baseurl() . '/delegate');
goaway(App::get_baseurl() . '/delegate');

}

@@ -92,7 +92,7 @@ function delegate_content(&$a) {

$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s'
and contact.uid = %d and contact.self = 0 and network = '%s' ",
dbesc(normalise_link($a->get_baseurl())),
dbesc(normalise_link(App::get_baseurl())),
intval(local_user()),
dbesc(NETWORK_DFRN)
);
@@ -128,7 +128,7 @@ function delegate_content(&$a) {

$o = replace_macros(get_markup_template('delegate.tpl'),array(
'$header' => t('Delegate Page Management'),
'$base' => $a->get_baseurl(),
'$base' => App::get_baseurl(),
'$desc' => t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'),
'$head_managers' => t('Existing Page Managers'),
'$managers' => $full_managers,


+ 4
- 4
mod/dfrn_confirm.php View File

@@ -194,7 +194,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$params['public_key'] = $public_key;


$my_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
$my_url = App::get_baseurl() . '/profile/' . $user[0]['nickname'];

openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
$params['source_url'] = bin2hex($params['source_url']);
@@ -504,7 +504,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
// do anything special with this new friend.

if($handsfree === null)
goaway($a->get_baseurl() . '/contacts/' . intval($contact_id));
goaway(App::get_baseurl() . '/contacts/' . intval($contact_id));
else
return;
//NOTREACHED
@@ -664,7 +664,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
if (dbm::is_result($r))
$photo = $r[0]['photo'];
else
$photo = $a->get_baseurl() . '/images/person-175.jpg';
$photo = App::get_baseurl() . '/images/person-175.jpg';

require_once("include/Photo.php");

@@ -726,7 +726,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
'to_name' => $r[0]['username'],
'to_email' => $r[0]['email'],
'uid' => $r[0]['uid'],
'link' => $a->get_baseurl() . '/contacts/' . $dfrn_record,
'link' => App::get_baseurl() . '/contacts/' . $dfrn_record,
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
'source_link' => $r[0]['url'],
'source_photo' => $r[0]['photo'],


+ 4
- 4
mod/dfrn_poll.php View File

@@ -112,7 +112,7 @@ function dfrn_poll_init(&$a) {
}
}
$profile = $r[0]['nickname'];
goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile);
goaway((strlen($destination_url)) ? $destination_url : App::get_baseurl() . '/profile/' . $profile);
}
goaway(z_root());

@@ -499,14 +499,14 @@ function dfrn_poll_content(&$a) {

switch($destination_url) {
case 'profile':
$dest = $a->get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
$dest = App::get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
break;
case 'photos':
$dest = $a->get_baseurl() . '/photos/' . $profile;
$dest = App::get_baseurl() . '/photos/' . $profile;
break;
case 'status':
case '':
$dest = $a->get_baseurl() . '/profile/' . $profile;
$dest = App::get_baseurl() . '/profile/' . $profile;
break;
default:
$dest = $destination_url . '?f=&redir=1';


+ 9
- 9
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 );


+ 1
- 1
mod/dirfind.php View File

@@ -197,7 +197,7 @@ function dirfind_content(&$a, $prefix = "") {
} else
$photo_menu = array();
} else {
$connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
$connlnk = App::get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
$conntxt = t('Connect');
$photo_menu = array(
'profile' => array(t("View Profile"), zrl($jj->url)),


+ 3
- 3
mod/display.php View File

@@ -81,8 +81,8 @@ function display_init(&$a) {

$profiledata = display_fetchauthor($a, $r[0]);

if (strstr(normalise_link($profiledata["url"]), normalise_link($a->get_baseurl()))) {
$nickname = str_replace(normalise_link($a->get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
if (strstr(normalise_link($profiledata["url"]), normalise_link(App::get_baseurl()))) {
$nickname = str_replace(normalise_link(App::get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));

if (($nickname != $a->user["nickname"])) {
$r = qu("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
@@ -184,7 +184,7 @@ function display_fetchauthor($a, $item) {

if (local_user()) {
if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
$profiledata["remoteconnect"] = $a->get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
$profiledata["remoteconnect"] = App::get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
}
} elseif ($profiledata["network"] == NETWORK_DFRN) {
$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);


+ 3
- 3
mod/editpost.php View File

@@ -42,7 +42,7 @@ function editpost_content(&$a) {

$tpl = get_markup_template('jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag,
@@ -51,7 +51,7 @@ function editpost_content(&$a) {

$tpl = get_markup_template('jot-end.tpl');
$a->page['end'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag,
@@ -126,7 +126,7 @@ function editpost_content(&$a) {
'$ptyp' => $itm[0]['type'],
'$content' => undo_post_tagging($itm[0]['body']),
'$post_id' => $post_id,
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$defloc' => $a->user['default-location'],
'$visitor' => 'none',
'$pvisit' => 'none',


+ 10
- 10
mod/events.php View File

@@ -89,7 +89,7 @@ function events_post(&$a) {
$type = 'event';

$action = ($event_id == '') ? 'new' : "event/" . $event_id;
$onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
$onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";

if(strcmp($finish,$start) < 0 && !$nofinish) {
notice( t('Event can not end before it has started.') . EOL);
@@ -192,7 +192,7 @@ function events_content(&$a) {
}

if($a->argc == 1)
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;

if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
$r = q("update event set ignore = 1 where id = %d and uid = %d",
@@ -222,7 +222,7 @@ function events_content(&$a) {

$htpl = get_markup_template('event_head.tpl');
$a->page['htmlhead'] .= replace_macros($htpl,array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$module_url' => '/events',
'$modparams' => 1,
'$i18n' => $i18n,
@@ -231,7 +231,7 @@ function events_content(&$a) {

$etpl = get_markup_template('event_end.tpl');
$a->page['end'] .= replace_macros($etpl,array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$editselect' => $editselect
));

@@ -337,7 +337,7 @@ function events_content(&$a) {
foreach($r as $rr) {
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
if(! x($links,$j))
$links[$j] = $a->get_baseurl() . '/' . $a->cmd . '#link-' . $j;
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
}
}

@@ -375,13 +375,13 @@ function events_content(&$a) {
}

$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$tabs' => $tabs,
'$title' => t('Events'),
'$view' => t('View'),
'$new_event' => array($a->get_baseurl().'/events/new',t('Create New Event'),'',''),
'$previus' => array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
'$new_event' => array(App::get_baseurl().'/events/new',t('Create New Event'),'',''),
'$previus' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
'$calendar' => cal($y,$m,$links, ' eventcal'),

'$events' => $events,
@@ -475,7 +475,7 @@ function events_content(&$a) {
$tpl = get_markup_template('event_form.tpl');

$o .= replace_macros($tpl,array(
'$post' => $a->get_baseurl() . '/events',
'$post' => App::get_baseurl() . '/events',
'$eid' => $eid,
'$cid' => $cid,
'$uri' => $uri,


+ 6
- 5
mod/fbrowser.php View File

@@ -10,6 +10,7 @@ require_once('include/Photo.php');
/**
* @param App $a
*/
/// @TODO & is missing or App ?
function fbrowser_content($a){

if (!local_user())
@@ -83,9 +84,9 @@ function fbrowser_content($a){
$scale = $rr['loq'];

return array(
$a->get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
App::get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
$filename_e,
$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
App::get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
);
}
$files = array_map("_map_files1", $r);
@@ -94,7 +95,7 @@ function fbrowser_content($a){

$o = replace_macros($tpl, array(
'$type' => 'image',
'$baseurl' => $a->get_baseurl(),
'$baseurl' => App::get_baseurl(),
'$path' => $path,