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

Timestamp:

12/07/09 16:31:45 (14 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) (5 diffs)

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

@@ -30 +30 @@
                         'getReturnExecuteForm' => True,
                         'dir_ls' => True,
-                        'get_permissions' => True,
                         'search' => True,
                         'uploadModel'=>True
@@ -559 +558 @@
                                 $rights = $acl->get_rights($user_id);
                         }
-                        echo $rights;   
+                        return $rights; 
                 }
                 function dir_ls()
@@ -565 +564 @@
                         // 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)
+                        ));
+                        $quota = $this->bo->vfs->get_quota(array(
+                                'string'        => $this->path
+                        ));
                         reset($this->files_array);
                         $this->readFilesInfo();
@@ -602 +608 @@
                         else
                                 array_multisort($temp, SORT_DESC, $output);
-
-                        echo serialize($output);
+                        $return['files'] = $output;
+                        $return['quota']['quotaSize'] = ($quota*1024*1024);
+                        echo serialize($return);
                 }
 
@@ -614 +621 @@
                         if($this->numoffiles || $this->cwd)
                         {
-                                $usedSpace = $this->bo->vfs->get_size(array(
-                                        'string'        => $this->path,
-                                        'relatives'     => array(RELATIVE_NONE)
-                                ));
-                                $quota = $this->bo->vfs->get_quota(array(
-                                        'string'        => $this->path
-                                ));
-
-                                $vars[usedSpace]='<input type="hidden" id="usedSpace" value="'.$usedSpace.'">';
-                                $vars[quotaSize]='<input type="hidden" id="quotaSize" value="'.($quota*1024*1024).'">';
                                 $vars[path]='<input type="hidden" id="currentPath" value="'.$this->path.'">';
                                 $vars[css]='<link rel="stylesheet" type="text/css" href="filemanager/templates/default/main.css">';