Changeset 1535

Timestamp:

10/28/09 10:05:59 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhorias no filemanager com correção de bugs

Files:

• sandbox/filemanager/inc/class.uifilemanager.inc.php (modified) (3 diffs)
• trunk/phpgwapi/inc/class.vfs_sql.inc.php (modified) (4 diffs)

sandbox/filemanager/inc/class.uifilemanager.inc.php

@@ -1628 +1628 @@
 
                                 if(!in_array($mime_type,$viewable)){
-                                        echo lang('Inpossbile to edit this file');
+                                        echo lang('Impossbile to edit this file');
                                         return False;
                                 }
@@ -1673 +1673 @@
                                 else
                                 {
+                                        echo lang('Could not save %1', $this->path.'/'.$this->edit_file);
                                         $this->messages[]=lang('Could not save %1', $this->path.'/'.$this->edit_file);
                                 }
@@ -1787 +1788 @@
                                 $ls_array = $this->bo->vfs->ls(array(
                                         'string'        => $this->path.'/'.$this->file,//FIXME
-                                        'relatives'     => array(RELATIVE_ALL),
+                                        'relatives'     => array(RELATIVE_NONE),
                                         'checksubdirs'  => False,
                                         'nofiles'       => True

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

@@ -873 +873 @@
                                 $acl_operation = PHPGW_ACL_ADD;
                         }
-
+                        // In your dir you can do anything you want
+                        $path = explode('/',$p->fake_full_path);
                         if (!$this->acl_check (array(
-                                        'string'        => $p->fake_full_path,
+                                        'string'        => '/'.$path[1].'/'.$path[2],
                                         'relatives'     => array ($p->mask),
                                         'operation'     => $acl_operation
@@ -1364 +1365 @@
                                 )
                         );
-
+                        // In your dir you can do anything you want
+                        $path = explode('/',$t->fake_full_path);
                         if (!$this->acl_check (array(
-                                        'string'        => $f->fake_full_path,
+                                        'string'        => '/'.$path[1].'/'.$path[2],
                                         'relatives'     => array ($f->mask),
                                         'operation'     => PHPGW_ACL_READ
                                 ))
                                 || !$this->acl_check (array(
-                                        'string'        => $f->fake_full_path,
+                                        'string'        => '/'.$path[1].'/'.$path[2],
                                         'relatives'     => array ($f->mask),
                                         'operation'     => PHPGW_ACL_DELETE
@@ -1381 +1383 @@
 
                         if (!$this->acl_check (array(
-                                        'string'        => $t->fake_full_path,
+                                        'string'        => '/'.$path[1].'/'.$path[2],
                                         'relatives'     => array ($t->mask),
                                         'operation'     => PHPGW_ACL_ADD
@@ -1397 +1399 @@
                         {
                                 if (!$this->acl_check (array(
-                                                'string'        => $t->fake_full_path,
+                                                'string'        => '/'.$path[1].'/'.$path[2],
                                                 'relatives'     => array ($t->mask),
                                                 'operation'     => PHPGW_ACL_EDIT