Merge branch 'tobiasd-master'

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index bad2e74f9cef47adedbdd777c459d6087ac72c6c..8c1dc348fa7d4addd416a48135a5e837fef758ef 100644 (file)
--- 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);
@@ -105,12 +113,19 @@ function follow_post(&$a) {
                                                        $vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
                                                $email = $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'] = $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));
@@ -150,9 +165,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),
@@ -162,7 +177,8 @@ function follow_post(&$a) {
                        dbesc($vcard['nick']),
                        dbesc($vcard['photo']),
                        dbesc($network),
-                       intval(REL_FAN)
+                       intval(REL_FAN),
+                       intval($priority)
                );
        }
 
@@ -205,8 +221,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