[Phpgroupware-cvs] property/inc class.soentity.inc.php, 1.8, 1.9 class.uientity.inc.php, 1.7, 1.8 class.boentity.inc.php, 1.5, 1.6 class.uilookup.inc.php, 1.31, 1.32

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv13646/inc

Modified Files:
        class.soentity.inc.php class.uientity.inc.php 
        class.boentity.inc.php class.uilookup.inc.php 
Log Message:
no message

Index: class.soentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.soentity.inc.php      29 Oct 2003 20:46:14 -0000      1.8
--- class.soentity.inc.php      30 Oct 2003 15:21:57 -0000      1.9
***************
*** 161,165 ****
                        else
                        {
!                       return;
                        }
  
--- 161,165 ----
                        else
                        {
!                               return;
                        }
  
***************
*** 260,263 ****
--- 260,270 ----
                                                
$entity_list[$j][$cols_return_extra[$i]['name']] = $this->db2->f('value');
                                        }
+                                       
elseif($cols_return_extra[$i]['datatype']=='AB' && $value):
+                                       {
+                                               $sql="SELECT org_name FROM 
phpgw_addressbook where id=$value";
+                                               $this->db2->query($sql);
+                                               $this->db2->next_record();
+                                               
$entity_list[$j][$cols_return_extra[$i]['name']] = $this->db2->f('org_name');
+                                       }
                                        
elseif($cols_return_extra[$i]['datatype']=='CH' && $value):
                                        {
***************
*** 320,325 ****
                                        'attrib_id'             => 
$this->db->f('id'),
                                        'name'                  => 
$this->db->f('column_name'),
!                                       'input_text'    => 
$this->db->f('input_text'),
!                                       'statustext'    => 
$this->db->f('statustext'),
                                        'datatype'              => 
$this->db->f('datatype')
                                );
--- 327,333 ----
                                        'attrib_id'             => 
$this->db->f('id'),
                                        'name'                  => 
$this->db->f('column_name'),
!                                       'input_text'    => 
stripslashes($this->db->f('input_text')),
!                                       'statustext'    => 
stripslashes($this->db->f('statustext')),
! //                                    'statustext'    => str_replace("\n"," 
",stripslashes($this->db->f('statustext'))),
                                        'datatype'              => 
$this->db->f('datatype')
                                );

Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** class.uilookup.inc.php      29 Oct 2003 20:46:14 -0000      1.31
--- class.uilookup.inc.php      30 Oct 2003 15:21:58 -0000      1.32
***************
*** 109,113 ****
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
!                                                                               
                                                        'cat_id'        
=>$this->cat_id)
                                                                                
)),
                                'lang_name'             => lang('Name'),
--- 109,114 ----
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
!                                                                               
                                                        'cat_id'        => 
$this->cat_id,
!                                                                               
                                                        'column'        => 
$column)
                                                                                
)),
                                'lang_name'             => lang('Name'),
***************
*** 118,122 ****
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
!                                                                               
                                                        'cat_id'        
=>$this->cat_id)
                                                                                
)),
                                'lang_id'               => lang('ID'),
--- 119,124 ----
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.addressbook',
!                                                                               
                                                        'cat_id'        
=>$this->cat_id,
!                                                                               
                                                        'column'        => 
$column)
                                                                                
)),
                                'lang_id'               => lang('ID'),
***************
*** 138,142 ****
                                'cat_id'                        => 
$this->cat_id,
                                'query'                         => $this->query,
!                               'filter'                        => $this->filter
                        );
  
--- 140,145 ----
                                'cat_id'                        => 
$this->cat_id,
                                'query'                         => $this->query,
!                               'filter'                        => 
$this->filter,
!                               'column'                        => $column
                        );
  

Index: class.boentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.boentity.inc.php      29 Oct 2003 20:46:14 -0000      1.5
--- class.boentity.inc.php      30 Oct 2003 15:21:58 -0000      1.6
***************
*** 252,256 ****
                        for ($i=0;$i<count($entity);$i++)
                        {
!                               
$location_data=$this->solocation->read_single($entity[$i]['location_code']);
                                for ($j=0;$j<count($cols_extra);$j++)
                                {
--- 252,256 ----
                        for ($i=0;$i<count($entity);$i++)
                        {
! //                            
$location_data=$this->solocation->read_single($entity[$i]['location_code']);
                                for ($j=0;$j<count($cols_extra);$j++)
                                {

Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.uientity.inc.php      29 Oct 2003 20:46:14 -0000      1.7
--- class.uientity.inc.php      30 Oct 2003 15:21:58 -0000      1.8
***************
*** 494,498 ****
                        for ($j=0;$j<count($insert_record_entity);$j++)
                        {
!                               $insert_record['extra'][]       = 
$insert_record_entity[$j];
                        }
  
--- 494,498 ----
                        for ($j=0;$j<count($insert_record_entity);$j++)
                        {
!                               
$insert_record['extra'][$insert_record_entity[$j]]      = True;
                        }