From 2e24c76b58f5e250bc9b68e0326eb5f2744c807b Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo <lexbcn@gmail.com>
Date: Tue, 28 Oct 2014 13:15:23 +0100
Subject: [PATCH] Add additional search by user or group and extra user fields
 in social search

---
 main/inc/lib/usermanager.lib.php | 108 ++++++++++++++++++++++++++++++-
 main/social/search.php           |  43 ++++++++----
 2 files changed, 135 insertions(+), 16 deletions(-)

diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 7136bc5ce4..b4cef4a654 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -3568,6 +3568,7 @@ class UserManager
         $number_of_items = intval($number_of_items);
 
         $where_field = "";
+        $where_extra_fields = UserManager::get_search_form_where_extra_fields();
         if ($field_id != 0) {
             $where_field = " field_id = $field_id AND ";
         }
@@ -3594,6 +3595,7 @@ class UserManager
                         concat(u.firstname,' ',u.lastname) LIKE '%".$tag."%' OR
                         concat(u.lastname,' ',u.firstname) LIKE '%".$tag."%'
                      )
+                     ".(!empty($where_extra_fields)?$where_extra_fields:'')."
                      AND
                      url_rel_user.access_url_id=".api_get_current_access_url_id();
 
@@ -3626,6 +3628,75 @@ class UserManager
         return $return;
     }
 
+
+    /**
+      * Get extra filtrable user fields (type select)
+      * @return array
+      */
+    public static function get_extra_filtrable_fields()
+    {
+        $extra_field_list = UserManager::get_extra_fields();
+        $extra_filtrabe_fields = array();
+        if (is_array($extra_field_list)) {
+            foreach ($extra_field_list as $extra_field) {
+                //if is enabled to filter and is a "<select>" field type
+                if ($extra_field[8]==1 && $extra_field[2]==4) {
+                    $extra_filtrabe_fields[] = array('name'=> $extra_field[3], 'variable'=>$extra_field[1], 'data'=> $extra_field[9]);
+                }
+            }
+        }    
+        if (is_array($extra_filtrabe_fields) && count($extra_filtrabe_fields)>0 ) return $extra_filtrabe_fields;
+    }
+
+    /**
+      * Get extra where clauses for finding users based on extra filtrable user fields (type select)
+      * @return string With AND clauses based on user's ID which have the values to search in extra user fields
+      */
+    public static function get_search_form_where_extra_fields()
+    {
+    
+        $use_extra_fields = false;
+      
+        $extra_fields = UserManager::get_extra_filtrable_fields();
+      
+        if (is_array($extra_fields) && count($extra_fields)>0 ) {
+            $result_list=array();
+            foreach ($extra_fields as $extra_field) {
+                $varname = 'field_'.$extra_field['variable'];
+                if (UserManager::is_extra_field_available($extra_field['variable'])) {
+                    if (isset($_GET[$varname]) && $_GET[$varname]!='0') {
+                        $use_extra_fields = true;
+                            $extra_field_result[]= UserManager::get_extra_user_data_by_value($extra_field['variable'], Database::escape_string($_GET[$varname]));
+                    }
+                }
+            }
+        }
+
+        if ($use_extra_fields) {
+            $final_result = array();
+            if (count($extra_field_result)>1) {
+                for($i=0;$i<count($extra_field_result)-1;$i++) {
+                    if (is_array($extra_field_result[$i+1])) {
+                        $final_result  = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
+                    }
+                }
+            }
+            else {
+                $final_result = $extra_field_result[0];
+            }
+
+            $where_filter ='';
+            if (is_array($final_result) && count($final_result)>0) {
+                $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
+            }
+            else {
+                //no results
+                $where_filter = " AND u.user_id  = -1 ";
+            }
+        return $where_filter;
+        }
+    }
+    
     /**
      * Show the search form
      * @param string the value of the search box
@@ -3633,13 +3704,46 @@ class UserManager
      */
     public static function get_search_form($query)
     {
+    
+        $extra_filtrable_fields = UserManager::get_extra_filtrable_fields();
+        
+        if (is_array($extra_filtrable_fields) && count($extra_filtrable_fields)>0 ) {
+            $extra_fields = '';
+            foreach ($extra_filtrable_fields as $extra_field) {
+                $extra_fields .=  '<label class="extra_field">'.$extra_field['name'].'</label>';
+                $varname = 'field_'.$extra_field['variable'];
+                $extra_fields .=  '&nbsp;<select name="'.$varname.'" class="extra_field">';
+                $extra_fields .=  '<option value="0">--'.get_lang('Select').'--</option>';
+                foreach ($extra_field['data'] as $option) {
+                    $checked='';
+                    if (isset($_GET[$varname])) {
+                        if ($_GET[$varname]==$option[1]) {
+                            $checked = 'selected="true"';
+                        }
+                    }
+                    $extra_fields .=  '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
+                }
+                $extra_fields .=  '</select>';
+                $extra_fields .=  '&nbsp;&nbsp;';
+            }
+        }
+        
+        $search_type = isset($_GET['search_type']) ? $_GET['search_type'] : null;
+
         return '
         <form method="GET" class="well form-search" action="'.api_get_path(WEB_PATH).'main/social/search.php">
                 <input placeholder="'.get_lang('UsersGroups').'" type="text" class="input-medium" value="'.api_htmlentities(Security::remove_XSS($query)).'" name="q"/> &nbsp;
+                Tipo <select name="search_type" onchange="javascript: if (jQuery("select[name=search_type]").val()=="2") jQuery(".extra_field").hide(); else jQuery(".extra_field").show();">
+                <option value="0">--'.get_lang('Select').'--</option>
+                <option value="1"' . (($search_type=='1')?'selected="selected"':"") . '>--' . get_lang('User') .'--</option>
+                <option value="2"' . (($search_type=='2')?'selected="selected"':"") . '>--' . get_lang('Group') . '--</option>
+                </select>
+                '.$extra_fields.'
                 <button class="btn" type="submit" value="search">'.get_lang('Search').'</button>
-        </form>';
+        </form>
+        ';
     }
-
+    
     /**
      * Shows the user menu
      */
diff --git a/main/social/search.php b/main/social/search.php
index c403e5f227..1f0ee7633f 100755
--- a/main/social/search.php
+++ b/main/social/search.php
@@ -136,8 +136,17 @@ $this_section      = SECTION_SOCIAL;
 $tool_name         = get_lang('Search');
 $interbreadcrumb[] = array('url' => 'profile.php', 'name' => get_lang('SocialNetwork'));
 
-$query      = isset($_GET['q']) ? $_GET['q'] : null;
-$query_vars = array('q' => $query);
+$query = isset($_GET['q']) ? $_GET['q'] : null;
+$query_search_type = isset($_GET['search_type']) ? $_GET['search_type'] : null;
+$extra_fields = UserManager::get_extra_filtrable_fields();
+$query_extra_fields = array();
+$query_vars = array('q' => $query, 'search_type' => $query_search_type);
+foreach ($extra_fields as $extra_field) {
+    $field_name = 'field_'.$extra_field['variable'];
+    if (isset($_GET[$field_name])) {
+        $query_vars[$field_name]=$_GET[$field_name];
+    }
+}
 
 $social_avatar_block = SocialManager::show_social_avatar_block('search');
 $social_menu_block = SocialManager::show_social_menu('search');
@@ -145,22 +154,28 @@ $social_menu_block = SocialManager::show_social_menu('search');
 $social_right_content = '<div class="span9">'.UserManager::get_search_form($query).'</div>';
 
 // I'm searching something
-if ($query != '') {
+if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) {
 
     $itemPerPage = 9;
-    $page = isset($_GET['users_page_nr']) ? intval($_GET['users_page_nr']) : 1;
-    $totalUsers = UserManager::get_all_user_tags($_GET['q'], 0, 0, $itemPerPage, true);
-
-    $from = intval(($page - 1) * $itemPerPage);
-    // Get users from tags
-    $users  = UserManager::get_all_user_tags($_GET['q'], 0, $from, $itemPerPage);
+    $search_type = $_GET['search_type'];
+    
+    if ($search_type=='0' || $search_type=='1') {
+        $page = isset($_GET['users_page_nr']) ? intval($_GET['users_page_nr']) : 1;
+        $totalUsers = UserManager::get_all_user_tags($_GET['q'], 0, 0, $itemPerPage, true);
+
+        $from = intval(($page - 1) * $itemPerPage);
+        // Get users from tags
+        $users  = UserManager::get_all_user_tags($_GET['q'], 0, $from, $itemPerPage);
+    }
 
-    $pageGroup = isset($_GET['groups_page_nr']) ? intval($_GET['groups_page_nr']) : 1;
-    // Groups
-    $fromGroups = intval(($pageGroup - 1) * $itemPerPage);
+    if ($search_type=='0' || $search_type=='2') {
+        $pageGroup = isset($_GET['groups_page_nr']) ? intval($_GET['groups_page_nr']) : 1;
+        // Groups
+        $fromGroups = intval(($pageGroup - 1) * $itemPerPage);
 
-    $totalGroups = GroupPortalManager::get_all_group_tags($_GET['q'], 0, $itemPerPage, true);
-    $groups = GroupPortalManager::get_all_group_tags($_GET['q'], $fromGroups, $itemPerPage);
+        $totalGroups = GroupPortalManager::get_all_group_tags($_GET['q'], 0, $itemPerPage, true);
+        $groups = GroupPortalManager::get_all_group_tags($_GET['q'], $fromGroups, $itemPerPage);
+    }
 
     if (empty($users) && empty($groups)) {
         $social_right_content .= get_lang('SorryNoResults');