harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #291 from toclimb/smilies-fix

Browse Source 
Trying to make emoticons behave, 2nd round
This commit is contained in:
friendica 2014-01-29 15:26:51 -08:00
commit 9df2082b84
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/text.php
View File

@ -871,8 +871,8 @@ function get_mood_verbs() {
* Returns string * Returns string
* *
* It is expected that this function will be called using HTML text. * It is expected that this function will be called using HTML text.
* We will escape text between HTML pre and code blocks from being * We will escape text between HTML pre and code blocks, and HTML attributes
* processed. * (such as urls) from being processed.
* *
* At a higher level, the bbcode [nosmile] tag can be used to prevent this * 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 * 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')))) || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
return $s; return $s;
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s); $s = preg_replace_callback('{<(pre|code)>(?<target>.*?)</\1>}ism','smile_encode',$s);
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s); $s = preg_replace_callback('/<[a-z]+ (?<target>.*?)>/ism','smile_encode',$s);
// $s = preg_replace_callback('/<(.*?)>/ism','smile_encode',$s);
$texts = array( $texts = array(
'&lt;3', '&lt;3',
@ -982,20 +981,20 @@ function smilies($s, $sample = false) {
$s = str_replace($params['texts'],$params['icons'],$params['string']); $s = str_replace($params['texts'],$params['icons'],$params['string']);
} }
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_decode',$s); $s = preg_replace_callback(
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_decode',$s); '/<!--base64:(.*?)-->/ism',
// $s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s); function ($m) { return base64url_decode($m[1]); },
$s
);
return $s; return $s;
} }
function smile_encode($m) {
return(str_replace($m[1],base64url_encode($m[1]),$m[0]));
}
function smile_decode($m) { function smile_encode($m) {
return(str_replace($m[1],base64url_decode($m[1]),$m[0])); $cleartext = $m['target'];
return str_replace($cleartext,'<!--base64:' . base64url_encode($cleartext) . '-->',$m[0]);
} }
// expand <3333 to the correct number of hearts // expand <3333 to the correct number of hearts