[Phpgroupware-cvs] property/inc/class.uilookup.inc.php, 1.6

[nomail]

Update of /property/inc
Modified Files:
        Branch: 
          class.uilookup.inc.php

date: 2004/10/23 22:11:00;  author: sigurdne;  state: Exp;  lines: +16 -16

Log Message:
no message
=====================================================================
Index: property/inc/class.uilookup.inc.php
diff -u property/inc/class.uilookup.inc.php:1.5 
property/inc/class.uilookup.inc.php:1.6
--- property/inc/class.uilookup.inc.php:1.5     Sat Oct 23 08:55:46 2004
+++ property/inc/class.uilookup.inc.php Sat Oct 23 22:11:00 2004
@@ -43,7 +43,7 @@
 
                function uilookup()
                {
-                       $GLOBALS['phpgw_info']['flags']['noframework'];
+                       $GLOBALS['phpgw_info']['flags']['noframework'] = True;
                        $GLOBALS['phpgw_info']['flags']['headonly']=true;
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -105,10 +105,10 @@
                        {
                                $content[] = array
                                (
-                                       'id'                            => 
$addressbook_entry['id'],
-                                       'vendor_name'           => 
$addressbook_entry['org_name'],
+                                       'id'                            => 
$addressbook_entry['contact_id'],
+                                       'contact_name'          => 
$addressbook_entry['per_last_name'] . ', ' . 
$addressbook_entry['per_first_name'],
                                        'lang_select'           => 
lang('Select'),
-                                       'lang_select_statustext' => 
lang('Select this vendor')
+                                       'lang_select_statustext' => 
lang('Select this contact')
                                );
                        }
 
@@ -117,7 +117,7 @@
                                'sort_name'     => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
                                                                                
        'sort'  => $this->sort,
-                                                                               
        'var'   =>      'org_name',
+                                                                               
        'var'   =>      'last_name',
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
                                                                                
                                                        'cat_id'        => 
$this->cat_id,
@@ -127,7 +127,7 @@
                                'sort_id'       => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
                                                                                
        'sort'  => $this->sort,
-                                                                               
        'var'   =>      'id',
+                                                                               
        'var'   =>      'person_id',
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
                                                                                
                                                        'cat_id'        
=>$this->cat_id,
@@ -158,12 +158,12 @@
                        if($column)
                        {
                                $contact_id     =$column;
-                               $org_name       =$column . '_org_name';
+                               $contact_name   =$column . '_name';
                        }
                        else
                        {
-                               $contact_id     ='vendor_id';
-                               $org_name       ='vendor_name';
+                               $contact_id     ='contact_id';
+                               $contact_name   ='contact_name';
                        }
 
                        $cat_data       = 
$this->cats->formatted_xslt_list(array('selected' => $this->cat_id,'globals' => 
True, 'link_data' =>$link_select));
@@ -187,18 +187,18 @@
                                'lang_searchbutton_statustext'  => lang('Submit 
the search string'),
                                'query'                                         
        => $this->query,
                                'lang_search'                                   
=> lang('search'),
-                               'table_header_addressbook'              => 
$table_header,
-                               'values_addressbook'                    => 
$content,
+                               'table_header_contact'                  => 
$table_header,
+                               'values_contact'                                
=> $content,
                                'table_done'                                    
=> $table_done,
                                'contact_id'                                    
=> $contact_id,
-                               'org_name'                                      
        => $org_name
+                               'contact_name'                                  
=> $contact_name
                        );
 
                        $appname                                                
= lang('addressbook');
                        $function_msg                                   = 
lang('list vendors');
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_addressbook' => $data));
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_contact' => $data));
                        $GLOBALS['phpgw']->xslttpl->pp();
                        $this->save_sessiondata();
                }
@@ -314,8 +314,8 @@
                                'lang_searchbutton_statustext'  => lang('Submit 
the search string'),
                                'query'                                         
        => $this->query,
                                'lang_search'                                   
=> lang('search'),
-                               'table_header_addressbook'              => 
$table_header,
-                               'values_addressbook'                    => 
$content,
+                               'table_header_vendor'                   => 
$table_header,
+                               'values_vendor'                                 
=> $content,
                                'table_done'                                    
=> $table_done,
                                'contact_id'                                    
=> $contact_id,
                                'org_name'                                      
        => $org_name
@@ -325,7 +325,7 @@
                        $function_msg                                   = 
lang('list vendors');
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_addressbook' => $data));
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_vendor' => $data));
                        $GLOBALS['phpgw']->xslttpl->pp();
                        $this->save_sessiondata();
                }