Changeset 1730 for sandbox/filemanager/inc

Timestamp:

12/02/09 07:52:26 (15 years ago)

Author:

amuller

Message:

Ticket #597 - Melhorias no módulos gerenciador de arquivos do expresso livre

File:

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

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

@@ -980 +980 @@
                         {
                                 if (! $this->vfs_functions->verifyLock($this->path.'/'.$this->filename,RELATIVE_NONE)){
-                                        echo $this->messages['0'];
                                         $GLOBALS['phpgw']->redirect('/index.php');
-
-                                        //$GLOBALS['phpgw']->common->phpgw_exit();
                                 }
                                 $ls_array = $this->bo->vfs->ls(array(
@@ -1220 +1217 @@
                                         header('Content-disposition: filename="' . addslashes($this->file) . '"');
                                         Header("Pragma: public");
+                                        echo $this->bo->vfs->read(array(
+                                                'string'    => $this->path.'/'.$this->file,//FIXME
+                                                'relatives'    => array(RELATIVE_NONE)
+                                        ));
+
                                 }
                                 else
                                 {
                                         $GLOBALS['phpgw']->browser->content_header($this->file,$mime_type,$ls_array[0]['size']);
-                                }
-                                $this->bo->vfs->print_content(array(
-                                        'string' => $this->path.'/'.$this->file,
-                                        'relatives' => array(RELATIVE_NONE)
-                                )
-                        );
-
+                                        $this->bo->vfs->print_content(array(
+                                                'string' => $this->path.'/'.$this->file,
+                                                'relatives' => array(RELATIVE_NONE)
+                                                )
+                                        );
+                                }
                                 $GLOBALS['phpgw']->common->phpgw_exit();
                         }
@@ -1380 +1381 @@
                                                 $name = strtoupper($this->files_array[$i]['name']);
                                                 if (strstr($name,$this->text) ||
-                                                strstr($comment,$this->text) )
+                                                strstr($comment,$this->text) ){
                                                         $return[$this->files_array[$i]['directory'].$name] = $this->files_array[$i];
+                                                        $return[$this->files_array[$i]['directory'].$name]['icon'] = $this->mime_icon($this->files_array[$i]['mime_type']);
+                                                }
                                         }
                                         if (count($return) > 50)