aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2015-01-16 19:10:34 +0100
committerStefan Parviainen <saparvia@caterva.eu>2015-01-16 19:10:34 +0100
commit334d496bb1779d9b9d06d8427da50e751bd2a98d (patch)
tree019179e1cbebe2ecaf2189ccee567efd6843372d /include
parentf9f23bd6c9b50e209f57e6cf8fde6846f214468f (diff)
downloadvolse-hubzilla-334d496bb1779d9b9d06d8427da50e751bd2a98d.tar.gz
volse-hubzilla-334d496bb1779d9b9d06d8427da50e751bd2a98d.tar.bz2
volse-hubzilla-334d496bb1779d9b9d06d8427da50e751bd2a98d.zip
Fix some issues with tagging.
Diffstat (limited to 'include')
-rw-r--r--include/text.php29
1 files changed, 13 insertions, 16 deletions
diff --git a/include/text.php b/include/text.php
index c130a9b8a..b6e4abf24 100644
--- a/include/text.php
+++ b/include/text.php
@@ -606,9 +606,11 @@ function get_tags($s) {
$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
// ignore anything in [style= ]
-
$s = preg_replace('/\[style=(.*?)\]/sm','',$s);
+ // ignore anything in [color= ], because it may contain color codes which are mistaken for tags
+ $s = preg_replace('/\[color=(.*?)\]/sm','',$s);
+
// match any double quoted tags
if(preg_match_all('/([@#]\&quot\;.*?\&quot\;)/',$s,$match)) {
@@ -620,12 +622,11 @@ function get_tags($s) {
// Match full names against @tags including the space between first and last
// We will look these up afterward to see if they are full names or not recognisable.
- if(preg_match_all('/(@[^ \x0D\x0A,:?\[]+ [^ \x0D\x0A@,:?\[]+)([ \x0D\x0A@,:?\[]|$)/',$s,$match)) {
+ // The lookbehind is used to prevent a match in the middle of a word
+ // '=' needs to be avoided because when the replacement is made (in handle_tag()) it has to be ignored there
+ // Feel free to allow '=' if the issue with '=' is solved in handle_tag()
+ if(preg_match_all('/(?<![a-zA-Z0-9=])(@[^ \x0D\x0A,:?\[]+ [^ \x0D\x0A@,:?\[]+)/',$s,$match)) {
foreach($match[1] as $mtch) {
- if(strstr($mtch,"]")) {
- // we might be inside a bbcode color tag - leave it alone
- continue;
- }
if(substr($mtch,-1,1) === '.')
$ret[] = substr($mtch,0,-1);
else
@@ -636,20 +637,13 @@ function get_tags($s) {
// Otherwise pull out single word tags. These can be @nickname, @first_last
// and #hash tags.
- if(preg_match_all('/([@#][^ \x0D\x0A,;:?\[]+)([ \x0D\x0A,;:?\[]|$)/',$s,$match)) {
+ if(preg_match_all('/(?<![a-zA-Z0-9=])([@#][^ \x0D\x0A,;:?\[]+)/',$s,$match)) {
foreach($match[1] as $mtch) {
- if(strstr($mtch,"]")) {
- // we might be inside a bbcode color tag - leave it alone
- continue;
- }
if(substr($mtch,-1,1) === '.')
$mtch = substr($mtch,0,-1);
// ignore strictly numeric tags like #1 or #^ bookmarks or ## double hash
if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^') || substr($mtch,1,1) === '#')
continue;
- // try not to catch url fragments
- if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1)))
- continue;
// or quote remnants from the quoted strings we already picked out earlier
if(strpos($mtch,'&quot'))
continue;
@@ -2155,8 +2149,11 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
//create text for link
$url = $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag);
$newtag = '#[zrl=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/zrl]';
- //replace tag by the link
- $body = str_replace($tag, $newtag, $body);
+ //replace tag by the link. Make sure to not replace something in the middle of a word
+ // The '=' is needed to not replace color codes if the code is also used as a tag
+ // Much better would be to somehow completely avoiding things in e.g. [color]-tags.
+ // This would allow writing things like "my favourite tag=#foobar".
+ $body = preg_replace('/(?<![a-zA-Z0-9=])'.preg_quote($tag).'/', $newtag, $body);
$replaced = true;
}
//is the link already in str_tags?