X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=4ce3ccb82c0188440191fb0df60ee6d4b8dc64b0;hb=7defb1768bff1c3da7ea63957cf8c7c928d379ab;hp=7ac9a50c315ca2c4fee0ef0203ba49b68132f2c9;hpb=c16f314ec348205f4741e0171335168720e652d2;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 7ac9a50c31..4ce3ccb82c 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -10,23 +10,53 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
-	$url = notags(trim($_POST['url']));
+	$url = $orig_url = notags(trim($_POST['url']));
+	$diaspora = false;	
+	$email_conversant = false;
 
 	if($url) {
-		$links = lrdd($url);
+		$links = @lrdd($url);
 		if(count($links)) {
 			foreach($links as $link) {
 				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
-					$dfrn = $link['@attributes']['href'];
+					$dfrn = unamp($link['@attributes']['href']);
 				if($link['@attributes']['rel'] === 'salmon')
-					$notify = $link['@attributes']['href'];
+					$notify = unamp($link['@attributes']['href']);
 				if($link['@attributes']['rel'] === NAMESPACE_FEED)
-					$poll = $link['@attributes']['href'];
+					$poll = unamp($link['@attributes']['href']);
 				if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
-					$hcard = $link['@attributes']['href'];
+					$hcard = unamp($link['@attributes']['href']);
 				if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-					$profile = $link['@attributes']['href'];
+					$profile = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location')
+					$diaspora = true;
 
+
+			}
+
+			// Status.Net can have more than one profile URL. We need to match the profile URL
+			// to a contact on incoming messages to prevent spam, and we won't know which one
+			// to match. So in case of two, one of them is stored as an alias. Only store URL's
+			// and not webfinger user@host aliases. If they've got more than two non-email style
+			// aliases, let's hope we're lucky and get one that matches the feed author-uri because 
+			// otherwise we're screwed.
+
+			foreach($links as $link) {
+				if($link['@attributes']['rel'] === 'alias') {
+					if(strpos($link['@attributes']['href'],'@') === false) {
+						if(isset($profile)) {
+							if($link['@attributes']['href'] !== $profile)
+								$alias = unamp($link['@attributes']['href']);
+						}
+						else
+							$profile = unamp($link['@attributes']['href']);
+					}
+				}
+			}
+		}
+		else {
+			if((strpos($orig_url,'@')) && validate_email($orig_url)) {
+				$email_conversant = true;
 			}
 		}
 	}	
@@ -38,47 +68,133 @@ function follow_post(&$a) {
 		$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']);
+				$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
 			else
-				$myaddr = urlencode($a->user['nickname'] . '@' . $a->get_hostname());
+				$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
  
-			goaway($ret['dfrn-request'] . "&address=$myaddr");
+			goaway($ret['dfrn-request'] . "&addr=$myaddr");
 		
 			// NOTREACHED
 		}
 	}
 
+	$network  = 'stat';
+	$priority = 0;
+
 	if($hcard) {
 		$vcard = scrape_vcard($hcard);
-	}
 
-	if(! $profile)
-		$profile = $url;
+		// Google doesn't use absolute url in profile photos
 
-	// do we have enough information?
+		if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
+			$h = @parse_url($hcard);
+			if($h)
+				$vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
+		}
+	}
+
+	if(! $profile) {
+		if($diaspora)
+			$profile = $hcard;
+		else
+			$profile = $url;
+	}
 
 	if(! x($vcard,'fn'))
 		if(x($vcard,'nick'))
 			$vcard['fn'] = $vcard['nick'];
 
-	if(! ((x($vcard['fn'])) && ($poll) && ($notify) && ($profile))) {
+	if((! isset($vcard)) && (! $poll)) {
+
+		$ret = scrape_feed($url);
+
+		if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
+			$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
+			$vcard = array();
+			require_once('simplepie/simplepie.inc');
+		    $feed = new SimplePie();
+			$xml = fetch_url($poll);
+
+    		$feed->set_raw_data($xml);
+
+		    $feed->init();
+
+			$vcard['photo'] = $feed->get_image_url();
+			$author = $feed->get_author();
+			if($author) {			
+				$vcard['fn'] = unxmlify(trim($author->get_name()));
+				if(! $vcard['fn'])
+					$vcard['fn'] = trim(unxmlify($author->get_email()));
+				if(strpos($vcard['fn'],'@') !== false)
+					$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+				$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
+				if(strpos($vcard['nick'],' '))
+					$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+				$email = unxmlify($author->get_email());
+			}
+			else {
+				$item = $feed->get_item(0);
+				if($item) {
+					$author = $item->get_author();
+					if($author) {			
+						$vcard['fn'] = trim(unxmlify($author->get_name()));
+						if(! $vcard['fn'])
+							$vcard['fn'] = trim(unxmlify($author->get_email()));
+						if(strpos($vcard['fn'],'@') !== false)
+							$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+						$vcard['nick'] = strtolower(unxmlify($vcard['fn']));
+						if(strpos($vcard['nick'],' '))
+							$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+						$email = unxmlify($author->get_email());
+					}
+					if(! $vcard['photo']) {
+						$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
+						if($rawmedia && $rawmedia[0]['attribs']['']['url'])
+							$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
+					}
+				}
+			}
+			if((! $vcard['photo']) && strlen($email))
+				$vcard['photo'] = gravatar_img($email);
+			
+			$network = 'feed';
+			$priority = 2;
+		}
+	}
+
+	logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true));
+
+	$vcard['fn'] = notags($vcard['fn']);
+	$vcard['nick'] = notags($vcard['nick']);
+
+	// do we have enough information?
+	
+	if(! ((x($vcard['fn'])) && ($poll) && ($profile))) {
 		notice( t('The profile address specified does not provide adequate information.') . EOL);
 		goaway($_SESSION['return_url']);
-	} 
+	}
+
+
+	if(! $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' ; 
 
 	// check if we already have a contact
+	// the poll url is more reliable than the profile url, as we may have
+	// indirect links or webfinger links
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
 		intval(local_user()),
 		dbesc($poll)
 	);			
-	if($r) {
+
+	if(count($r)) {
 		// update contact
 		if($r[0]['rel'] == REL_VIP) {
-			q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval(REL_BUD),
 				intval($r[0]['id']),
 				intval(local_user())
@@ -87,25 +203,29 @@ function follow_post(&$a) {
 	}
 	else {
 		// create contact record 
-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, 
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
 			`blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 0 ) ",
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
 			dbesc($profile),
+			dbesc($alias),
 			dbesc($notify),
 			dbesc($poll),
 			dbesc($vcard['fn']),
 			dbesc($vcard['nick']),
 			dbesc($vcard['photo']),
-			dbesc('stat'),
-			intval(REL_FAN)
+			dbesc($network),
+			intval(REL_FAN),
+			intval($priority)
 		);
 	}
+
 	$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
 		dbesc($profile),
 		intval(local_user())
 	);
+
 	if(! count($r)) {
 		notice( t('Unable to retrieve contact information.') . EOL);
 		goaway($_SESSION['return_url']);
@@ -117,49 +237,19 @@ function follow_post(&$a) {
 
 	require_once("Photo.php");
 
-	$photo_failure = false;
-
-	$filename = basename($vcard['photo']);
-	$img_str = fetch_url($vcard['photo'],true);
-	$img = new Photo($img_str);
-	if($img->is_valid()) {
-
-		$img->scaleImageSquare(175);
-					
-		$hash = photo_new_resource();
-
-		$r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 4 );
-
-		if($r === false)
-			$photo_failure = true;
-
-		$img->scaleImage(80);
-
-		$r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 5 );
-
-		if($r === false)
-			$photo_failure = true;
-
-		$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
-		$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
-	}
-	else
-		$photo_failure = true;
-
-	if($photo_failure) {
-		$photo = $a->get_baseurl() . '/images/default-profile.jpg';
-		$thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
-	}
+	$photos = import_profile_photo($vcard['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'
 			WHERE `id` = %d LIMIT 1
 		",
-			dbesc($photo),
-			dbesc($thumb),
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
@@ -169,6 +259,7 @@ 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
 
@@ -184,7 +275,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` 
@@ -192,8 +284,11 @@ function follow_post(&$a) {
 			intval(local_user())
 	);
 
-	require_once('include/salmon.php');
-	slapper($r[0],$contact,$slap);
+
+	if((count($r)) && (x($contact,'notify')) && (strlen($contact['notify']))) {
+		require_once('include/salmon.php');
+		slapper($r[0],$contact['notify'],$slap);
+	}
 
 	goaway($_SESSION['return_url']);
 	// NOTREACHED