X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsmilies.php;h=bbb7de2e2efac4f2ad8807789f522b28d12dc204;hb=9c507e9577286c757df1946441f30e529082a3c8;hp=a33cbf6ad5adabc4ca4e8704d278df634f6513d7;hpb=d53e53cceb2823cceec36f91f39f8b1e6459a648;p=friendica.git diff --git a/mod/smilies.php b/mod/smilies.php index a33cbf6ad5..bbb7de2e2e 100644 --- a/mod/smilies.php +++ b/mod/smilies.php @@ -7,19 +7,26 @@ 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]]; } System::jsonExit($results); } else { - return Smilies::replace('', true); + $s = '
'; + for ($x = 0; $x < count($smilies['texts']); $x ++) { + $s .= '
' . $smilies['texts'][$x] . '
' . $smilies['icons'][$x] . '
'; + } + $s .= '
'; + + return $s; } }