toggles "post to facebook, post to twitter", etc.

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index a90ae3f5127b7239994520655ed22d647b3b614f..eaee7d5aca2f0002fa56f2dcd9f7fb69afc53782 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -10,10 +10,12 @@ 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);
+               $links = @lrdd($url);
                if(count($links)) {
                        foreach($links as $link) {
                                if($link['@attributes']['rel'] === NAMESPACE_DFRN)
@@ -28,6 +30,31 @@ function follow_post(&$a) {
                                        $profile = $link['@attributes']['href'];
 
                        }
+
+                       // 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 = $link['@attributes']['href'];
+                                               }
+                                               else
+                                                       $profile = $link['@attributes']['href'];
+                                       }
+                               }
+                       }
+               }
+               else {
+                       if((strpos($orig_url,'@')) && validate_email($orig_url)) {
+                               $email_conversant = true;
+                       }
                }
        }       
 
@@ -106,10 +133,16 @@ 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;
                }
@@ -152,12 +185,13 @@ function follow_post(&$a) {
        }
        else {
                // create contact record 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
+               $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']),