X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsmilies.php;h=ecea3400e271c3e1e8b4af722ebfe4c0f0567a77;hb=c5558cc4595263e2654bb614f54d61273d79bc5f;hp=289ad887f96bf5e5bfa87e92cbfdf0ded9e86264;hpb=1c38540f20b3207a0fd09ef0802125e45e83bcf6;p=friendica.git

diff --git a/mod/smilies.php b/mod/smilies.php
index 289ad887f9..ecea3400e2 100644
--- 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 (!empty($a->argv[1]) && ($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);
+		System::jsonExit($results);
 	} else {
-		return Smilies::replace('', true);
+		$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;
 	}
 }