Changeset 5059 for branches/2.2/filemanager/inc/class.uifilemanager.inc.php

Timestamp:

09/06/11 11:55:20 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #2263 - Corrigido total usado dentro do filemanager (não estava contabilizando corretamente)

File:

• branches/2.2/filemanager/inc/class.uifilemanager.inc.php (modified) (5 diffs)

branches/2.2/filemanager/inc/class.uifilemanager.inc.php

@@ -337 +337 @@
                 echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/handler.js'></script>";
                 
-                //echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/NewHandler.js'></script>";
-
-
                 // Temas Expresso
                 $theme = "window_" . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . ".css";
@@ -529 +526 @@
         }
 
-        function dir_ls() {
+        function dir_ls()
+        {
                 // 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(
+                /*$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,
-                                  ));
-                $quota = $this->bo->vfs->get_quota(array(
-                                                'string' => $this->path
-                                  ));
+                                  ));*/
+                
+                $return['quota']['usedSpace'] = $this->bo->vfs->get_size_all( $GLOBALS['phpgw_info']['user']['account_id'] );
+                $return['files_count'] = $this->bo->vfs->count_files(array( 'string' => $this->path ));
+                
+                $quota = $this->bo->vfs->get_quota(array('string' => $this->bo->homedir ));
+                
                 reset($this->files_array);
                 $this->readFilesInfo();
 
-                for ($i = 0; $i != $this->numoffiles; $i++) {
+                for ($i = 0; $i != $this->numoffiles; $i++)
+                {
                         $files = $this->files_array[$i];
 
@@ -554 +553 @@
                         /* small keys to safe bandwidth */
                         $tuple['name'] = htmlentities($files['name']);
-                        if ($_SESSION['phpgw_info']['user']['preferences']['filemanager']['viewIcons'] == 1) {
+                        if ($_SESSION['phpgw_info']['user']['preferences']['filemanager']['viewIcons'] == 1) 
+                        {
                                 if ($files['mime_type'] == 'image/png' ||
                                                   $files['mime_type'] == 'image/gif' ||
-                                                  $files['mime_type'] == 'image/jpg') {
+                                                  $files['mime_type'] == 'image/jpg')
+                                {
                                         $filename = str_replace('=', '', base64_encode($tuple['name']));
                                         $pathname = str_replace('=', '', base64_encode($this->path));
@@ -567 +568 @@
                         else
                                 $tuple['icon'] = $this->mime_icon($files['mime_type']);
-                        $tuple['type'] = $files['type'];
-                        $tuple['created'] = $this->vfs_functions->dateString2timeStamp($files['created']);
-                        $tuple['modified'] = $this->vfs_functions->dateString2timeStamp($files['modified']);
-                        $tuple['size'] = $files['size'];
-                        $tuple['mime_type'] = $files['mime_type'];
-                        $tuple['pub'] = $files['type'];
-                        $tuple['createdby_id'] = $GLOBALS['phpgw']->accounts->id2name($files['createdby_id']);
+
+                        $tuple['type']                  = $files['type'];
+                        $tuple['created']               = $this->vfs_functions->dateString2timeStamp($files['created']);
+                        $tuple['modified']              = ( $files['modified'] != "" ) ? $this->vfs_functions->dateString2timeStamp($files['modified']) : "";
+                        $tuple['size']                  = $files['size'];
+                        $tuple['mime_type']             = $files['mime_type'];
+                        $tuple['pub']                   = $files['type'];
+                        $tuple['createdby_id']  = $GLOBALS['phpgw']->accounts->id2name($files['createdby_id']);
                         $tuple['modifiedby_id'] = $files['modifiedby_id'] ? $GLOBALS['phpgw']->accounts->id2name($files['modifiedby_id']) : '';
-                        $tuple['owner'] = $GLOBALS['phpgw']->accounts->id2name($files['owner_id']);
-                        $tuple['comment'] = $files['comment'];
-                        $tuple['version'] = $files['version'];
+                        $tuple['owner']                 = $GLOBALS['phpgw']->accounts->id2name($files['owner_id']);
+                        $tuple['comment']               = $files['comment'];
+                        $tuple['version']               = $files['version'];
+                        
                         $output[] = $tuple;
                 }
                 $return['files'] = $output;
                 $return['quota']['quotaSize'] = ($quota * 1024 * 1024);
-                //echo serialize(htmlspecialchars_decode(htmlentities($return)));
                 echo serialize($return);
         }
@@ -1010 +1012 @@
                                 {
                                         $historyFile[] = array(
-                                                                                        "created"       => $journal_entry['created'],
+                                                                                        "created"       => $this->vfs_functions->dateString2timeStamp($journal_entry['created']),
                                                                                         "version"       => $journal_entry['version'],
                                                                                         "who"           => $GLOBALS['phpgw']->accounts->id2name($journal_entry['owner_id']),