]> git.mxchange.org Git - friendica-addons.git/blobdiff - pumpio/pumpio.php
projects / friendica-addons.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reduce the opacity of the network settings icon when disabled.
[friendica-addons.git] / pumpio / pumpio.php
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 4bab7be5b77503ccc47ecc816bcba75999d13fec..d2ef540e3bb8f57d9aecd66c714fd641b1d0eba3 100755 (executable)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -203,6 +203,7 @@ function pumpio_settings(&$a,&$s) {
 
     $enabled = get_pconfig(local_user(),'pumpio','post');
     $checked = (($enabled) ? ' checked="checked" ' : '');
+    $css = (($enabled) ? '' : '-disabled');
 
     $def_enabled = get_pconfig(local_user(),'pumpio','post_by_default');
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
@@ -218,8 +219,13 @@ function pumpio_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+    $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+    $s .= '</span>';
 
     $s .= '<div id="pumpio-username-wrapper">';
     $s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
@@ -278,7 +284,7 @@ function pumpio_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -423,13 +429,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);
@@ -484,7 +490,7 @@ function pumpio_send(&$a,&$b) {
                        logger('pumpio_send '.$username.': success '.$post_id);
                        if($post_id AND $iscomment) {
                                logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
-                               q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+                               q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
                                        dbesc($post_id),
                                        intval($b['id'])
                                );
@@ -712,8 +718,13 @@ function pumpio_fetchtimeline(&$a, $uid) {
 
                                $_REQUEST["body"] = html2bbcode($post->object->content);
 
-                               if ($post->object->fullImage->url != "")
-                                       $_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+                               // To-Do: Picture has to be cached and stored locally
+                               if ($post->object->fullImage->url != "") {
+                                       if ($post->object->fullImage->pump_io->proxyURL != "")
+                                               $_REQUEST["body"] = "[url=".$post->object->fullImage->pump_io->proxyURL."][img]".$post->object->image->pump_io->proxyURL."[/img][/url]\n".$_REQUEST["body"];
+                                       else
+                                               $_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+                               }
 
                                logger('pumpio: posting for user '.$uid);
 
@@ -870,6 +881,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));
 
@@ -925,7 +952,7 @@ function pumpio_get_contact($uid, $contact) {
                                        `name-date` = '%s',
                                        `uri-date` = '%s',
                                        `avatar-date` = '%s'
-                               WHERE `id` = %d LIMIT 1
+                               WHERE `id` = %d
                        ",
                dbesc($photos[0]),
                dbesc($photos[1]),
@@ -952,8 +979,10 @@ function pumpio_get_contact($uid, $contact) {
                                         `micro` = '%s',
                                         `name-date` = '%s',
                                         `uri-date` = '%s',
-                                        `avatar-date` = '%s'
-                                        WHERE `id` = %d LIMIT 1
+                                        `avatar-date` = '%s',
+                                       `name` = '%s',
+                                       `nick` = '%s'
+                                       WHERE `id` = %d
                                 ",
                        dbesc($photos[0]),
                        dbesc($photos[1]),
@@ -961,6 +990,8 @@ function pumpio_get_contact($uid, $contact) {
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
+                       dbesc($contact->displayName),
+                       dbesc($contact->preferredUsername),
                        intval($r[0]['id'])
                        );
                }
@@ -992,6 +1023,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
 
 function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) {
        require_once('include/items.php');
+       require_once('include/html2bbcode.php');
 
        if (($post->verb == "like") OR ($post->verb == "favorite"))
                return pumpio_dolike($a, $uid, $self, $post, $own_id);
@@ -1080,14 +1112,17 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
                        }
                }
 
+               $reply = new stdClass;
                $reply->verb = "note";
                $reply->cc = $post->cc;
                $reply->to = $post->to;
+               $reply->object = new stdClass;
                $reply->object->objectType = $post->object->inReplyTo->objectType;
                $reply->object->content = $post->object->inReplyTo->content;
                $reply->object->id = $post->object->inReplyTo->id;
                $reply->actor = $post->object->inReplyTo->author;
                $reply->url = $post->object->inReplyTo->url;
+               $reply->generator = new stdClass;
                $reply->generator->displayName = "pumpio";
                $reply->published = $post->object->inReplyTo->published;
                $reply->received = $post->object->inReplyTo->updated;
@@ -1126,10 +1161,17 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
        }
 
        if ($post->verb == "share") {
-               $postarray['body'] = "[share author='".$post->object->author->displayName.
-                                "' profile='".$post->object->author->url.
-                                "' avatar='".$post->object->author->image->url.
-                                "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
+               if (!intval(get_config('system','wall-to-wall_share'))) {
+                       $postarray['body'] = "[share author='".$post->object->author->displayName.
+                                       "' profile='".$post->object->author->url.
+                                       "' avatar='".$post->object->author->image->url.
+                                       "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
+               } else {
+                       // Let shares look like wall-to-wall posts
+                       $postarray['author-name'] = $post->object->author->displayName;
+                       $postarray['author-link'] = $post->object->author->url;
+                       $postarray['author-avatar'] = $post->object->author->image->url;
+               }
        }
 
        if (trim($postarray['body']) == "")
@@ -1347,7 +1389,7 @@ function pumpio_queue_hook(&$a,&$b) {
                                logger('pumpio_queue: send '.$username.': success '.$post_id);
                                if($post_id AND $iscomment) {
                                        logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']);
-                                       q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+                                       q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
                                                dbesc($post_id),
                                                intval($z['item'])
                                        );
Unnamed repository; edit this file 'description' to name the repository.