Merge branch 'dev' into toggle-context-help

1 files changed, 21 insertions, 0 deletions

diff --git a/Zotlabs/Module/Smilies.php b/Zotlabs/Module/Smilies.php
new file mode 100644
index 000000000..efac07f84
--- /dev/null
+++ b/Zotlabs/Module/Smilies.php
@@ -0,0 +1,21 @@
+<?php
+namespace Zotlabs\Module;
+
+
+class Smilies extends \Zotlabs\Web\Controller {
+
+	function get() { 
+		if (\App::$argv[1]==="json"){
+			$tmp = list_smilies();
+			$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);
+		}
+	}
+	
+}