Changeset 3167 for branches/2.2/workflow/inc/class.bo_utils.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.bo_utils.inc.php (modified) (7 diffs)

branches/2.2/workflow/inc/class.bo_utils.inc.php

@@ -11 +11 @@
 
 require_once 'class.bo_ajaxinterface.inc.php';
-require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php';
-require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php';
 
 /**
@@ -34 +32 @@
         {
                 parent::bo_ajaxinterface();
-                $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso();
+                $this->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso();
         }
 
@@ -66 +64 @@
          */
         function search_ldap_users_by_cn($params)
-        {
+        { 
                 // parâmetro a ser procurado no ldap
                 $cn = trim(ereg_replace(' +', ' ', $params['cn']));
@@ -88 +86 @@
                         $ret_name = empty($params['name']) ? 'cn' : $params['name'];
 
-                        $ajaxConfig = new ajax_config('contactcenter');
+                        $ret_complement = empty($params['complement']) ? '' : $params['complement'];
+
+                        $ajaxConfig = &Factory::newInstance('ajax_config', 'contactcenter');
                         $config = $ajaxConfig->read_repository();
 
@@ -105 +105 @@
 
                                 $filter     = '(&(uid=*)(phpgwAccountType=u)(!(phpgwAccountVisible=-1))(cn=*' . $cn . '*))';
-                                $attrib_ret = array('cn', $ret_id, $ret_name);
+
+                                if($ret_complement != '')
+                                        $attrib_ret = array('cn', $ret_id, $ret_name, $ret_complement);
+                                else
+                                        $attrib_ret = array('cn', $ret_id, $ret_name);
 
                                 $r = ldap_search($ds, $ldapconfig['basedn'], $filter, $attrib_ret, 0, 0, 5);
@@ -114 +118 @@
                                         }
                                         elseif(ldap_count_entries($ds, $r) < 200){
+
                                                 $result = ldap_get_entries($ds, $r);
-                                                foreach($result as $value){
-                                                        $output['values'][] = array(
-                                                                'id'   => $value[$ret_id],
-                                                                'name' => trim(ucwords(strtolower($value[$ret_name][0]))));
+
+                                                foreach($result as $value){ 
+                                                        if( ($value[$ret_name][0] != '') && ($value[$ret_complement][0] != '') ){
+                                                                        $complement = " >> " . $value[$ret_complement][0];
+                                                                        $output['values'][] = array(
+                                                                                                                                 'id'   => $value[$ret_id],
+                                                                                                                                 'name' => trim(ucwords(strtolower($value[$ret_name][0]))) . $complement
+                                                                                                                           ); 
+
+                                                        }
+                                                elseif($value[$ret_name][0] != ''){
+                                                                $output['values'][] = array(
+                                                                                                                         'id'   => $value[$ret_id],
+                                                                                                                         'name' => trim(ucwords(strtolower($value[$ret_name][0])))
+                                                                                                                   ); 
+                                                        }
+                                                else{
+                                                                $output['values'][] = array(
+                                                                                                                         'id'   => '',
+                                                                                                                         'name' => "-- Selecione uma Opção --"
+                                                                                                                   ); 
+                                                        }
+
                                                 }
-
 
                                                 foreach ($output['values'] as $key => $value){
@@ -142 +165 @@
                 else{
                         $output['msg'] = 'Não digite caracteres especiais nem números. Apenas letras e espaços são permitidos.';
-                }
+                } 
                 return $output;
         }