Changeset 3019 for branches/2.2/phpgwapi/inc

Timestamp:

07/08/10 18:18:58 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Corrigindo CSS e adicionando filemanager

File:

• branches/2.2/phpgwapi/inc/class.vfs_sql.inc.php (modified) (6 diffs)

branches/2.2/phpgwapi/inc/class.vfs_sql.inc.php

@@ -833 +833 @@
                                 return False;
                         }
-                        session_write_close();
+                                //avoid stuck request
+                                session_write_close();
+
+                                //reset time limit for big files
+                                set_time_limit(0);
+
+                                ob_end_flush();
+
                                 if ($fp = fopen ($p->real_full_path, 'rb'))
                                 {
@@ -840 +847 @@
                                                 echo fread($fp, $i);
                                                 flush();
-                                                usleep(50);
                                         }
                                         fclose ($fp);
@@ -1344 +1350 @@
                                                         'relatives'     => array ($t->mask),
                                                         'attributes'    => $set_attributes_array
-                                                )
+                                                ),
+                                                true
                                         );
                                         if (!(strpos(strtoupper($record['mime_type']),'IMAGE') === FALSE))
@@ -2109 +2116 @@
                  * See vfs_shared
                  */
-                function set_attributes ($data)
+                function set_attributes ($data,$isNewFile = false)
                 {
                         if (!is_array ($data))
@@ -2133 +2140 @@
                            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 +2161 @@
                                 return False;
                         }
+
 
                         if (!$this->file_exists (array(