X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Funfollow.php;h=3f94fb5760eb48ad69986fab4cf162d10019ac21;hb=a5e91175243a41c77a56e73efc3672f20a7e6d23;hp=d0baf87c441da88f338edb8531a63b66f5a07c63;hpb=ab87f1215a28884c48fc89b130b8615e4e398702;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index d0baf87c44..3f94fb5760 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -2,10 +2,10 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
 
-require_once 'include/probe.php';
 require_once 'include/follow.php';
-require_once 'include/Contact.php';
 require_once 'include/contact_selectors.php';
 
 function unfollow_post(App $a) {
@@ -29,17 +29,16 @@ function unfollow_post(App $a) {
 			normalise_link($url), $url, NETWORK_STATUSNET);
 	$contact = dba::select('contact', array(), $condition, array('limit' => 1));
 
-	if (!dbm::is_result($contact)) {
+	if (!DBM::is_result($contact)) {
 		notice(t("Contact wasn't found or can't be unfollowed."));
 	} else {
-		if (in_array($contact['network'], array(NETWORK_OSTATUS))) {
+		if (in_array($contact['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA))) {
 			$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
 				WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
 				intval($uid)
 			);
- 			if (dbm::is_result($r)) {
-				$self = ""; // Unused parameter
-				terminate_friendship($r[0], $self, $contact);
+ 			if (DBM::is_result($r)) {
+				Contact::terminateFriendship($r[0], $contact);
 			}
 		}
 		dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id']));
@@ -69,7 +68,7 @@ function unfollow_content(App $a) {
 			normalise_link($url), $url, NETWORK_STATUSNET);
 	$contact = dba::select('contact', array('url', 'network', 'addr', 'name'), $condition, array('limit' => 1));
 
-	if (!dbm::is_result($contact)) {
+	if (!DBM::is_result($contact)) {
 		notice(t("You aren't a friend of this contact.").EOL);
 		$submit = "";
 		// NOTREACHED
@@ -127,14 +126,14 @@ function unfollow_content(App $a) {
 	));
 
 	$a->page['aside'] = "";
-	profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
+	profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 
 	$o .= replace_macros(get_markup_template('section_title.tpl'),
 					array('$title' => t('Status Messages and Posts')
 	));
 
 	// Show last public posts
-	$o .= posts_from_contact_url($a, $contact["url"]);
+	$o .= Contact::getPostsFromUrl($contact["url"]);
 
 	return $o;
 }