Remove useless rawurlencode calls for building hashtag bbcode

- Fix some formatting

diff --git a/include/items.php b/include/items.php
index b9e1a0c9944d97f2b2d9094b8e67dc414a5b1263..c3113836138c1ff8c25784a109ca22dc2b0d355d 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -97,7 +97,7 @@ function add_page_info_data(array $data, $no_photos = false)
                        /// @TODO make a positive list of allowed characters
                        $hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
                                                ["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
-                       $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] ";
+                       $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] ";
                }
        }
 
@@ -148,7 +148,7 @@ function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
                                $tags .= ", ";
                        }
 
-                       $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
+                       $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
                }
        }
 

diff --git a/mod/photos.php b/mod/photos.php
index 65a48c4c3f4995e26d82b2b94372c96eff461650..70e0e1882d68b7f94bf05cf1f25412c574adb85f 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -613,7 +613,7 @@ function photos_post(App $a)
                                                        }
 
                                                        $profile = str_replace(',', '%2c', $profile);
-                                                       $str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
+                                                       $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
                                                }
                                        } elseif (strpos($tag, '#') === 0) {
                                                $tagname = substr($tag, 1);

diff --git a/mod/tagger.php b/mod/tagger.php
index 6c3c6157a548fb133eb83fac8525f784a6cf089c..09668cd6de23ff7e21d60a8450e92fa8a39c1ade 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -93,7 +93,7 @@ function tagger_content(App $a) {
        </target>
 EOT;
 
-       $tagid = System::baseUrl() . '/search?tag=' . $term;
+       $tagid = System::baseUrl() . '/search?tag=' . $xterm;
        $objtype = ACTIVITY_OBJ_TAGTERM;
 
        $obj = <<< EOT
@@ -113,7 +113,7 @@ EOT;
                return;
        }
 
-       $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+       $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
 
        $arr = [];
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 9aaac7f7a0ce0a59a2ca514a5a59ade9a5b50b86..0c420550b8fa1d28ce3551aa43fe7d718ccaeda5 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2448,15 +2448,15 @@ class Item extends BaseObject
 
                        $basetag = str_replace('_',' ',substr($tag,1));
 
-                       $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+                       $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
 
                        $item["body"] = str_replace($tag, $newtag, $item["body"]);
 
                        if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
                                if (strlen($item["tag"])) {
-                                       $item["tag"] = ','.$item["tag"];
+                                       $item["tag"] = ',' . $item["tag"];
                                }
-                               $item["tag"] = $newtag.$item["tag"];
+                               $item["tag"] = $newtag . $item["tag"];
                        }
                }
 

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 2870eb167d6d68b4fda69bb177c8936cfc75cf67..da07659b4e3289f2575210ec6818d0f7a2c4e117 100644 (file)
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -266,25 +266,25 @@ class Term
                                $tag["url"] = $searchpath . $tag["term"];
                        }
 
-                       $orig_tag = $tag["url"];
+                       $orig_tag = $tag['url'];
 
                        $author = ['uid' => 0, 'id' => $item['author-id'],
                                'network' => $item['author-network'], 'url' => $item['author-link']];
-                       $tag["url"] = Contact::magicLinkByContact($author, $tag['url']);
+                       $tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
 
-                       if ($tag["type"] == TERM_HASHTAG) {
-                               if ($orig_tag != $tag["url"]) {
-                                       $item['body'] = str_replace($orig_tag, $tag["url"], $item['body']);
+                       if ($tag['type'] == TERM_HASHTAG) {
+                               if ($orig_tag != $tag['url']) {
+                                       $item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
                                }
 
-                               $return['hashtags'][] = "#<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
-                               $prefix = "#";
-                       } elseif ($tag["type"] == TERM_MENTION) {
-                               $return['mentions'][] = "@<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
-                               $prefix = "@";
+                               $return['hashtags'][] = '#<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+                               $prefix = '#';
+                       } elseif ($tag['type'] == TERM_MENTION) {
+                               $return['mentions'][] = '@<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+                               $prefix = '@';
                        }
 
-                       $return['tags'][] = $prefix . "<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
+                       $return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
                }
                DBA::close($taglist);
 

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index d63b57b8c9522bd6a21d9387b1c7e0c93a217e50..5939e5ce1a929b96c00f0fc21b642acab4856106 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -350,7 +350,7 @@ class Feed {
                                        $tags .= ', ';
                                }
 
-                               $taglink = "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
+                               $taglink = "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
                                $tags .= $taglink;
                        }
 

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 875880a936354640862bade57570770af2329f55..45000d77005e8b8bd6801a80809aab28d52d0182 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -634,15 +634,15 @@ class OStatus
                if ($categories) {
                        foreach ($categories as $category) {
                                foreach ($category->attributes as $attributes) {
-                                       if ($attributes->name == "term") {
+                                       if ($attributes->name == 'term') {
                                                $term = $attributes->textContent;
-                                               if (!empty($item["tag"])) {
-                                                       $item["tag"] .= ',';
+                                               if (!empty($item['tag'])) {
+                                                       $item['tag'] .= ',';
                                                } else {
-                                                       $item["tag"] = '';
+                                                       $item['tag'] = '';
                                                }
 
-                                               $item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
+                                               $item['tag'] .= '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']' . $term . '[/url]';
                                        }
                                }
                        }