rework autocomplete: add class dir and static function

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 46f737e4c2d1c930e67eb7b794f129e3d5380b9e..b5c43e38e63ea762ce53d467e2871407552b24d8 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -659,7 +659,7 @@ function acl_lookup(&$a, $out_type = 'json') {
  * @brief Searching for global contacts for autocompletion
  * 
  * @param App $a
- * @return type
+ * @return array
  */
 function navbar_complete(&$a) {
 
@@ -682,7 +682,7 @@ function navbar_complete(&$a) {
                $search = substr($search,1);
 
        if($localsearch) {
-               $x = dirsearch_global_by_name($search);
+               $x = dir::global_search_by_name($search);
                return $x;
        }
 

diff --git a/include/dir_fns.php b/include/dir_fns.php
index 2e39e7ddbfcccd9e668d43f39305ceda668ba158..b85cb5b2d009aea1fd63f2fbedc968f49c396ce2 100644 (file)
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -2,45 +2,51 @@
 
 /**
  * @file include/dir_fns.php
- * @brief Functions for directory
  */
 
+
 /**
- * @brief Search global contact table by nick or name
- *  * 
- * @param string $search
- * @return array
+ * @brief This class handels directory related functions
  */
-function dirsearch_global_by_name($search) {
-
-       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;
-
-               $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
-                                               `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
-                                       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`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s'
-                                               ) 
-                                               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)), dbesc(escape_tags($search)));
-               return $results;
+class dir {
+
+       /**
+        * @brief Search global contact table by nick or name
+        *  * 
+        * @param string $search Name or nick
+        * @return array
+        */
+       public static function global_search_by_name($search) {
+
+               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;
+
+                       $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
+                                                       `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
+                                               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`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s'
+                                                       ) 
+                                                       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)), dbesc(escape_tags($search)));
+                       return $results;
+               }
+
        }
-               
-}
\ No newline at end of file
+}

diff --git a/view/templates/contacts-head.tpl b/view/templates/contacts-head.tpl
index 25055d405b9ef1a34511f12b0b1eda6962dbc9ec..ea562233f442730a5bba8f981454b832d04be4f2 100644 (file)
--- a/view/templates/contacts-head.tpl
+++ b/view/templates/contacts-head.tpl
@@ -2,18 +2,6 @@
 <script>
 $(document).ready(function() {
        $("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
- 
-
-       $("#contacts-search").keyup(function(event){
-               if(event.keyCode == 13){
-                       $("#contacts-search").click();
-               }
-       });
-       $(".autocomplete-w1 .selected").keyup(function(event){
-               if(event.keyCode == 13){
-                       $("#contacts-search").click();
-               }
-       });
 });
 </script>