API: Improvement for Twidere/Conversation call improved

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 07524e851dd2f11baf9b3e7ffefacfe953ce6ee7..e2d2e05d37b27dce1da34010bcc9f02fffd16976 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");
 
@@ -1080,7 +1081,6 @@ function get_mood_verbs() {
 }
 
 
-
 if(! function_exists('smilies')) {
 /**
  * Replaces text emoticons with graphical images
@@ -1148,41 +1148,41 @@ function smilies($s, $sample = false) {
        );
 
        $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>'
+               '<img class="smiley" src="' . z_root() . '/images/smiley-heart.gif" alt="&lt;3" title="&lt;3" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-brokenheart.gif" alt="&lt;/3" title="&lt;/3" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" title="&lt;\\3" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-laughing.gif" alt=":-D" title=":-D"  />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-embarassed.gif" alt=":-[" title=":-[" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
+               '<img class="smiley" src="' . z_root() . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
+               '<img class="smiley" src="' . z_root() . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
+               '<img class="smiley" src="' . z_root() . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
+               '<img class="smiley" src="' . z_root() . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
+               '<img class="smiley" src="' . z_root() . '/images/like.gif" alt=":like" title=":like" />',
+               '<img class="smiley" src="' . z_root() . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
+               '<a href="http://friendica.com">~friendica <img class="smiley" src="' . z_root() . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
+               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . z_root() . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
+               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . z_root() . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
        );
 
        $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1549,7 +1549,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);
 }}