Merge branch 'fabrixxm-master'

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index 102f46aec6427bee6c02b23127d2257f7912303e..a90ae3f5127b7239994520655ed22d647b3b614f 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -48,7 +48,8 @@ function follow_post(&$a) {
                }
        }
 
-       $network = 'stat';
+       $network  = 'stat';
+       $priority = 0;
 
        if($hcard) {
                $vcard = scrape_vcard($hcard);
@@ -74,8 +75,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 +111,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,7 +152,7 @@ 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 ) ",
                        intval(local_user()),
@@ -163,7 +164,8 @@ function follow_post(&$a) {
                        dbesc($vcard['nick']),
                        dbesc($vcard['photo']),
                        dbesc($network),
-                       intval(REL_FAN)
+                       intval(REL_FAN),
+                       intval($priority)
                );
        }