Changeset 2090

Timestamp:

03/01/10 09:02:33 (14 years ago)

Author:

amuller

Message:

Ticket #930 - Correção do problema adicionando uma flag no método

File:

• trunk/phpgwapi/inc/class.vfs_sql.inc.php (modified) (4 diffs)

trunk/phpgwapi/inc/class.vfs_sql.inc.php

@@ -1344 +1344 @@
                                                         'relatives'     => array ($t->mask),
                                                         'attributes'    => $set_attributes_array
-                                                )
+                                                ),
+                                                true
                                         );
                                         if (!(strpos(strtoupper($record['mime_type']),'IMAGE') === FALSE))
@@ -2109 +2110 @@
                  * See vfs_shared
                  */
-                function set_attributes ($data)
+                function set_attributes ($data,$isNewFile = false)
                 {
                         if (!is_array ($data))
@@ -2133 +2134 @@
                            This is kind of trivial, given that set_attributes () can change owner_id,
                            size, etc.
-                        */
-                        if (!$this->acl_check (array(
-                                        'string'        => $p->fake_full_path,
+                         */
+                        if($isNewFile)
+                        {
+                                if ( !$this->acl_check (array(
+                                        'string'        => $p->fake_full_path,
+                                        'relatives'     => array ($p->mask),
+                                        'operation'     => PHPGW_ACL_ADD
+                                ))
+                                )
+                                {
+                                        return False;
+                                }
+                        }elseif (!$this->acl_check (array(
+                                'string'        => $p->fake_full_path,
                                         'relatives'     => array ($p->mask),
                                         'operation'     => PHPGW_ACL_EDIT
@@ -2143 +2155 @@
                                 return False;
                         }
+
 
                         if (!$this->file_exists (array(