X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsmilies.php;h=bbb7de2e2efac4f2ad8807789f522b28d12dc204;hb=9c507e9577286c757df1946441f30e529082a3c8;hp=d96a4bfc6dcdf34ddcfe571a64e15f9f249d70c8;hpb=39ff6e9ce9251fe69b56ba05ea7bdc1896f34de2;p=friendica.git

diff --git a/mod/smilies.php b/mod/smilies.php
index d96a4bfc6d..bbb7de2e2e 100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,25 +1,32 @@
 <?php
-
 /**
  * @file mod/smilies.php
  */
 use Friendica\App;
 use Friendica\Content\Smilies;
+use Friendica\Core\System;
 
 /**
- * @param object $a App
- * @return mixed
+ * @param App $a App
+ * @return string
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
 function smilies_content(App $a)
 {
-	if ($a->argv[1] === "json") {
-		$tmp = Smilies::getList();
+	$smilies = Smilies::getList();
+	if (!empty($a->argv[1]) && ($a->argv[1] === "json")) {
 		$results = [];
-		for ($i = 0; $i < count($tmp['texts']); $i++) {
-			$results[] = ['text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]];
+		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;
 	}
 }