Merge pull request #151 from tazmandevil/master

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

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 94b12af345647ce815c0ab1d8026bd0dcd53ed3c..9fc13c5ec97e8bad1946831d7cf9a5514d938ae7 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -218,6 +218,14 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
        return($cleaned);
 }
 
+function fromgplus_cleantext($text) {
+       $text = strip_tags($text);
+       $text = html_entity_decode($text);
+       $text = trim($text);
+       $text = str_replace(array("\n", "\r", " "), array("", "", ""), $text);
+       return($text);
+}
+
 function fromgplus_handleattachments($item, $displaytext) {
        $post = "";
        $quote = "";
@@ -239,9 +247,11 @@ function fromgplus_handleattachments($item, $displaytext) {
                                $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
-                               if ($images["preview"] != "")
-                                       $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
-                               elseif ($images["full"] != "")
+                               //if ($images["preview"] != "")
+                               //      $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
+                               //elseif ($images["full"] != "")
+                               //      $post .= "\n[img]".$images["full"]."[/img]\n";
+                               if ($images["full"] != "")
                                        $post .= "\n[img]".$images["full"]."[/img]\n";
 
                                //$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]";
@@ -257,7 +267,7 @@ function fromgplus_handleattachments($item, $displaytext) {
                                elseif ($images["full"] != "")
                                        $post .= "\n[img]".$images["full"]."[/img]\n";
 
-                               if (($attachment->displayName != "") AND ($attachment->displayName != $displaytext))
+                               if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext)))
                                        $post .= fromgplus_html2bbcode($attachment->displayName)."\n";
                                break;