From c0da860b7f59d5d89e0144d27ddfded2049e88d9 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 2 Jun 2016 12:22:35 +0200
Subject: [PATCH] Fix PHP warning (from chamilo-awx)

---
 main/admin/add_users_to_usergroup.php |  2 +-
 main/inc/lib/usermanager.lib.php      | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php
index 22367ed007..4998fe451c 100755
--- a/main/admin/add_users_to_usergroup.php
+++ b/main/admin/add_users_to_usergroup.php
@@ -177,7 +177,7 @@ if ($use_extra_fields) {
     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]);
+                $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]);
             }
         }
     } else {
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index cee9e630f7..53684dae15 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -2269,24 +2269,28 @@ class UserManager
     }
 
     /** Get extra user data by value
-     * @param string the internal variable name of the field
-     * @param string the internal value of the field
+     * @param string $field_variable the internal variable name of the field
+     * @param string $field_value the internal value of the field
+     * @param bool $all_visibility
+     *
      * @return array with extra data info of a user i.e array('field_variable'=>'value');
      */
-    public static function get_extra_user_data_by_value($field_variable, $field_value)
+     public static function get_extra_user_data_by_value($field_variable, $field_value, $all_visibility = true)
     {
         $extraField = new ExtraFieldValue('user');
 
-        $data = $extraField->get_item_id_from_field_variable_and_field_value(
+        $data = $extraField->get_values_by_handler_and_field_variable(
             $field_variable,
             $field_value,
-            true
+            null,
+            true,
+            intval($all_visibility)
         );
 
         $result = [];
         if (!empty($data)) {
             foreach ($data as $data) {
-                $result[] = $data;
+                $result[] = $data['item_id'];
             }
         }
 
@@ -3586,7 +3590,7 @@ class UserManager
         if (is_array($extraFields) && count($extraFields)>0 ) {
             foreach ($extraFields as $extraField) {
                 $varName = 'field_'.$extraField['variable'];
-                //if (UserManager::is_extra_field_available($extraField['variable'])) {
+                if (UserManager::is_extra_field_available($extraField['variable'])) {
                     if (isset($_GET[$varName]) && $_GET[$varName]!='0') {
                         $useExtraFields = true;
                         $extraFieldResult[]= UserManager::get_extra_user_data_by_value(
@@ -3594,7 +3598,7 @@ class UserManager
                             $_GET[$varName]
                         );
                     }
-                //}
+                }
             }
         }