X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Ffollow.php;h=c5f6d9e3fce8847bff80fc2c57e80b0bb82637ef;hb=777c47aaa697ff46cf554fb4f36d0c252ae42e94;hp=e5eb7763bf620eea6a6248384de66e7e2422ebc5;hpb=5be98e3ec8b0475dc67504967cac695d9e4a129a;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index e5eb7763bf..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,7 +55,8 @@ function follow_post(&$a) {
 		}
 	}
 
-	$network = 'stat';
+	$network  = 'stat';
+	$priority = 0;
 
 	if($hcard) {
 		$vcard = scrape_vcard($hcard);
@@ -74,8 +82,8 @@ function follow_post(&$a) {
 
 		$ret = scrape_feed($url);
 
-		if(count($ret) && $ret['feed_atom']) {
-			$poll = $ret['feed_atom'];
+		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();
@@ -110,12 +118,12 @@ function follow_post(&$a) {
 			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))) {
@@ -151,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),
@@ -163,7 +171,8 @@ function follow_post(&$a) {
 			dbesc($vcard['nick']),
 			dbesc($vcard['photo']),
 			dbesc($network),
-			intval(REL_FAN)
+			intval(REL_FAN),
+			intval($priority)
 		);
 	}
 
@@ -206,8 +215,8 @@ 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_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