rework autocomplete: Access list of smilies over JSON

diff --git a/include/network.php b/include/network.php
index c6379e407bcc79aae4a3ed852c3409d9225a1f09..84f1297e03809b10110a2896fea56e4ae92c58c4 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -1344,3 +1344,18 @@ function short_link($url) {
        }
        return $slinky->short();
 }};
+
+/**
+ * @brief Encodes content to json
+ * 
+ * This function encodes an array to json format
+ * and adds an application/json HTTP header to the output.
+ * After finishing the process is getting killed.
+ * 
+ * @param array $x
+ */
+function json_return_and_die($x) {
+       header("content-type: application/json");
+       echo json_encode($x);
+       killme();
+}

diff --git a/include/smilies.php b/include/smilies.php
new file mode 100644 (file)
index 0000000..7b3feef
--- /dev/null
+++ b/include/smilies.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * @file include/smilies.php
+ */
+
+/**
+ * This class contains functions to handle smiles
+ */
+
+class smilies {
+
+       /**
+        * @brief Function to list all smilies
+        * 
+        * Get an array of all smilies, both internal and from addons.
+        * 
+        * @return array
+        *      'texts' => smilie shortcut
+        *      'icons' => icon in html
+        * 
+        * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
+        */
+       public static function list_smilies() {
+
+               $texts =  array(
+                       '&lt;3',
+                       '&lt;/3',
+                       '&lt;\\3',
+                       ':-)',
+                       ';-)',
+                       ':-(',
+                       ':-P',
+                       ':-p',
+                       ':-"',
+                       ':-&quot;',
+                       ':-x',
+                       ':-X',
+                       ':-D',
+                       '8-|',
+                       '8-O',
+                       ':-O',
+                       '\\o/',
+                       'o.O',
+                       'O.o',
+                       'o_O',
+                       'O_o',
+                       ":'(",
+                       ":-!",
+                       ":-/",
+                       ":-[",
+                       "8-)",
+                       ':beer',
+                       ':homebrew',
+                       ':coffee',
+                       ':facepalm',
+                       ':like',
+                       ':dislike',
+                       '~friendica',
+                       'red#',
+                       'red#matrix'
+
+               );
+
+               $icons = array(
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/like.gif" alt=":like" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
+                       '<a href="http://friendica.com">~friendica <img class="smiley" src="' . app::get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
+                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>',
+                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>'
+               );
+
+               $params = array('texts' => $texts, 'icons' => $icons);
+               call_hooks('smilie', $params);
+
+               return $params;
+
+       }
+
+       /**
+        * @brief Replaces text emoticons with graphical images
+        *
+        * 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.
+        *
+        * 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
+        * bbcode source for HTML display
+        *
+        * @param string $s
+        * @param boolean $sample
+        * 
+        * @return string
+        */
+       public static function replace($s, $sample = false) {
+               if(intval(get_config('system','no_smilies'))
+                       || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
+                       return $s;
+
+               $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::smile_encode',$s);
+               $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::smile_encode',$s);
+
+               $params = self::list_smilies();
+               $params['string'] = $s;
+
+               if($sample) {
+                       $s = '<div class="smiley-sample">';
+                       for($x = 0; $x < count($params['texts']); $x ++) {
+                               $s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
+                       }
+               }
+               else {
+                       $params['string'] = preg_replace_callback('/&lt;(3+)/','self::preg_heart',$params['string']);
+                       $s = str_replace($params['texts'],$params['icons'],$params['string']);
+               }
+
+               $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::smile_decode',$s);
+               $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::smile_decode',$s);
+
+               return $s;
+       }
+
+       private function smile_encode($m) {
+               return(str_replace($m[1],base64url_encode($m[1]),$m[0]));
+       }
+
+       private function smile_decode($m) {
+               return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
+       }
+
+
+       /**
+        * @brief expand <3333 to the correct number of hearts
+        *
+        * @param string $x
+        * @return string
+        */
+       private function preg_heart($x) {
+               if(strlen($x[1]) == 1)
+                       return $x[0];
+               $t = '';
+               for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
+                       $t .= '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />';
+               $r =  str_replace($x[0],$t,$x[0]);
+               return $r;
+       }
+
+}

diff --git a/include/text.php b/include/text.php
index 07524e851dd2f11baf9b3e7ffefacfe953ce6ee7..4e56ad1058e1b0a29b54d17a1dcf28aab10fd749 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -2,6 +2,7 @@
 
 require_once("include/template_processor.php");
 require_once("include/friendica_smarty.php");
+require_once("include/smilies.php");
 require_once("include/map.php");
 require_once("mod/proxy.php");
 
@@ -1079,160 +1080,6 @@ function get_mood_verbs() {
        return $arr;
 }
 
-
-
-if(! function_exists('smilies')) {
-/**
- * Replaces text emoticons with graphical images
- *
- * 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.
- *
- * 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
- * bbcode source for HTML display
- *
- * @param string $s
- * @param boolean $sample
- * @return string
- * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array, 'string' => $s)
- */
-function smilies($s, $sample = false) {
-       $a = get_app();
-
-       if(intval(get_config('system','no_smilies'))
-               || (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);
-
-       $texts =  array(
-               '&lt;3',
-               '&lt;/3',
-               '&lt;\\3',
-               ':-)',
-               ';-)',
-               ':-(',
-               ':-P',
-               ':-p',
-               ':-"',
-               ':-&quot;',
-               ':-x',
-               ':-X',
-               ':-D',
-               '8-|',
-               '8-O',
-               ':-O',
-               '\\o/',
-               'o.O',
-               'O.o',
-               'o_O',
-               'O_o',
-               ":'(",
-               ":-!",
-               ":-/",
-               ":-[",
-               "8-)",
-               ':beer',
-               ':homebrew',
-               ':coffee',
-               ':facepalm',
-               ':like',
-               ':dislike',
-               '~friendica',
-               'red#',
-               'red#matrix'
-
-       );
-
-       $icons = array(
-               '<img class="smiley" src="' . z_root() . '/images/smiley-heart.gif" alt="&lt;3" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-brokenheart.gif" alt="&lt;/3" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-smile.gif" alt=":-)" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-wink.gif" alt=";-)" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-frown.gif" alt=":-(" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-tongue-out.gif" alt=":-P" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-tongue-out.gif" alt=":-p" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-\"" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-\"" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-x" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-X" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-laughing.gif" alt=":-D" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-surprised.gif" alt="8-|" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-surprised.gif" alt="8-O" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-surprised.gif" alt=":-O" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="o.O" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="O.o" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="o_O" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="O_o" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-cry.gif" alt=":\'(" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-undecided.gif" alt=":-/" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-embarassed.gif" alt=":-[" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-cool.gif" alt="8-)" />',
-               '<img class="smiley" src="' . z_root() . '/images/beer_mug.gif" alt=":beer" />',
-               '<img class="smiley" src="' . z_root() . '/images/beer_mug.gif" alt=":homebrew" />',
-               '<img class="smiley" src="' . z_root() . '/images/coffee.gif" alt=":coffee" />',
-               '<img class="smiley" src="' . z_root() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
-               '<img class="smiley" src="' . z_root() . '/images/like.gif" alt=":like" />',
-               '<img class="smiley" src="' . z_root() . '/images/dislike.gif" alt=":dislike" />',
-               '<a href="http://friendica.com">~friendica <img class="smiley" src="' . z_root() . '/images/friendica-16.png" alt="~friendica" /></a>',
-               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . z_root() . '/images/rm-16.png" alt="red" />matrix</a>',
-               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . z_root() . '/images/rm-16.png" alt="red" />matrix</a>'
-       );
-
-       $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
-       call_hooks('smilie', $params);
-
-       if($sample) {
-               $s = '<div class="smiley-sample">';
-               for($x = 0; $x < count($params['texts']); $x ++) {
-                       $s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
-               }
-       }
-       else {
-               $params['string'] = preg_replace_callback('/&lt;(3+)/','preg_heart',$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('/<code>(.*?)<\/code>/ism','smile_decode',$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]));
-}
-
-
-/**
- * expand <3333 to the correct number of hearts
- *
- * @param string $x
- * @return string
- */
-function preg_heart($x) {
-       $a = get_app();
-       if(strlen($x[1]) == 1)
-               return $x[0];
-       $t = '';
-       for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
-               $t .= '<img class="smiley" src="' . z_root() . '/images/smiley-heart.gif" alt="&lt;3" />';
-       $r =  str_replace($x[0],$t,$x[0]);
-       return $r;
-}
-
-
 if(! function_exists('day_translate')) {
 /**
  * Translate days and months names
@@ -1549,7 +1396,7 @@ function prepare_text($text) {
        if(stristr($text,'[nosmile]'))
                $s = bbcode($text);
        else
-               $s = smilies(bbcode($text));
+               $s = smilies::replace(bbcode($text));
 
        return trim($s);
 }}

diff --git a/mod/smilies.php b/mod/smilies.php
index c47f95da76a5cfc7656aee72dcf7cb667402931d..5a157e36861ea2429d1f55098f43ceb546c9f8c0 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,3 +1,21 @@
 <?php
 
-function smilies_content(&$a) { return smilies('',true); }
+/**
+ * @file mod/smilies.php
+ */
+
+require_once("include/smilies.php");
+
+function smilies_content(&$a) {
+       if ($a->argv[1]==="json"){
+               $tmp = smilies::list_smilies();
+               $results = array();
+               for($i = 0; $i < count($tmp['texts']); $i++) {
+                       $results[] = array('text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]);
+               }
+               json_return_and_die($results);
+       }
+       else {
+               return smilies('',true);
+       }
+}