Merge pull request #181 from annando/master

[friendica-addons.git] / pumpio / pumpio.php

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 7d398ceafa1c6a5f00915d549b9b269a3c4b6365..ac28a00da22575c0b8a49390cc6a53b42526d980 100755 (executable)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -428,13 +428,13 @@ function pumpio_send(&$a,&$b) {
                if ($title != '')
                        $title = "<h4>".$title."</h4>";
 
-               $content = bbcode($b['body'], false, false);
+               $content = bbcode($b['body'], false, false, 4);
 
                // Enhance the way, videos are displayed
-               $content = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
-               $content = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-               $content = preg_replace('/<a.*?href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
-               $content = preg_replace('/<a.*?href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+               $content = preg_replace('/<a href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n[url]$1[/url]\n",$content);
+               $content = preg_replace('/<a href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+               $content = preg_replace('/<a href="(https?:\/\/vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
+               $content = preg_replace('/<a href="(https?:\/\/player.vimeo.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$content);
 
                $URLSearchString = "^\[\]";
                $content = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$content);
@@ -880,6 +880,22 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) {
 
 function pumpio_get_contact($uid, $contact) {
 
+       $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+               dbesc(normalise_link($contact->url)));
+
+       if (count($r) == 0)
+               q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
+                       dbesc(normalise_link($contact->url)),
+                       dbesc($contact->displayName),
+                       dbesc($contact->preferredUsername),
+                       dbesc($contact->image->url));
+       else
+               q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
+                       dbesc($contact->displayName),
+                       dbesc($contact->preferredUsername),
+                       dbesc($contact->image->url),
+                       dbesc(normalise_link($contact->url)));
+
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
                intval($uid), dbesc($contact->url));