X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsmilies.php;h=1c0a1bbd769e2415a739aa2aafe9e542a6282639;hb=050ad68b9fc21fc5cf06153d2c6d161d30b241c6;hp=4d498b674679608cc33e599d0afb9bfbdce0985c;hpb=0c67c89715df801e0c887be50c9739db3bae7ca3;p=friendica.git

diff --git a/mod/smilies.php b/mod/smilies.php
index 4d498b6746..1c0a1bbd76 100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,7 +1,31 @@
 <?php
+/**
+ * @file mod/smilies.php
+ */
+use Friendica\App;
+use Friendica\Content\Smilies;
+use Friendica\Core\System;
 
-if(! function_exists('smilies_content')) {
-function smilies_content(&$a) {
-  return smilies('',true);
-}
+/**
+ * @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]];
+		}
+		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;
+	}
 }