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

[Sigurd Nes <address@hidden>]

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

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

Index: class.sodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodrawing.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sodrawing.inc.php     21 Apr 2003 20:47:11 -0000      1.3
--- class.sodrawing.inc.php     22 Apr 2003 09:06:54 -0000      1.4
***************
*** 20,23 ****
--- 20,26 ----
                        $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon',True);
                        $this->historylog       = 
CreateObject($this->currentapp.'.historylog','drawing');
+                       $this->vfs                      = 
CreateObject('phpgwapi.vfs');
+                       $this->rootdir          = $this->vfs->basedir;
+                       $this->fakebase         = $this->vfs->fakebase;
  
                        if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
***************
*** 256,260 ****
                        
$this->historylog->add('CO',$receipt['drawing_id'],$drawing['coordinator']);
  
!                       $receipt['message'][] = array('msg'=>lang('drawing %1 
has been saved',$drawing['drawing_id']));
                        return $receipt;
                }
--- 259,263 ----
                        
$this->historylog->add('CO',$receipt['drawing_id'],$drawing['coordinator']);
  
!                       $receipt['message'][] = array('msg'=>lang('drawing %1 
has been saved',"'".$drawing['drawing_name']."'"));
                        return $receipt;
                }
***************
*** 263,267 ****
                {
                        $this->db->query("SELECT status,category,coordinator 
FROM fm_drawing where id='" .$drawing['drawing_id']."'",__LINE__,__FILE__);
- 
                        $this->db->next_record();
  
--- 266,269 ----
***************
*** 277,285 ****
                                
$this->historylog->add('T',$drawing['drawing_id'],$drawing['cat_id']);
                        }
!                       if ($old_coordinator != $drawing['coordinator'])
                        {
                                
$this->historylog->add('C',$drawing['drawing_id'],$drawing['coordinator']);
                        }
  
                        if($drawing['street_number'])
                        {
--- 279,292 ----
                                
$this->historylog->add('T',$drawing['drawing_id'],$drawing['cat_id']);
                        }
!                       if ((int)$old_coordinator != 
(int)$drawing['coordinator'])
                        {
                                
$this->historylog->add('C',$drawing['drawing_id'],$drawing['coordinator']);
                        }
  
+                       if($drawing['drawing_name_orig'] && 
!$drawing['drawing_name'] )
+                       {
+                               $drawing['drawing_name'] = 
$drawing['drawing_name_orig'];
+                       }
+ 
                        if($drawing['street_number'])
                        {
***************
*** 314,318 ****
  
                        $receipt['drawing_id'] = $drawing['drawing_id'];
!                       $receipt['message'][] = array('msg'=>lang('drawing %1 
has been edited',$drawing['drawing_id']));
                        return $receipt;
  
--- 321,325 ----
  
                        $receipt['drawing_id'] = $drawing['drawing_id'];
!                       $receipt['message'][] = array('msg'=>lang('drawing %1 
has been edited',"'".$drawing['drawing_name']."'"));
                        return $receipt;
  
***************
*** 321,326 ****
                function delete($drawing_id )
                {
!                       $this->db->query("DELETE FROM fm_drawing WHERE id='" . 
$drawing_id . "'",__LINE__,__FILE__);
!                       $this->db->query("DELETE FROM fm_drawing_history  WHERE 
 history_record_id='" . $drawing_id   . "'",__LINE__,__FILE__);
                }
        }
--- 328,361 ----
                function delete($drawing_id )
                {
!                       $this->db->query("SELECT drawing_name FROM fm_drawing 
where id='$drawing_id'",__LINE__,__FILE__);
!                       $this->db->next_record();
!                       $drawing_name = $this->db->f('drawing_name');
! 
! //echo $this->fakebase. SEP . 'drawing'. SEP . $drawing_name;
!                       if($this->vfs->file_exists(array(
!                                       'string' => $this->fakebase. SEP . 
'drawing'. SEP . $drawing_name,
!                                       'relatives' => Array(RELATIVE_NONE)
!                               )))
!                       {
!                               $this->vfs->override_acl = 1;
! 
!                               if(!$this->vfs->rm (array(
!                                       'string' => $this->fakebase. SEP . 
'drawing'. SEP . $drawing_name,
!                                    'relatives' => array(
!                                         RELATIVE_NONE
!                                    )
!                               )))
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('failed to delete file') . ' :'. 
$this->fakebase. SEP . 'drawing'. SEP . $drawing_name);
!                               }
!                               else
!                               {
!                                       
$receipt['message'][]=array('msg'=>lang('file deleted') . ' :'. 
$this->fakebase. SEP . 'drawing'. SEP . $drawing_name);
!                               }
!                               $this->vfs->override_acl = 0;
!                       }
! 
!                       $this->db->query("DELETE FROM fm_drawing WHERE 
id='$drawing_id'",__LINE__,__FILE__);
!                       $this->db->query("DELETE FROM fm_drawing_history  WHERE 
 history_record_id='$drawing_id'",__LINE__,__FILE__);
                }
        }

Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uidrawing.inc.php     21 Apr 2003 20:47:11 -0000      1.3
--- class.uidrawing.inc.php     22 Apr 2003 09:06:54 -0000      1.4
***************
*** 30,36 ****
                function uidrawing()
                {
- 
-                       $this->vfs                                      = 
CreateObject('phpgwapi.vfs');
- 
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
--- 30,33 ----
***************
*** 43,46 ****
--- 40,46 ----
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon',True);
                        $this->config                           = 
CreateObject('phpgwapi.config',$this->currentapp);
+                       $this->vfs                                      = 
CreateObject('phpgwapi.vfs');
+                       $this->rootdir                          = 
$this->vfs->basedir;
+                       $this->fakebase                         = 
$this->vfs->fakebase;
  
                        $this->start                            = 
$this->bo->start;
***************
*** 238,243 ****
                function create_home_dir()
                {
-                       $this->rootdir = $this->vfs->basedir;
-                       $this->fakebase = $this->vfs->fakebase;
  
  /* echo $this->vfs->file_exists(array(
--- 238,241 ----