X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=f8964885e187050b34f4a59cf9477eaea20ea238;hb=2a3f94e4521f00142b99ba4fa5f4ec093159cbb7;hp=235353f7ab027d53ad0748d89c9d7d2629e893f3;hpb=b376f215337e4bee7320a0df8fc3d9b1beb2f289;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 235353f7ab..f8964885e1 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -2,7 +2,7 @@
 
 require_once('Scrape.php');
 
-function follow_post(&$a) {
+function follow_init(&$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -10,64 +10,79 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
-	$url = notags(trim($_POST['url']));
-
-	if($url) {
-		$links = lrdd($url);
-		if(count($links)) {
-			foreach($links as $link) {
-				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
-					$dfrn = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === 'salmon')
-					$notify = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === NAMESPACE_FEED)
-					$poll = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
-					$hcard = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-					$profile = $link['@attributes']['href'];
-
-			}
-		}
-	}	
-
-	// If we find a DFRN site, send our subscriber to the other person's
-	// dfrn_request page and all the other details will get sorted.
-
-	if(strlen($dfrn)) {
-		$ret = scrape_dfrn($dfrn);
-		if(is_array($ret) && x($ret,'dfrn-request')) {
-			if(strlen($a->path))
-				$myaddr = urlencode($a->get_baseurl() . '/profile/' . $a->user['nickname']);
-			else
-				$myaddr = urlencode($a->user['nickname'] . '@' . $a->get_hostname());
- 
-			goaway($ret['dfrn-request'] . "&address=$myaddr");
-		
-			// NOTREACHED
-		}
+	$url = $orig_url = notags(trim($_REQUEST['url']));
+
+	// remove ajax junk, e.g. Twitter
+
+	$url = str_replace('/#!/','/',$url);
+
+	if(! allowed_url($url)) {
+		notice( t('Disallowed profile URL.') . EOL);
+		goaway($_SESSION['return_url']);
+		// NOTREACHED
 	}
 
-	if($hcard) {
-		$vcard = scrape_vcard($hcard);
+
+	if(! $url) {
+		notice( t('Connect URL missing.') . EOL);
+		goaway($_SESSION['return_url']);
+		// NOTREACHED
 	}
 
-	if(! $profile)
-		$profile = $url;
 
-	// do we have enough information?
+	$ret = probe_url($url);
 
-	if(! x($vcard,'fn'))
-		if(x($vcard,'nick'))
-			$vcard['fn'] = $vcard['nick'];
+	if($ret['network'] === NETWORK_DFRN) {
+		if(strlen($a->path))
+			$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
+		else
+			$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
+ 
+		goaway($ret['request'] . "&addr=$myaddr");
+		
+		// NOTREACHED
+	}
+	else {
+		if(get_config('system','dfrn_only')) {
+			notice( t('This site is not configured to allow communications with other networks.') . EOL);
+			notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+			goaway($_SESSION['return_url']);
+		}
+	}
 
-	if(! ((x($vcard['fn'])) && ($poll) && ($notify) && ($profile))) {
+	// do we have enough information?
+	
+	if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
 		notice( t('The profile address specified does not provide adequate information.') . EOL);
+		if(! x($ret,'poll'))
+			notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+		if(! x($ret,'name'))
+			notice( t('An author or name was not found.') . EOL);
+		if(! x($ret,'url'))
+			notice( t('No browser URL could be matched to this address.') . EOL);
+		if(strpos($url,'@') !== false)
+			notice('Unable to match @-style Identity Address with a known protocol or email contact');
 		goaway($_SESSION['return_url']);
-	} 
+	}
+
+	if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
+		notice( t('The profile address specified belongs to a network which has been disabled on this site.') . EOL);
+		$ret['notify'] = '';
+	}
+
+	if(! $ret['notify']) {
+		notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
+	}
 
-	if(! x($vcard,'photo'))
-		$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
+	$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+	$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+
+	if($ret['network'] === NETWORK_MAIL) {
+		$writeable = 1;
+		
+	}
+	if($ret['network'] === NETWORK_DIASPORA)
+		$writeable = 1;
 
 	// check if we already have a contact
 	// the poll url is more reliable than the profile url, as we may have
@@ -75,39 +90,56 @@ function follow_post(&$a) {
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
 		intval(local_user()),
-		dbesc($poll)
+		dbesc($ret['poll'])
 	);			
+
 	if(count($r)) {
 		// update contact
-		if($r[0]['rel'] == REL_VIP) {
+		if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
 			q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval(REL_BUD),
+				intval(CONTACT_IS_FRIEND),
 				intval($r[0]['id']),
 				intval(local_user())
 			);
 		}
 	}
 	else {
+
+		$new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+		if($ret['network'] === NETWORK_DIASPORA)
+			$new_relation = CONTACT_IS_FOLLOWER;
+
 		// create contact record 
-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, 
-			`blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 0 ) ",
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
+			`writable`, `hidden`, `blocked`, `readonly`, `pending` )
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
-			dbesc($profile),
-			dbesc($notify),
-			dbesc($poll),
-			dbesc($vcard['fn']),
-			dbesc($vcard['nick']),
-			dbesc($vcard['photo']),
-			dbesc('stat'),
-			intval(REL_FAN)
+			dbesc($ret['url']),
+			dbesc(normalise_link($ret['url'])),
+			dbesc($ret['addr']),
+			dbesc($ret['alias']),
+			dbesc($ret['batch']),
+			dbesc($ret['notify']),
+			dbesc($ret['poll']),
+			dbesc($ret['poco']),
+			dbesc($ret['name']),
+			dbesc($ret['nick']),
+			dbesc($ret['photo']),
+			dbesc($ret['network']),
+			dbesc($ret['pubkey']),
+			intval($new_relation),
+			intval($ret['priority']),
+			intval($writeable),
+			intval($hidden)
 		);
 	}
+
 	$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-		dbesc($profile),
+		dbesc($ret['url']),
 		intval(local_user())
 	);
+
 	if(! count($r)) {
 		notice( t('Unable to retrieve contact information.') . EOL);
 		goaway($_SESSION['return_url']);
@@ -119,10 +151,11 @@ function follow_post(&$a) {
 
 	require_once("Photo.php");
 
-	$photos = import_profile_photo($vcard['photo'],local_user(),$contact_id);
+	$photos = import_profile_photo($ret['photo'],local_user(),$contact_id);
 
 	$r = q("UPDATE `contact` SET `photo` = '%s', 
-			`thumb` = '%s', 
+			`thumb` = '%s',
+			`micro` = '%s', 
 			`name-date` = '%s', 
 			`uri-date` = '%s', 
 			`avatar-date` = '%s'
@@ -130,6 +163,7 @@ function follow_post(&$a) {
 		",
 			dbesc($photos[0]),
 			dbesc($photos[1]),
+			dbesc($photos[2]),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
@@ -139,10 +173,11 @@ function follow_post(&$a) {
 
 	// pull feed and consume it, which should subscribe to the hub.
 
+	proc_run('php',"include/poller.php","$contact_id");
 
 	// create a follow slap
 
-	$tpl = load_view_file('view/follow_slap.tpl');
+	$tpl = get_markup_template('follow_slap.tpl');
 	$slap = replace_macros($tpl, array(
 		'$name' => $a->user['username'],
 		'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
@@ -154,7 +189,8 @@ function follow_post(&$a) {
 		'$type' => 'text',
 		'$content' => t('following'),
 		'$nick' => $a->user['nickname'],
-		'$verb' => ACTIVITY_FOLLOW
+		'$verb' => ACTIVITY_FOLLOW,
+		'$ostat_follow' => ''
 	));
 
 	$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
@@ -162,8 +198,20 @@ function follow_post(&$a) {
 			intval(local_user())
 	);
 
-	require_once('include/salmon.php');
-	slapper($r[0],$contact['notify'],$slap);
+	if(count($r)) {
+		if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
+			require_once('include/salmon.php');
+			slapper($r[0],$contact['notify'],$slap);
+		}
+		if($contact['network'] == NETWORK_DIASPORA) {
+			require_once('include/diaspora.php');
+			$ret = diaspora_share($a->user,$contact);
+			logger('mod_follow: diaspora_share returns: ' . $ret);
+		}
+	}
+
+	if(strstr($_SESSION['return_url'],'contacts'))
+		goaway($a->get_baseurl() . '/contacts/' . $contact_id);
 
 	goaway($_SESSION['return_url']);
 	// NOTREACHED