aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-29 15:26:51 -0800
committerfriendica <info@friendica.com>2014-01-29 15:26:51 -0800
commit9df2082b841044dec42244974c2fc94bf8617675 (patch)
tree77a64a726f47f922c237864076e9ef2bfddad31e
parentc48c7a64c7a401c8f11ceb140309d62296ae7c6b (diff)
parent4c289394889dc5f69a0c20ecd56806ea691e7f64 (diff)
downloadvolse-hubzilla-9df2082b841044dec42244974c2fc94bf8617675.tar.gz
volse-hubzilla-9df2082b841044dec42244974c2fc94bf8617675.tar.bz2
volse-hubzilla-9df2082b841044dec42244974c2fc94bf8617675.zip
Merge pull request #291 from toclimb/smilies-fix
Trying to make emoticons behave, 2nd round
-rwxr-xr-xinclude/text.php25
1 files changed, 12 insertions, 13 deletions
diff --git a/include/text.php b/include/text.php
index a459296cb..cf68ee121 100755
--- a/include/text.php
+++ b/include/text.php
@@ -871,8 +871,8 @@ function get_mood_verbs() {
* Returns string
*
* It is expected that this function will be called using HTML text.
- * We will escape text between HTML pre and code blocks from being
- * processed.
+ * We will escape text between HTML pre and code blocks, and HTML attributes
+ * (such as urls) from being processed.
*
* At a higher level, the bbcode [nosmile] tag can be used to prevent this
* function from being executed by the prepare_text() routine when preparing
@@ -889,9 +889,8 @@ function smilies($s, $sample = false) {
|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
return $s;
- $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
- $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
-// $s = preg_replace_callback('/<(.*?)>/ism','smile_encode',$s);
+ $s = preg_replace_callback('{<(pre|code)>(?<target>.*?)</\1>}ism','smile_encode',$s);
+ $s = preg_replace_callback('/<[a-z]+ (?<target>.*?)>/ism','smile_encode',$s);
$texts = array(
'&lt;3',
@@ -982,20 +981,20 @@ function smilies($s, $sample = false) {
$s = str_replace($params['texts'],$params['icons'],$params['string']);
}
- $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_decode',$s);
- $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_decode',$s);
-// $s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
+ $s = preg_replace_callback(
+ '/<!--base64:(.*?)-->/ism',
+ function ($m) { return base64url_decode($m[1]); },
+ $s
+ );
return $s;
}
-function smile_encode($m) {
- return(str_replace($m[1],base64url_encode($m[1]),$m[0]));
-}
-function smile_decode($m) {
- return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
+function smile_encode($m) {
+ $cleartext = $m['target'];
+ return str_replace($cleartext,'<!--base64:' . base64url_encode($cleartext) . '-->',$m[0]);
}
// expand <3333 to the correct number of hearts