Changeset 1470 for trunk/workflow

Timestamp:

09/30/09 14:55:56 (15 years ago)

Author:

rodsouza

Message:

Ticket #638 - Permitir numeros e hifen como parâmetro da busca e ordenar o resultado (por grupo).

Location:

trunk/workflow/inc

Files:

• class.bo_userinterface.inc.php (modified) (2 diffs)
• class.so_userinterface.inc.php (modified) (1 diff)

trunk/workflow/inc/class.bo_userinterface.inc.php

@@ -917 +917 @@
         function searchEmployee($params)
         {
-                if (!ereg('^([[:alpha:] ]+)$', $params['searchTerm']))
+                if (!ereg('^([[:alnum:] -]+)$', $params['searchTerm']))
                         return array('error' => 'Parâmetro de busca inválido');
 
@@ -933 +933 @@
                         return array('error' => 'O sistema de busca não pode ser utilizado para sua organização');
 
-                usort($result['employees'], create_function('$a,$b', 'return strcasecmp($a[\'cn\'],$b[\'cn\']);'));
+                $sort_function = create_function('$a,$b', 'return strcasecmp($a[\'cn\'],$b[\'cn\']);');
+
+                usort($result['employees'], $sort_function );
+                usort($result['bygroup'], $sort_function );
+
                 return $result;
         }

trunk/workflow/inc/class.so_userinterface.inc.php

@@ -382 +382 @@
                         $ldapResult[$entries[$i]['uidnumber'][0]] = array('cn' => $entries[$i]['cn'][0], 'telephoneNumber' => $entries[$i]['telephonenumber'][0]);
 
-                /* check if any result was found */
-                //if (count($ldapResult) < 1)
-                //      return $output;
-
                 $uids = implode( ',', array_keys( $ldapResult ) );