Browse Source

Remove useless rawurlencode calls for building hashtag bbcode

- Fix some formatting
tags/2019.01
Hypolite Petovan 1 year ago
parent
commit
4874f7f8ab
7 changed files with 25 additions and 25 deletions
  1. +2
    -2
      include/items.php
  2. +1
    -1
      mod/photos.php
  3. +2
    -2
      mod/tagger.php
  4. +3
    -3
      src/Model/Item.php
  5. +11
    -11
      src/Model/Term.php
  6. +1
    -1
      src/Protocol/Feed.php
  7. +5
    -5
      src/Protocol/OStatus.php

+ 2
- 2
include/items.php View File

@@ -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]";
}
}



+ 1
- 1
mod/photos.php View File

@@ -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);


+ 2
- 2
mod/tagger.php View File

@@ -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 = [];



+ 3
- 3
src/Model/Item.php View File

@@ -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"];
}
}



+ 11
- 11
src/Model/Term.php View File

@@ -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);



+ 1
- 1
src/Protocol/Feed.php View File

@@ -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;
}



+ 5
- 5
src/Protocol/OStatus.php View File

@@ -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]';
}
}
}


Loading…
Cancel
Save