X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffollow.php;h=14b9c68ed59fd3476154a2ec367ab84d63adde71;hb=755f6e8cc1ceb5fab0c0f63deb3ca7048d1ea48d;hp=57520abe602291011acfb8ca67eeb931442f698c;hpb=4aac140749c4d9244da424b597bc0a7144c1ba6e;p=friendica.git

diff --git a/include/follow.php b/include/follow.php
index 57520abe60..14b9c68ed5 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,15 +1,24 @@
 <?php
-require_once("include/Scrape.php");
-require_once("include/socgraph.php");
-require_once('include/group.php');
-require_once('include/salmon.php');
-require_once('include/ostatus.php');
-require_once("include/Photo.php");
-require_once('include/diaspora.php');
+/**
+ * @file include/follow.php
+ */
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Network\Probe;
+use Friendica\Object\Contact;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\OStatus;
+use Friendica\Protocol\PortableContact;
+use Friendica\Protocol\Salmon;
+
+require_once 'include/group.php';
 
 function update_contact($id) {
 	/*
-	Warning: Never ever fetch the public key via probe_url and write it into the contacts.
+	Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
 	This will reliably kill your communication with Friendica contacts.
 	*/
 
@@ -17,9 +26,9 @@ function update_contact($id) {
 	if (!$r)
 		return false;
 
-	$ret = probe_url($r[0]["url"]);
+	$ret = Probe::uri($r[0]["url"]);
 
-	// If probe_url fails the network code will be different
+	// If Probe::uri fails the network code will be different
 	if ($ret["network"] != $r[0]["network"])
 		return false;
 
@@ -27,10 +36,10 @@ function update_contact($id) {
 
 	// make sure to not overwrite existing values with blank entries
 	foreach ($ret AS $key => $val) {
-		if (isset($r[0][$key]) AND ($r[0][$key] != "") AND ($val == ""))
+		if (isset($r[0][$key]) && ($r[0][$key] != "") && ($val == ""))
 			$ret[$key] = $r[0][$key];
 
-		if (isset($r[0][$key]) AND ($ret[$key] != $r[0][$key]))
+		if (isset($r[0][$key]) && ($ret[$key] != $r[0][$key]))
 			$update = true;
 	}
 
@@ -50,7 +59,7 @@ function update_contact($id) {
 	);
 
 	// Update the corresponding gcontact entry
-	poco_last_updated($ret["url"]);
+	PortableContact::lastUpdated($ret["url"]);
 
 	return true;
 }
@@ -67,7 +76,7 @@ function update_contact($id) {
 
 
 
-function new_contact($uid,$url,$interactive = false) {
+function new_contact($uid, $url, $interactive = false, $network = '') {
 
 	$result = array('cid' => -1, 'success' => false,'message' => '');
 
@@ -98,15 +107,19 @@ function new_contact($uid,$url,$interactive = false) {
 
 	if (x($arr['contact'],'name')) {
 		$ret = $arr['contact'];
+	} else {
+		$ret = Probe::uri($url, $network, $uid, false);
 	}
-	else {
-		$ret = probe_url($url);
+
+	if (($network != '') && ($ret['network'] != $network)) {
+		logger('Expected network '.$network.' does not match actual network '.$ret['network']);
+		return result;
 	}
 
 	if ($ret['network'] === NETWORK_DFRN) {
 		if ($interactive) {
 			if (strlen($a->path)) {
-				$myaddr = bin2hex(App::get_baseurl() . '/profile/' . $a->user['nickname']);
+				$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
 			} else {
 				$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
 			}
@@ -115,7 +128,7 @@ function new_contact($uid,$url,$interactive = false) {
 
 			// NOTREACHED
 		}
-	} elseif (get_config('system','dfrn_only')) {
+	} elseif (Config::get('system','dfrn_only')) {
 		$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
 		$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
 		return $result;
@@ -146,7 +159,7 @@ function new_contact($uid,$url,$interactive = false) {
 		return $result;
 	}
 
-	if ($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
+	if ($ret['network'] === NETWORK_OSTATUS && Config::get('system','ostatus_disabled')) {
 		$result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
 		$ret['notify'] = '';
 	}
@@ -176,49 +189,19 @@ function new_contact($uid,$url,$interactive = false) {
 		dbesc($ret['network'])
 	);
 
-	if (!dbm::is_result($r))
+	if (!DBM::is_result($r))
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
 			intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// update contact
-		if ($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
-			q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d",
-				intval(CONTACT_IS_FRIEND),
-				intval($subhub),
-				intval($r[0]['id']),
-				intval($uid)
-			);
-		}
-	} else {
-		// check service class limits
-
-		$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `pending` = 0 AND `self` = 0",
-			intval($uid)
-		);
-		if (dbm::is_result($r))
-			$total_contacts = $r[0]['total'];
-
-		if (! service_class_allows($uid,'total_contacts',$total_contacts)) {
-			$result['message'] .= upgrade_message();
-			return $result;
-		}
-
-		$r = q("SELECT COUNT(`network`) AS `total` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND `pending` = 0 AND `self` = 0",
-			intval($uid),
-			dbesc($network)
-		);
-		if (dbm::is_result($r)) {
-			$total_network = $r[0]['total'];
-		}
-
-		if (! service_class_allows($uid,'total_contacts_' . $network,$total_network)) {
-			$result['message'] .= upgrade_message();
-			return $result;
-		}
+		$new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
-		$new_relation = ((in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+		$fields = array('rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false);
+		dba::update('contact', $fields, array('id' => $r[0]['id']));
+	} else {
+		$new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
 		// create contact record
 		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `network`, `pubkey`, `rel`, `priority`,
@@ -252,7 +235,7 @@ function new_contact($uid,$url,$interactive = false) {
 		intval($uid)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		$result['message'] .=  t('Unable to retrieve contact information.') . EOL;
 		return $result;
 	}
@@ -267,29 +250,29 @@ function new_contact($uid,$url,$interactive = false) {
 	}
 
 	// Update the avatar
-	update_contact_avatar($ret['photo'],$uid,$contact_id);
+	Contact::updateAvatar($ret['photo'], $uid, $contact_id);
 
 	// pull feed and consume it, which should subscribe to the hub.
 
-	proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
+	Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
 
 	$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)) {
+	if (DBM::is_result($r)) {
 		if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
 			// create a follow slap
 			$item = array();
 			$item['verb'] = ACTIVITY_FOLLOW;
 			$item['follow'] = $contact["url"];
-			$slap = ostatus::salmon($item, $r[0]);
-			slapper($r[0], $contact['notify'], $slap);
+			$slap = OStatus::salmon($item, $r[0]);
+			Salmon::slapper($r[0], $contact['notify'], $slap);
 		}
 
 		if ($contact['network'] == NETWORK_DIASPORA) {
-			$ret = Diaspora::send_share($a->user,$contact);
+			$ret = Diaspora::sendShare($a->user, $contact);
 			logger('share returns: '.$ret);
 		}
 	}