From 2c7ce20ccf9bb71a67ba24d238fd6a7361320b3e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 4 Jun 2016 15:04:14 -0700 Subject: cross-site encoding issue with tags --- include/items.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index f473b2bac..3b73310fe 100755 --- a/include/items.php +++ b/include/items.php @@ -1183,7 +1183,7 @@ function encode_item_terms($terms,$mirror = false) { if($terms) { foreach($terms as $term) { if(in_array($term['ttype'],$allowed_export_terms)) - $ret[] = array('tag' => $term['term'], 'url' => $term['url'], 'ttype' => termtype($term['type'])); + $ret[] = array('tag' => $term['term'], 'url' => $term['url'], 'type' => termtype($term['type'])); } } @@ -1240,11 +1240,9 @@ function decode_tags($t) { $ret = array(); foreach($t as $x) { $tag = array(); - if(array_key_exists('type',$x)) - $x['ttype'] = $x['type']; $tag['term'] = htmlspecialchars($x['tag'], ENT_COMPAT, 'UTF-8', false); $tag['url'] = htmlspecialchars($x['url'], ENT_COMPAT, 'UTF-8', false); - switch($x['ttype']) { + switch($x['type']) { case 'hashtag': $tag['ttype'] = TERM_HASHTAG; break; -- cgit v1.2.3 From a6012af00d13bdab1806b7ae172d271d4ad9ebe5 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 4 Jun 2016 17:06:12 -0700 Subject: For emojis in posts, extend smilies and save a lot of duplication of effort --- include/bbcode.php | 14 -------------- include/text.php | 12 ++++++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/bbcode.php b/include/bbcode.php index ed332146f..42741b392 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -66,19 +66,6 @@ function bb_unspacefy_and_trim($st) { } -function bb_emoji($mtch) { - $s = strtolower($mtch[1]); - if(strpos($s,'x')) { - $e = substr($s,strpos($s,'x')+1); - if(file_exists('images/emoji/' . $e . '.png')) { - return 'emoji'; - } - else { - return $mtch[0]; - } - } -} - function bb_extract_images($body) { $saved_image = array(); @@ -1014,7 +1001,6 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); } - $Text = preg_replace_callback('/\[\&\;([#a-z0-9]+)\;\]/', 'bb_emoji', $Text); $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); // fix any escaped ampersands that may have been converted into links diff --git a/include/text.php b/include/text.php index 72db9c5ea..5d0010bd5 100644 --- a/include/text.php +++ b/include/text.php @@ -1155,6 +1155,18 @@ function list_smilies() { ); + $x = get_config('feature','emoji'); + if($x === false) + $x = 1; + if($x) { + if(! App::$emojitab) + App::$emojitab = json_decode(file_get_contents('library/emoji.json'),true); + foreach(App::$emojitab as $e) { + $texts[] = $e['shortname']; + $icons[] = '' . $e['name'] . ''; + } + } + $params = array('texts' => $texts, 'icons' => $icons); call_hooks('smilie', $params); -- cgit v1.2.3 From 81f6511d340ce986e9a8ff06bbc27070818f690a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 4 Jun 2016 17:09:37 -0700 Subject: return of the project smilie --- include/text.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/text.php b/include/text.php index 5d0010bd5..7495f01bd 100644 --- a/include/text.php +++ b/include/text.php @@ -1115,8 +1115,8 @@ function list_smilies() { ':coffee', ':facepalm', ':like', - ':dislike' - + ':dislike', + ':hubzilla' ); $icons = array( @@ -1152,6 +1152,7 @@ function list_smilies() { ':facepalm', ':like', ':dislike', + ':hubzilla', ); -- cgit v1.2.3 From bf438f67e15853488a0b2209194ce3365b918ca8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 4 Jun 2016 17:13:55 -0700 Subject: the :tone variants are messed up, remove them --- include/text.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/text.php b/include/text.php index 7495f01bd..7d1e22170 100644 --- a/include/text.php +++ b/include/text.php @@ -1163,6 +1163,8 @@ function list_smilies() { if(! App::$emojitab) App::$emojitab = json_decode(file_get_contents('library/emoji.json'),true); foreach(App::$emojitab as $e) { + if(strpos($e['shortname'],':tone') === 0) + continue; $texts[] = $e['shortname']; $icons[] = '' . $e['name'] . ''; } -- cgit v1.2.3 From c1a24d44a35feca7539df6aa6909b00062072d28 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 4 Jun 2016 17:17:48 -0700 Subject: another switch of type and ttype --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index 3b73310fe..93385c6e6 100755 --- a/include/items.php +++ b/include/items.php @@ -1183,7 +1183,7 @@ function encode_item_terms($terms,$mirror = false) { if($terms) { foreach($terms as $term) { if(in_array($term['ttype'],$allowed_export_terms)) - $ret[] = array('tag' => $term['term'], 'url' => $term['url'], 'type' => termtype($term['type'])); + $ret[] = array('tag' => $term['term'], 'url' => $term['url'], 'type' => termtype($term['ttype'])); } } -- cgit v1.2.3 From dd6718c2cdf2cadaf7478b848eb892dcda1dc7e9 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 4 Jun 2016 18:10:42 -0700 Subject: provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.php b/include/text.php index 7d1e22170..1bc19da34 100644 --- a/include/text.php +++ b/include/text.php @@ -1166,7 +1166,7 @@ function list_smilies() { if(strpos($e['shortname'],':tone') === 0) continue; $texts[] = $e['shortname']; - $icons[] = '' . $e['name'] . ''; + $icons[] = '' . $e['name'] . ''; } } -- cgit v1.2.3