[Phpgroupware-cvs] CVS: property/inc class.bodrawing.inc.php,1.2,1.3 class.sodrawing.inc.php,1.2,1.3 class.uidrawing.inc.php,1.2,1.3

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.bodrawing.inc.php class.sodrawing.inc.php 
        class.uidrawing.inc.php 
Log Message:
no message

Index: class.bodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bodrawing.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bodrawing.inc.php     21 Apr 2003 09:23:35 -0000      1.2
--- class.bodrawing.inc.php     21 Apr 2003 20:47:11 -0000      1.3
***************
*** 304,313 ****
                        
$values['location_code']=$this->bocommon->location_code($values['property_id'],$values['building_id'],$values['entrance_id'],$values['apartment_id']);
  
! _debug_array($values);
                        if ($values['drawing_id'])
                        {
                                if ($values['drawing_id'] != 0)
                                {
! //                                    $receipt = $this->so->edit($values);
                                }
                        }
--- 304,313 ----
                        
$values['location_code']=$this->bocommon->location_code($values['property_id'],$values['building_id'],$values['entrance_id'],$values['apartment_id']);
  
! //_debug_array($values);
                        if ($values['drawing_id'])
                        {
                                if ($values['drawing_id'] != 0)
                                {
!                                       $receipt = $this->so->edit($values);
                                }
                        }

Index: class.sodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodrawing.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sodrawing.inc.php     21 Apr 2003 09:23:35 -0000      1.2
--- class.sodrawing.inc.php     21 Apr 2003 20:47:11 -0000      1.3
***************
*** 189,203 ****
                                $drawing['drawing_id']                  = 
$this->db->f('id');
                                $drawing['title']                               
= $this->db->f('title');
!                               $drawing['name']                                
= $this->db->f('name');
                                $drawing['equipment_id']                = 
$this->db->f('equipment_id');
                                $drawing['location_code']               = 
$this->db->f('location_code');
                                $drawing['branch_id']                   = 
$this->db->f('branch_id');
                                $drawing['version']                             
= $this->db->f('version');
!                               $drawing['vendor_id']           = 
$this->db->f('vendor_id');
!                               $drawing['floor_id']            = 
$this->db->f('floor_id');
                                $drawing['charge_tenant']               = 
$this->db->f('charge_tenant');
                                $drawing['descr']                               
= $this->db->f('descr');
                                $drawing['status']                              
= $this->db->f('status');
-                               $drawing['budget']                              
= (int)$this->db->f('budget');
                                $drawing['actual_cost']                 = 
$this->db->f('actual_cost');
                                $drawing['tenant_id']                   = 
$this->db->f('tenant_id');
--- 189,202 ----
                                $drawing['drawing_id']                  = 
$this->db->f('id');
                                $drawing['title']                               
= $this->db->f('title');
!                               $drawing['drawing_name']                = 
$this->db->f('drawing_name');
                                $drawing['equipment_id']                = 
$this->db->f('equipment_id');
                                $drawing['location_code']               = 
$this->db->f('location_code');
                                $drawing['branch_id']                   = 
$this->db->f('branch_id');
                                $drawing['version']                             
= $this->db->f('version');
!                               $drawing['vendor_id']                   = 
$this->db->f('vendor_id');
!                               $drawing['floor_id']                    = 
$this->db->f('floor_id');
                                $drawing['charge_tenant']               = 
$this->db->f('charge_tenant');
                                $drawing['descr']                               
= $this->db->f('descr');
                                $drawing['status']                              
= $this->db->f('status');
                                $drawing['actual_cost']                 = 
$this->db->f('actual_cost');
                                $drawing['tenant_id']                   = 
$this->db->f('tenant_id');
***************
*** 205,210 ****
                                $drawing['coordinator']                 = 
$this->db->f('coordinator');
                                $drawing['access']                              
= $this->db->f('access');
!                               $drawing['start_date']                  = 
$this->db->f('start_date');
!                               $drawing['end_date']                    = 
$this->db->f('end_date');
                                $drawing['cat_id']                              
= $this->db->f('category');
  
--- 204,208 ----
                                $drawing['coordinator']                 = 
$this->db->f('coordinator');
                                $drawing['access']                              
= $this->db->f('access');
!                               $drawing['drawing_date']                = 
$this->db->f('drawing_date');
                                $drawing['cat_id']                              
= $this->db->f('category');
  
***************
*** 305,309 ****
                                category                ='" . 
$drawing['cat_id'] . "',
                                drawing_date    ='" . $drawing['drawing_date'] 
. "',
-                               end_date                ='" . 
$drawing['end_date'] . "',
                                coordinator             ='" . 
$drawing['coordinator'] . "',
                                descr                   ='" . $drawing['descr'] 
. "',
--- 303,306 ----
***************
*** 316,320 ****
                                . "' WHERE id= '" . $drawing['drawing_id'] 
."'",__LINE__,__FILE__);
  
! 
                        $receipt['message'][] = array('msg'=>lang('drawing %1 
has been edited',$drawing['drawing_id']));
                        return $receipt;
--- 313,317 ----
                                . "' WHERE id= '" . $drawing['drawing_id'] 
."'",__LINE__,__FILE__);
  
!                       $receipt['drawing_id'] = $drawing['drawing_id'];
                        $receipt['message'][] = array('msg'=>lang('drawing %1 
has been edited',$drawing['drawing_id']));
                        return $receipt;

Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uidrawing.inc.php     21 Apr 2003 09:23:35 -0000      1.2
--- class.uidrawing.inc.php     21 Apr 2003 20:47:11 -0000      1.3
***************
*** 275,278 ****
--- 275,280 ----
                {
                        $drawing_id             = 
get_var('drawing_id',array('POST','GET'));
+       //      $_FILES = $GLOBALS['HTTP_POST_FILES'];
+ 
                        $values                         = 
get_var('values',array('POST'));
  
***************
*** 281,285 ****
                        $this->create_home_dir();
  
- 
                        if($values)
                        {
--- 283,286 ----
***************
*** 298,302 ****
                                        $values=$values + $location_data;
                                }
- 
                        }
  
--- 299,302 ----
***************
*** 320,331 ****
                                }
  
- 
                                $values['drawing_id'] = $drawing_id;
  
                                if(!$receipt['error'])
                                {
                                        $receipt = $this->bo->save($values);
  
                                        $drawing_id=$receipt['drawing_id'];
                                }
                        }
--- 320,338 ----
                                }
  
                                $values['drawing_id'] = $drawing_id;
  
                                if(!$receipt['error'])
                                {
+                                       
$values['drawing_name']=$_FILES['drawing_file']['name'];
+ 
+                                       $this->vfs->cp (array (
+                                               'from'  => 
$_FILES['drawing_file']['tmp_name'],
+                                               'to'    => $this->fakebase. SEP 
. 'drawing' . SEP . $values['drawing_name'],
+                                               'relatives'     => array 
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)));
+ 
                                        $receipt = $this->bo->save($values);
  
                                        $drawing_id=$receipt['drawing_id'];
+ //_debug_array($receipt);
                                }
                        }
***************
*** 423,426 ****
--- 430,435 ----
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
+ 
+                               'lang_update_file'                              
=> lang('Update file'),
  
                                'lang_drawing_id'                               
=> lang('Drawing ID'),