dont use the entire url as option

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index e7c320e62d74e1cb8af9290d8cf23de2860adc18..d1ec25eabe279764762f1b51a24b9d3160e9dd93 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -2233,7 +2233,7 @@ $called_api = null;
 
                //don't send title to regular StatusNET requests to avoid confusing these apps
                if (x($_GET, 'getText')) {
-                       $ret['title'] = $item['title'] ;
+                       $ret['title'] = $item['title'];
                        if ($_GET['getText'] == 'html') {
                                $ret['text'] = bbcode($item['body'], false, false);
                        } elseif ($_GET['getText'] == 'plain') {
@@ -2276,18 +2276,32 @@ $called_api = null;
 
                $statushtml = trim(bbcode($body, false, false));
 
+               // Workaround for clients with limited HTML parser functionality
                $search = array("<br>", "<blockquote>", "</blockquote>",
                                "<h1>", "</h1>", "<h2>", "</h2>",
                                "<h3>", "</h3>", "<h4>", "</h4>",
                                "<h5>", "</h5>", "<h6>", "</h6>");
-               $replace = array("<br>\n", "\n<blockquote>", "</blockquote>\n",
-                               "\n<h1>", "</h1>\n", "\n<h2>", "</h2>\n",
-                               "\n<h3>", "</h3>\n", "\n<h4>", "</h4>\n",
-                               "\n<h5>", "</h5>\n", "\n<h6>", "</h6>\n");
+               $replace = array("<br>", "<br><blockquote>", "</blockquote><br>",
+                               "<br><h1>", "</h1><br>", "<br><h2>", "</h2><br>",
+                               "<br><h3>", "</h3><br>", "<br><h4>", "</h4><br>",
+                               "<br><h5>", "</h5><br>", "<br><h6>", "</h6><br>");
                $statushtml = str_replace($search, $replace, $statushtml);
 
                if ($item['title'] != "") {
-                       $statushtml = "<h4>" . bbcode($item['title']) . "</h4>\n" . $statushtml;
+                       $statushtml = "<br><h4>" . bbcode($item['title']) . "</h4><br>" . $statushtml;
+               }
+
+               do {
+                       $oldtext = $statushtml;
+                       $statushtml = str_replace("<br><br>", "<br>", $statushtml);
+               } while ($oldtext != $statushtml);
+
+               if (substr($statushtml, 0, 4) == '<br>') {
+                       $statushtml = substr($statushtml, 4);
+               }
+
+               if (substr($statushtml, 0, -4) == '<br>') {
+                       $statushtml = substr($statushtml, -4);
                }
 
                // feeds without body should contain the link
@@ -2866,7 +2880,7 @@ $called_api = null;
                        $sql_extra = " AND false ";
                }
 
-               $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND (NOT `blocked` OR `pending`) $sql_extra",
+               $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND (NOT `blocked` OR `pending`) $sql_extra ORDER BY `nick`",
                        intval(api_user())
                );
 
@@ -3974,7 +3988,7 @@ $called_api = null;
                                );
 
                // adds link to the thumbnail scale photo
-               $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record[0]['name'] . '/image/' . $hash . ']'
+               $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record[0]['nick'] . '/image/' . $hash . ']'
                                        . '[img]' . System::baseUrl() . '/photo/' . $hash . '-' . "2" . '.'. $typetoext[$filetype] . '[/img]'
                                        . '[/url]';