Fixes:

[friendica.git] / mod / smilies.php

diff --git a/mod/smilies.php b/mod/smilies.php
index 8e04d5d054497ef2b42cb3c742b52b9cdbaba82a..1c0a1bbd769e2415a739aa2aafe9e542a6282639 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,21 +1,31 @@
 <?php
-
 /**
  * @file mod/smilies.php
  */
+use Friendica\App;
+use Friendica\Content\Smilies;
+use Friendica\Core\System;
 
-require_once("include/Smilies.php");
-
-function smilies_content(App &$a) {
-       if ($a->argv[1]==="json"){
-               $tmp = Smilies::get_list();
-               $results = array();
-               for($i = 0; $i < count($tmp['texts']); $i++) {
-                       $results[] = array('text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]);
+/**
+ * @param object $a App
+ * @return string
+ */
+function smilies_content(App $a)
+{
+       $smilies = Smilies::getList();
+       if ($a->argv[1] === "json") {
+               $results = [];
+               for ($i = 0; $i < count($smilies['texts']); $i++) {
+                       $results[] = ['text' => $smilies['texts'][$i], 'icon' => $smilies['icons'][$i]];
                }
-               json_return_and_die($results);
-       }
-       else {
-               return Smilies::replace('',true);
+               System::jsonExit($results);
+       } else {
+               $s = '<div class="smiley-sample">';
+               for ($x = 0; $x < count($smilies['texts']); $x ++) {
+                       $s .= '<dl><dt>' . $smilies['texts'][$x] . '</dt><dd>' . $smilies['icons'][$x] . '</dd></dl>';
+               }
+               $s .= '</div>';
+
+               return $s;
        }
 }