rework autocomplete: some polishing

diff --git a/include/DirSearch.php b/include/DirSearch.php
index a6a0b59fcbb00a23131ffea26066761620def6cd..8682cb18ef3680cefd3a683b3eae54068c26f3d4 100644 (file)
--- a/include/DirSearch.php
+++ b/include/DirSearch.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @file include/dir.php
+ * @file include/DirSearch.php
+ * @brief This file includes the DirSearch class with directory related functions
  */
 
 
@@ -15,7 +16,7 @@ class DirSearch {
         *  * 
         * @param string $search Name or nick
         * @param string $mode Search mode 
-        * @return array
+        * @return array with search results
         */
        public static function global_search_by_name($search, $mode = '') {
 
@@ -51,6 +52,7 @@ class DirSearch {
                                                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
index 9cb2d6f2b5093ba704afa125220d51b8d149b41d..d67b92d8b00f60a4e38ab0664510adb794b336ae 100644 (file)
--- a/include/Smilies.php
+++ b/include/Smilies.php
@@ -122,7 +122,7 @@ class Smilies {
         * @param string $s
         * @param boolean $sample
         * 
-        * @return string
+        * @return string HML Output of the Smilie
         */
        public static function replace($s, $sample = false) {
                if(intval(get_config('system','no_smilies'))
@@ -165,7 +165,9 @@ class Smilies {
         * @brief expand <3333 to the correct number of hearts
         *
         * @param string $x
-        * @return string
+        * @return string HTML Output
+        * 
+        * @todo: Rework because it doesn't work correctly
         */
        private function preg_heart($x) {
                if(strlen($x[1]) == 1)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4a35fd0f088070aa13d575047fd1fff1ad5c180c..47f97250f8becc4c41db73bb8b2c2b218029e487 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -663,7 +663,7 @@ function acl_lookup(&$a, $out_type = 'json') {
  * @brief Searching for global contacts for autocompletion
  * 
  * @param App $a
- * @return array
+ * @return array with the search results
  */
 function navbar_complete(&$a) {
 
@@ -704,4 +704,4 @@ function navbar_complete(&$a) {
                }
        }
        return;
-}
\ No newline at end of file
+}

diff --git a/include/network.php b/include/network.php
index 5fd73bfef909cf0c52adf8a758594e84f19fff3f..8e076aa600c936384ca5f9eaef4f4225281ba077 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -1294,7 +1294,7 @@ function short_link($url) {
  * and adds an application/json HTTP header to the output.
  * After finishing the process is getting killed.
  * 
- * @param array $x
+ * @param array $x The input content
  */
 function json_return_and_die($x) {
        header("content-type: application/json");

diff --git a/mod/smilies.php b/mod/smilies.php
index b3d86cb3fec9946e108555ca078d250b870ff9e3..573cf17c8a1a4f238c5cfdf77b96e51f729f613d 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -16,6 +16,6 @@ function smilies_content(&$a) {
                json_return_and_die($results);
        }
        else {
-               return smilies('',true);
+               return Smilies::replace('',true);
        }
 }