"remember me" in session does work now

[friendica.git] / mod / smilies.php

diff --git a/mod/smilies.php b/mod/smilies.php
index 4d498b674679608cc33e599d0afb9bfbdce0985c..b3d86cb3fec9946e108555ca078d250b870ff9e3 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,7 +1,21 @@
 <?php
 
-if(! function_exists('smilies_content')) {
+/**
+ * @file mod/smilies.php
+ */
+
+require_once("include/Smilies.php");
+
 function smilies_content(&$a) {
-  return smilies('',true);
-}
+       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]);
+               }
+               json_return_and_die($results);
+       }
+       else {
+               return smilies('',true);
+       }
 }