X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=5cf40a9f03abea010e6ad32909cff591f3fc1bbe;hb=ad20c5504deba9dbb4ea5c5deba598f2c448b344;hp=7ca45a21bd01e32baee60d3e235faa49afc76cb1;hpb=52f12ee28db97b29ce0f10c8ecf76144b80d4216;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index 7ca45a21bd..5cf40a9f03 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -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');
@@ -108,7 +106,7 @@ function terminate_friendship($user,$self,$contact) {
 	}
 	elseif($contact['network'] === NETWORK_DIASPORA) {
 		require_once('include/diaspora.php');
-		diaspora::send_unshare($user,$contact);
+		Diaspora::send_unshare($user,$contact);
 	}
 	elseif($contact['network'] === NETWORK_DFRN) {
 		require_once('include/dfrn.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: