[Phpgroupware-cvs] ged/inc class.ged_dm.inc.php

[Pascal Vilarem]

CVSROOT:        /sources/phpgroupware
Module name:    ged
Changes by:     Pascal Vilarem <maat>   07/04/10 10:03:04

Modified files:
        inc            : class.ged_dm.inc.php 

Log message:
        keep project info when adding a file or a folder

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25

Patches:
Index: class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.ged_dm.inc.php        10 Apr 2007 09:41:09 -0000      1.24
+++ class.ged_dm.inc.php        10 Apr 2007 10:03:04 -0000      1.25
@@ -121,6 +121,8 @@
 
                $extension=$this->get_file_extention($basename);
 
+               $parent=$this->get_element_info($new_file['parent_id']);
+
                $i=0;
 
                while (file_exists($this->datadir."/".$candidate_name))
@@ -148,10 +150,10 @@
                if ($download_result=='OK')
                {
                        // DONE : ADD 'validity_period'
-                       $sql_model="INSERT INTO %s ( type, parent_id, name, 
reference, description, owner_id, creator_id, creation_date, doc_type, 
validity_period  ) VALUES ";
-                       $sql_model.=" ( '%s', %d, '%s', '%s', '%s', %d, %d, %d, 
'%s', %d ) ";
+                       $sql_model="INSERT INTO %s ( type, parent_id, name, 
reference, description, owner_id, creator_id, creation_date, doc_type, 
validity_period, project_name, project_root) VALUES ";
+                       $sql_model.=" ( '%s', %d, '%s', '%s', '%s', %d, %d, %d, 
'%s', %d, '%s', %d ) ";
 
-                       $sql=sprintf($sql_model, $this->tables['elements'], 
'file', $new_file['parent_id'], $new_file['name'], $new_file['reference'], 
$new_file['description'], $GLOBALS['phpgw_info']['user']['account_id'], 
$GLOBALS['phpgw_info']['user']['account_id'], time(), $new_file['doc_type'], 
$new_file['validity_period']);
+                       $sql=sprintf($sql_model, $this->tables['elements'], 
'file', $new_file['parent_id'], $new_file['name'], $new_file['reference'], 
$new_file['description'], $GLOBALS['phpgw_info']['user']['account_id'], 
$GLOBALS['phpgw_info']['user']['account_id'], time(), $new_file['doc_type'], 
$new_file['validity_period'],$parent['project_name'],$parent['project_root']);
 
                        // DONE gestion des slashes !
                        //print ($sql);
@@ -568,10 +570,12 @@
 
        function add_folder($new_folder)
        {
-               $sql_model="INSERT INTO %s ( type, parent_id, name, reference, 
description, owner_id, creator_id, creation_date ) VALUES ";
-               $sql_model.=" ( '%s', %d, '%s', '%s', '%s', %d, %d, %d) ";
+               $parent=$this->get_element_info($new_folder['parent_id']);
+               
+               $sql_model="INSERT INTO %s ( type, parent_id, name, reference, 
description, owner_id, creator_id, creation_date, project_name, project_root  ) 
VALUES ";
+               $sql_model.=" ( '%s', %d, '%s', '%s', '%s', %d, %d, %d, '%s', 
%d) ";
 
-               $sql=sprintf($sql_model, $this->tables['elements'], 'folder', 
$new_folder['parent_id'], $new_folder['name'], $new_folder['referenceq'], 
$new_folder['description'], $GLOBALS['phpgw_info']['user']['account_id'], 
$GLOBALS['phpgw_info']['user']['account_id'], time());
+               $sql=sprintf($sql_model, $this->tables['elements'], 'folder', 
$new_folder['parent_id'], $new_folder['name'], $new_folder['referenceq'], 
$new_folder['description'], $GLOBALS['phpgw_info']['user']['account_id'], 
$GLOBALS['phpgw_info']['user']['account_id'], 
time(),$parent['project_name'],$parent['project_root']);
 
                //print ($sql);