Changeset 2883

Timestamp:

05/31/10 11:50:36 (14 years ago)

Author:

amuller

Message:

Ticket #1094 - corrige problema de pasta vazia

Location:

trunk

Files:

• filemanager/inc/class.uifilemanager.inc.php (modified) (3 diffs)
• phpgwapi/inc/class.vfs_sql.inc.php (modified) (1 diff)

trunk/filemanager/inc/class.uifilemanager.inc.php

@@ -488 +488 @@
                         $owner_id = $this->bo->vfs->ownerOf($this->bo->fakebase,$path[2]);
                         $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
+
                         if ($owner_id == $user_id)
                         {
@@ -504 +505 @@
                         // change dir to this->path
                         $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
+
                         $return['permissions'] = $this->get_permissions();
                         $return['quota']['usedSpace'] = $this->bo->vfs->get_size(array(
                                         'string'        => $this->path,
                                         'relatives'     => array(RELATIVE_NONE)
-                        ));
+                                ));
+
                         $return['files_count'] = $this->bo->vfs->count_files(array(
                                         'string'        => $this->path,
@@ -526 +529 @@
                                         continue;
                                 }
+                                if ($files['size'] == "" && $files['name'] == "")
+                                        continue;
                                 /* small keys to safe bandwidth */
                                 $tuple['name'] = $files['name'];

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

@@ -791 +791 @@
                 }
                 function ownerOf($base,$path){
-                        $query = $GLOBALS['phpgw']->db->query ("SELECT owner_id FROM phpgw_vfs WHERE directory='".
-                        $GLOBALS['phpgw']->db->db_addslashes($base)."' AND name='".
-                        $GLOBALS['phpgw']->db->db_addslashes($path)."' ".$this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__, __FILE__);
+                        $query = $GLOBALS['phpgw']->db->query ("SELECT owner_id FROM phpgw_vfs WHERE ".
+                                "( directory='".$GLOBALS['phpgw']->db->db_addslashes($base)."' AND name='".$GLOBALS['phpgw']->db->db_addslashes($path)."' ".
+                                "OR directory='/home/".$GLOBALS['phpgw']->db->db_addslashes($path)."') ".
+                                $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__, __FILE__);
+
                         $GLOBALS['phpgw']->db->next_record();
                         $owner_id = $GLOBALS['phpgw']->db->Record['owner_id'];