[Phpgroupware-cvs] property/inc/custom/organize_drawing.php, 1.1.2.6

[nomail]

Update of /property/inc/custom
Modified Files:
        Branch: proposed-0_9_18-branch
          organize_drawing.php

date: 2004/11/08 09:57:44;  author: sigurdne;  state: Exp;  lines: +19 -5

Log Message:
no message
=====================================================================
Index: property/inc/custom/organize_drawing.php
diff -u property/inc/custom/organize_drawing.php:1.1.2.5 
property/inc/custom/organize_drawing.php:1.1.2.6
--- property/inc/custom/organize_drawing.php:1.1.2.5    Sun Nov  7 20:37:01 2004
+++ property/inc/custom/organize_drawing.php    Mon Nov  8 09:57:44 2004
@@ -60,7 +60,7 @@
 
                        if ($confirm)
                        {
-                               $this->receipt= $this->execute($dry_run,$cron);
+                               $this->execute($dry_run,$cron);
                        }
                        else
                        {
@@ -154,6 +154,20 @@
                                {
                                        
$this->confirm($execute=false,$done=True);
                                }
+
+                               $msgbox_data = 
$this->bocommon->msgbox_data($this->receipt);
+
+                               $insert_values= array(
+                                       $cron,
+                                       'organize_drawing',
+                                       implode(',',(array_keys($msgbox_data)))
+                                       );
+
+                               $insert_values  = 
$this->bocommon->validate_db_insert($insert_values);
+
+                               $sql = "INSERT INTO fm_cron_log 
(cron,process,message) "
+                                               . "VALUES ($insert_values)";
+                               $this->db->query($sql,__LINE__,__FILE__);
                        }
                }
 
@@ -275,7 +289,7 @@
                                $this->vfs->override_acl = 0;
                        }
 
-                       return $this->receipt;
+//                     return $this->receipt;
                }
 
                function copy_files($values)
@@ -340,17 +354,17 @@
                                                . 
"location_code,address,branch_id,vendor_id,user_id,loc1,loc2,loc3) "
                                                . "VALUES ($insert_values)";
 
-                                       unlink($from_file);
-
                                        
$this->db->query($sql,__LINE__,__FILE__);
 
+                                       unlink($from_file);
+
                                        
$this->receipt['message'][]=array('msg'=>lang('File %1 
copied!',$values['file_name']));
                                        
$this->receipt['message'][]=array('msg'=>lang('File %1 deleted!',$from_file));
                                }
                        }
 
                        $this->vfs->override_acl = 0;
-                       return $this->receipt;
+//                     return $this->receipt;
                }
 
                function get_address($loc1='',$loc2='',$loc3='')