rework autocomplete: polishing class and methods naming

diff --git a/include/DirSearch.php b/include/DirSearch.php
new file mode 100644 (file)
index 0000000..a6a0b59
--- /dev/null
+++ b/include/DirSearch.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file include/dir.php
+ */
+
+
+/**
+ * @brief This class handels directory related functions
+ */
+class DirSearch {
+
+       /**
+        * @brief Search global contact table by nick or name
+        *  * 
+        * @param string $search Name or nick
+        * @param string $mode Search mode 
+        * @return array
+        */
+       public static function global_search_by_name($search, $mode = '') {
+
+               if($search) {
+                       // check supported networks
+                       if (get_config('system','diaspora_enabled'))
+                               $diaspora = NETWORK_DIASPORA;
+                       else
+                               $diaspora = NETWORK_DFRN;
+
+                       if (!get_config('system','ostatus_disabled'))
+                               $ostatus = NETWORK_OSTATUS;
+                       else
+                               $ostatus = NETWORK_DFRN;
+
+                       // check if fo
+                       if($mode === "community")
+                               $extra_sql = " AND `community`";
+                       else
+                               $extra_sql = "";
+
+                       $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
+                                                       `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`, `gcontact`.`community`
+                                               FROM `gcontact`
+                                               LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
+                                                       AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
+                                                       AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
+                                               WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
+                                               ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
+                                               (`gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql
+                                                       GROUP BY `gcontact`.`nurl`
+                                                       ORDER BY `gcontact`.`updated` DESC ",
+                                               intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+                                               dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+                                               dbesc(escape_tags($search)), dbesc(escape_tags($search)));
+                       return $results;
+               }
+
+       }
+}

diff --git a/include/Smilies.php b/include/Smilies.php
new file mode 100644 (file)
index 0000000..193f3b5
--- /dev/null
+++ b/include/Smilies.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * @file include/smilies.php
+ */
+
+/**
+ * This class contains functions to handle smiles
+ */
+
+class Smilies {
+
+       /**
+        * @brief Function to list all smilies
+        * 
+        * Get an array of all smilies, both internal and from addons.
+        * 
+        * @return array
+        *      'texts' => smilie shortcut
+        *      'icons' => icon in html
+        * 
+        * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
+        */
+       public static function get_list() {
+
+               $texts =  array(
+                       '&lt;3',
+                       '&lt;/3',
+                       '&lt;\\3',
+                       ':-)',
+                       ';-)',
+                       ':-(',
+                       ':-P',
+                       ':-p',
+                       ':-"',
+                       ':-&quot;',
+                       ':-x',
+                       ':-X',
+                       ':-D',
+                       '8-|',
+                       '8-O',
+                       ':-O',
+                       '\\o/',
+                       'o.O',
+                       'O.o',
+                       'o_O',
+                       'O_o',
+                       ":'(",
+                       ":-!",
+                       ":-/",
+                       ":-[",
+                       "8-)",
+                       ':beer',
+                       ':homebrew',
+                       ':coffee',
+                       ':facepalm',
+                       ':like',
+                       ':dislike',
+                       '~friendica',
+                       'red#',
+                       'red#matrix'
+
+               );
+
+               $icons = array(
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/like.gif" alt=":like" />',
+                       '<img class="smiley" src="' . app::get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
+                       '<a href="http://friendica.com">~friendica <img class="smiley" src="' . app::get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
+                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>',
+                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>'
+               );
+
+               $params = array('texts' => $texts, 'icons' => $icons);
+               call_hooks('smilie', $params);
+
+               return $params;
+
+       }
+
+       /**
+        * @brief Replaces text emoticons with graphical images
+        *
+        * It is expected that this function will be called using HTML text.
+        * We will escape text between HTML pre and code blocks from being
+        * processed.
+        *
+        * At a higher level, the bbcode [nosmile] tag can be used to prevent this
+        * function from being executed by the prepare_text() routine when preparing
+        * bbcode source for HTML display
+        *
+        * @param string $s
+        * @param boolean $sample
+        * 
+        * @return string
+        */
+       public static function replace($s, $sample = false) {
+               if(intval(get_config('system','no_smilies'))
+                       || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
+                       return $s;
+
+               $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::encode',$s);
+               $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::encode',$s);
+
+               $params = self::get_list();
+               $params['string'] = $s;
+
+               if($sample) {
+                       $s = '<div class="smiley-sample">';
+                       for($x = 0; $x < count($params['texts']); $x ++) {
+                               $s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
+                       }
+               }
+               else {
+                       $params['string'] = preg_replace_callback('/&lt;(3+)/','self::preg_heart',$params['string']);
+                       $s = str_replace($params['texts'],$params['icons'],$params['string']);
+               }
+
+               $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::decode',$s);
+               $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::decode',$s);
+
+               return $s;
+       }
+
+       private function encode($m) {
+               return(str_replace($m[1],base64url_encode($m[1]),$m[0]));
+       }
+
+       private function decode($m) {
+               return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
+       }
+
+
+       /**
+        * @brief expand <3333 to the correct number of hearts
+        *
+        * @param string $x
+        * @return string
+        */
+       private function preg_heart($x) {
+               if(strlen($x[1]) == 1)
+                       return $x[0];
+               $t = '';
+               for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
+                       $t .= '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />';
+               $r =  str_replace($x[0],$t,$x[0]);
+               return $r;
+       }
+
+}

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 99848aa1934567683ac4fadd57b17ea08a7d7375..4a35fd0f088070aa13d575047fd1fff1ad5c180c 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -6,7 +6,7 @@
 
 require_once("include/contact_selectors.php");
 require_once("include/contact_widgets.php");
-require_once("include/dir_fns.php");
+require_once("include/DirSearch.php");
 require_once("include/features.php");
 require_once("mod/proxy.php");
 
@@ -687,7 +687,7 @@ function navbar_complete(&$a) {
                $search = substr($search,1);
 
        if($localsearch) {
-               $x = dir::global_search_by_name($search, $mode);
+               $x = DirSearch::global_search_by_name($search, $mode);
                return $x;
        }
 

diff --git a/include/dir_fns.php b/include/dir_fns.php
deleted file mode 100644 (file)
index 5f018ed..0000000
--- a/include/dir_fns.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @file include/dir_fns.php
- */
-
-
-/**
- * @brief This class handels directory related functions
- */
-class dir {
-
-       /**
-        * @brief Search global contact table by nick or name
-        *  * 
-        * @param string $search Name or nick
-        * @param string $mode Search mode 
-        * @return array
-        */
-       public static function global_search_by_name($search, $mode = '') {
-
-               if($search) {
-                       // check supported networks
-                       if (get_config('system','diaspora_enabled'))
-                               $diaspora = NETWORK_DIASPORA;
-                       else
-                               $diaspora = NETWORK_DFRN;
-
-                       if (!get_config('system','ostatus_disabled'))
-                               $ostatus = NETWORK_OSTATUS;
-                       else
-                               $ostatus = NETWORK_DFRN;
-
-                       // check if fo
-                       if($mode === "community")
-                               $extra_sql = " AND `community`";
-                       else
-                               $extra_sql = "";
-
-                       $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
-                                                       `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`, `gcontact`.`community`
-                                               FROM `gcontact`
-                                               LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
-                                                       AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
-                                                       AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
-                                               WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
-                                               ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-                                               (`gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql
-                                                       GROUP BY `gcontact`.`nurl`
-                                                       ORDER BY `gcontact`.`updated` DESC ",
-                                               intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
-                                               dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
-                                               dbesc(escape_tags($search)), dbesc(escape_tags($search)));
-                       return $results;
-               }
-
-       }
-}

diff --git a/include/smilies.php b/include/smilies.php
deleted file mode 100644 (file)
index 7b3feef..0000000
--- a/include/smilies.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-/**
- * @file include/smilies.php
- */
-
-/**
- * This class contains functions to handle smiles
- */
-
-class smilies {
-
-       /**
-        * @brief Function to list all smilies
-        * 
-        * Get an array of all smilies, both internal and from addons.
-        * 
-        * @return array
-        *      'texts' => smilie shortcut
-        *      'icons' => icon in html
-        * 
-        * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
-        */
-       public static function list_smilies() {
-
-               $texts =  array(
-                       '&lt;3',
-                       '&lt;/3',
-                       '&lt;\\3',
-                       ':-)',
-                       ';-)',
-                       ':-(',
-                       ':-P',
-                       ':-p',
-                       ':-"',
-                       ':-&quot;',
-                       ':-x',
-                       ':-X',
-                       ':-D',
-                       '8-|',
-                       '8-O',
-                       ':-O',
-                       '\\o/',
-                       'o.O',
-                       'O.o',
-                       'o_O',
-                       'O_o',
-                       ":'(",
-                       ":-!",
-                       ":-/",
-                       ":-[",
-                       "8-)",
-                       ':beer',
-                       ':homebrew',
-                       ':coffee',
-                       ':facepalm',
-                       ':like',
-                       ':dislike',
-                       '~friendica',
-                       'red#',
-                       'red#matrix'
-
-               );
-
-               $icons = array(
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/like.gif" alt=":like" />',
-                       '<img class="smiley" src="' . app::get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
-                       '<a href="http://friendica.com">~friendica <img class="smiley" src="' . app::get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>',
-                       '<a href="http://redmatrix.me/">red<img class="smiley" src="' . app::get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>'
-               );
-
-               $params = array('texts' => $texts, 'icons' => $icons);
-               call_hooks('smilie', $params);
-
-               return $params;
-
-       }
-
-       /**
-        * @brief Replaces text emoticons with graphical images
-        *
-        * It is expected that this function will be called using HTML text.
-        * We will escape text between HTML pre and code blocks from being
-        * processed.
-        *
-        * At a higher level, the bbcode [nosmile] tag can be used to prevent this
-        * function from being executed by the prepare_text() routine when preparing
-        * bbcode source for HTML display
-        *
-        * @param string $s
-        * @param boolean $sample
-        * 
-        * @return string
-        */
-       public static function replace($s, $sample = false) {
-               if(intval(get_config('system','no_smilies'))
-                       || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
-                       return $s;
-
-               $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::smile_encode',$s);
-               $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::smile_encode',$s);
-
-               $params = self::list_smilies();
-               $params['string'] = $s;
-
-               if($sample) {
-                       $s = '<div class="smiley-sample">';
-                       for($x = 0; $x < count($params['texts']); $x ++) {
-                               $s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
-                       }
-               }
-               else {
-                       $params['string'] = preg_replace_callback('/&lt;(3+)/','self::preg_heart',$params['string']);
-                       $s = str_replace($params['texts'],$params['icons'],$params['string']);
-               }
-
-               $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::smile_decode',$s);
-               $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','self::smile_decode',$s);
-
-               return $s;
-       }
-
-       private function smile_encode($m) {
-               return(str_replace($m[1],base64url_encode($m[1]),$m[0]));
-       }
-
-       private function smile_decode($m) {
-               return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
-       }
-
-
-       /**
-        * @brief expand <3333 to the correct number of hearts
-        *
-        * @param string $x
-        * @return string
-        */
-       private function preg_heart($x) {
-               if(strlen($x[1]) == 1)
-                       return $x[0];
-               $t = '';
-               for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
-                       $t .= '<img class="smiley" src="' . app::get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />';
-               $r =  str_replace($x[0],$t,$x[0]);
-               return $r;
-       }
-
-}

diff --git a/include/text.php b/include/text.php
index 4e56ad1058e1b0a29b54d17a1dcf28aab10fd749..956344d63d622f9f00b089b053bf49ecbcce3414 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -2,7 +2,7 @@
 
 require_once("include/template_processor.php");
 require_once("include/friendica_smarty.php");
-require_once("include/smilies.php");
+require_once("include/Smilies.php");
 require_once("include/map.php");
 require_once("mod/proxy.php");
 
@@ -1396,7 +1396,7 @@ function prepare_text($text) {
        if(stristr($text,'[nosmile]'))
                $s = bbcode($text);
        else
-               $s = smilies::replace(bbcode($text));
+               $s = Smilies::replace(bbcode($text));
 
        return trim($s);
 }}

diff --git a/mod/smilies.php b/mod/smilies.php
index 5a157e36861ea2429d1f55098f43ceb546c9f8c0..b3d86cb3fec9946e108555ca078d250b870ff9e3 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -4,11 +4,11 @@
  * @file mod/smilies.php
  */
 
-require_once("include/smilies.php");
+require_once("include/Smilies.php");
 
 function smilies_content(&$a) {
        if ($a->argv[1]==="json"){
-               $tmp = smilies::list_smilies();
+               $tmp = Smilies::get_list();
                $results = array();
                for($i = 0; $i < count($tmp['texts']); $i++) {
                        $results[] = array('text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]);