Changeset 1533 for sandbox/filemanager/inc/class.uifilemanager.inc.php

Timestamp:

10/28/09 08:04:06 (14 years ago)

Author:

amuller

Message:

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

File:

• sandbox/filemanager/inc/class.uifilemanager.inc.php (modified) (7 diffs)

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

@@ -293 +293 @@
                                 $this->path = $this->cdtodir;
                         }
-*/
+ */
+                        if(!$this->bo->vfs->acl_check(array(
+                                'string' => $this->path,
+                                'relatives' => array(RELATIVE_NONE),
+                                'operation' => PHPGW_ACL_READ
+                        )))
+                        {
+                                $this->path = $this->bo->homedir;       
+                        }
                         // new method for switching to a new dir.
                         if($this->changedir=='true' && $this->cdtodir || $this->goto_x)
@@ -356 +364 @@
                                 }
                         $this->readable_groups = array();
-
                         while(list($num, $account) = each($groups))
                         {
@@ -386 +393 @@
                                 $this->bo->vfs->working_id = $this->bo->userinfo['username'];
                         }
-
 
                         # FIXME # comment waht happens here
@@ -1086 +1092 @@
                                                 }
 
-                                                if(!$this->rename_x && $this->can_edit)
+                                                if(!$this->rename_x && $this->can_edit && 
+                                                $_SESSION['phpgw_info']['user']['preferences']['filemanager']['comment'] == 1)
                                                 {
                                                         $toolbar.=$this->inputImage('edit_comments','edit_comments',lang('Edit comments'));
@@ -1183 +1190 @@
                                          $c->read_repository();
                                          $current_config = $c->config_data;
-                                         $max_size = $current_config['filemanager_Max_attachment_size'];
+                                         $max_size = $current_config['filemanager_Max_file_size'];
                                          if (! $max_size)
                                                  $max_size = ini_get('upload_max_filesize');
@@ -1384 +1391 @@
                                         {
                                                 $copied++;
-                                                $this->message .= lang('Copied %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
+                                                $this->messages[] .= lang('Copied %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
                                         }
                                         else
                                         {
-                                                $this->message .= $GLOBALS['phpgw']->common->error_list(array(lang('Could not copy %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file)));
+                                                $this->messages[] .= lang('Could not copy %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
                                         }
                                 }
@@ -1599 +1606 @@
                 function edit()
                 {
+                        $files = array_keys($this->fileman);
+                        $this->file = $this->fileman[$files[0]];
+                        if($this->file)
+                        {
+                                $ls_array = $this->bo->vfs->ls(array(
+                                        'string'        => $this->path.'/'.$this->file,
+                                        'relatives'     => array(RELATIVE_ALL),
+                                        'checksubdirs'  => False,
+                                        'nofiles'       => True
+                                ));
+
+                                if($ls_array[0]['mime_type'])
+                                {
+                                        $mime_type = $ls_array[0]['mime_type'];
+                                }
+                                elseif($this->prefs['viewtextplain'])
+                                {
+                                        $mime_type = 'text/plain';
+                                }
+                                $viewable = array('','text/plain','text/csv','text/html','text/text');
+
+                                if(!in_array($mime_type,$viewable)){
+                                        echo lang('Inpossbile to edit this file');
+                                        return False;
+                                }
+                        }
+
                         $this->readFilesInfo();