X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=c5f6d9e3fce8847bff80fc2c57e80b0bb82637ef;hb=777c47aaa697ff46cf554fb4f36d0c252ae42e94;hp=14bdb9fc6d7d1809d11fa2026a3fd1c79f251cd6;hpb=9a30055aae1f64201b45a1a052e98471f3d99094;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 14bdb9fc6d..c5f6d9e3fc 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -10,7 +10,9 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
-	$url = notags(trim($_POST['url']));
+	$url = $orig_url = notags(trim($_POST['url']));
+	
+	$email_conversant = false;
 
 	if($url) {
 		$links = lrdd($url);
@@ -29,6 +31,11 @@ function follow_post(&$a) {
 
 			}
 		}
+		else {
+			if((strpos($orig_url,'@')) && validate_email($orig_url)) {
+				$email_conversant = true;
+			}
+		}
 	}	
 
 	// If we find a DFRN site, send our subscriber to the other person's
@@ -48,6 +55,9 @@ function follow_post(&$a) {
 		}
 	}
 
+	$network  = 'stat';
+	$priority = 0;
+
 	if($hcard) {
 		$vcard = scrape_vcard($hcard);
 
@@ -63,13 +73,58 @@ function follow_post(&$a) {
 	if(! $profile)
 		$profile = $url;
 
-	// do we have enough information?
 
 	if(! x($vcard,'fn'))
 		if(x($vcard,'nick'))
 			$vcard['fn'] = $vcard['nick'];
 
+	if((! isset($vcard)) && (! $poll)) {
+
+		$ret = scrape_feed($url);
+
+		if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
+			$poll = ((x($ret,'feed_atom')) ? $ret['feed_atom'] : $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'] = trim($author->get_name());
+				$vcard['nick'] = strtolower($vcard['fn']);
+				if(strpos($vcard['nick'],' '))
+					$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+				$email = $author->get_email();
+			}
+			else {
+				$item = $feed->get_item(0);
+				if($item) {
+					$author = $item->get_author();
+					if($author) {			
+						$vcard['fn'] = trim($author->get_name());
+						$vcard['nick'] = strtolower($vcard['fn']);
+						if(strpos($vcard['nick'],' '))
+							$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+						$email = $author->get_email();
+					}
+				}
+			}
+			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));
+
+	// do we have enough information?
 	
 	if(! ((x($vcard['fn'])) && ($poll) && ($profile))) {
 		notice( t('The profile address specified does not provide adequate information.') . EOL);
@@ -104,9 +159,9 @@ 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`, `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', %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
 			dbesc($profile),
@@ -115,8 +170,9 @@ function follow_post(&$a) {
 			dbesc($vcard['fn']),
 			dbesc($vcard['nick']),
 			dbesc($vcard['photo']),
-			dbesc('stat'),
-			intval(REL_FAN)
+			dbesc($network),
+			intval(REL_FAN),
+			intval($priority)
 		);
 	}
 
@@ -158,6 +214,9 @@ function follow_post(&$a) {
 
 	// pull feed and consume it, which should subscribe to the hub.
 
+	$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	//proc_close(proc_open("\"$php_path\" \"include/poller.php\" \"$contact_id\" &", array(), $foo));
+	proc_run($php_path,"include/poller.php","$contact_id");
 
 	// create a follow slap