Changeset 6459 for trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

Timestamp:

06/11/12 18:05:43 (12 years ago)

Author:

cristiano

Message:

Ticket #2765 - Aviso de ferias de destinatarios na criacao de mensagens, conforme filtro fora de escritorio

File:

• trunk/expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -436 +436 @@
                 $ldapService->connection = $this->ds;
                 $campos_extras = '';
-                $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou");
+                $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou","vacationActive","vacationInfo");
                 foreach($searchable_fields as $fields_ldap => $value_field)
                 {   
@@ -473 +473 @@
                                         $this->ldapConnect(true,$i);
                                         $filter="(|(cn=*$search_for*)(mail=*$search_for*))";
-                                        $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou");
+                                        $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou","vacationActive","vacationInfo"); 
                                         $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result+1);
                                         if(!$sr)
@@ -496 +496 @@
                                 
                         $info_return['search_for'] = $params['search_for'];
-            return $info_return;
+            return $this->toISO8859($info_return); 
         } 
         
+    /*Converte um parametro de UTF-8 para ISO8859*/ 
+    function toISO8859($data) 
+    { 
+        if(!is_array($data)) 
+          return mb_convert_encoding( $data , 'ISO-8859-1' , 'UTF-8 , ISO-8859-1' ); 
+        $return = array(); 
+        foreach ($data as $i => $v) 
+          $return[$this->toISO8859($i)] = $this->toISO8859($v); 
+        return $return; 
+    } 
+
         function make_quicksearch_card($info, $cn)
         {