SearchField patch TAKE 2...

[Marc Jauvin]

It seems the List does not accept attachments, so here is the file inline:


Index: addobject.php
===================================================================
RCS file: /cvs/horde/turba/addobject.php,v
retrieving revision 1.4
diff -r1.4 addobject.php
50a51
>                  $cfgSources[$source]['search_field'],
 
Index: addobjectaction.php
===================================================================
RCS file: /cvs/horde/turba/addobjectaction.php,v
retrieving revision 1.3
diff -r1.3 addobjectaction.php
26a27
>                            $cfgSources[$source]['search_field'],
 
Index: advanced.php
===================================================================
RCS file: /cvs/horde/turba/advanced.php,v
retrieving revision 1.12
diff -r1.12 advanced.php
45a46
>                            $cfgSources[$source]['search_field'],
 
Index: deleteobject.php
===================================================================
RCS file: /cvs/horde/turba/deleteobject.php,v
retrieving revision 1.2
diff -r1.2 deleteobject.php
26a27
>                            $cfgSources[$source]['search_field'],
 
Index: displayobject.php
===================================================================
RCS file: /cvs/horde/turba/displayobject.php,v
retrieving revision 1.7
diff -r1.7 displayobject.php
27a28
>                            $cfgSources[$source]['search_field'],
 
Index: editobject.php
===================================================================
RCS file: /cvs/horde/turba/editobject.php,v
retrieving revision 1.9
diff -r1.9 editobject.php
27a28
>                            $cfgSources[$source]['search_field'],

Index: editobjectaction.php
===================================================================
RCS file: /cvs/horde/turba/editobjectaction.php,v
retrieving revision 1.5
diff -r1.5 editobjectaction.php
26a27
>                            $cfgSources[$source]['search_field'],
 
Index: search.php
===================================================================
RCS file: /cvs/horde/turba/search.php,v
retrieving revision 1.42
diff -r1.42 search.php
55a56
>                                $cfgSources[$source]['search_field'],
 
Index: config/sources.php.dist
===================================================================
RCS file: /cvs/horde/turba/config/sources.php.dist,v
retrieving revision 1.18
diff -r1.18 sources.php.dist
22a23
>   'search_field' => 'name',
40a42
>   'search_field' => 'name',
57a60
>   'search_field' => 'name',
91a95
>   'search_field' => 'name',
 
Index: lib/Source.php
===================================================================
RCS file: /cvs/horde/turba/lib/Source.php,v
retrieving revision 1.30
diff -r1.30 Source.php
30a31,33
>     /** String containing the field name to use when searching. */
>     var $search_field;
>
58c61
<                           $public = false, $readonly = true)
---
>                           $search_field, $public = false, $readonly = true)
77a81,83
175a182
>                                 $state['search_field'],
 175a182
>                                 $state['search_field'],
 
Index: lib/api.php
===================================================================
RCS file: /cvs/horde/turba/lib/api.php,v
retrieving revision 1.7
diff -r1.7 api.php
29a30
>                                        $cfgSources[$source]['search_field'],
32a34,39
>           if(isset($cfgSources[$source]['search_field'])) {
>               $search_field = $cfgSources[$source]['search_field'];
>           } else {
>               $search_field = 'name';
>           }
>
34c41
<                 $res = $driver->search(array('name' => trim($name)), LASTNAME);
---
>                 $res = $driver->search(array($search_field => trim($name)),
LASTNAME);