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

Timestamp:

02/10/10 15:22:36 (14 years ago)

Author:

fpcorrea

Message:

Ticket #597 - Implementada paginação e correção de bugs

File:

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

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

@@ -80 +80 @@
                 var $sortby;
                 var $messages;
+                var $limit; //for paging (paginacao)
+                var $offset; //for paging (paginacao)
 
                 var $now;
@@ -176 +178 @@
                         if($test[mime_type]!='Directory')
                         {
-
                                 $this->bo->vfs->override_acl = 1;
 
@@ -464 +465 @@
                         else
                         {
-                                $this->readFilesInfo();
+                                //$this->readFilesInfo();
                                 $this->fileListing();
                         }
@@ -505 +506 @@
                                         '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(
@@ -537 +541 @@
                                         $tuple['icon'] = $this->mime_icon($files['mime_type']);
                                 $tuple['type'] = $files['type'];
-                                $tuple['creatd'] = $this->vfs_functions->dateString2timeStamp($files['created']);
-                                $tuple['modifd'] = $this->vfs_functions->dateString2timeStamp($files['modified']);
+                                $tuple['created'] = $this->vfs_functions->dateString2timeStamp($files['created']);
+                                $tuple['modified'] = $this->vfs_functions->dateString2timeStamp($files['modified']);
                                 $tuple['size'] = $files['size'];
-                                $tuple['mime'] = $files['mime_type'];
+                                $tuple['mime_type'] = $files['mime_type'];
                                 $tuple['pub'] = $files['type'];
-                                $tuple['creatdby'] = $GLOBALS['phpgw']->accounts->id2name($files['createdby_id']);
-                                $tuple['modifdby'] = $files['modifiedby_id']?$GLOBALS['phpgw']->accounts->id2name($files['modifiedby_id']):'';
+                                $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['comm'] = $files['comment'];
-                                $tuple['vers'] = $files['version'];
+                                $tuple['comment'] = $files['comment'];
+                                $tuple['version'] = $files['version'];
                                 $output[] = $tuple;
 
                         }
                         // TODO Order files directly into SQL
-                        foreach ($output as $key => $row) {
+                        /*foreach ($output as $key => $row) {
                                 $temp[$key]  = strtoupper($row[$this->criteria]);
                         }
@@ -557 +561 @@
                                 array_multisort($temp, SORT_ASC, $output);
                         else
-                                array_multisort($temp, SORT_DESC, $output);
+                                array_multisort($temp, SORT_DESC, $output);*/
                         $return['files'] = $output;
                         $return['quota']['quotaSize'] = ($quota*1024*1024);
@@ -581 +585 @@
                                 $this->groups_applications[$value['account_name']] = $applications->read_account_specific();
                         }
+
 
                         // selectbox for change/move/and copy to
@@ -706 +711 @@
                         else
                         {
+                                /*$this->limit = $this->limit ? $this->limit : 0;
+                                $this->offset = $this->offset ? $this->offset : 100;*/
                                 $ls_array = $this->bo->vfs->ls(array(
                                         'string' => $this->path,
@@ -711 +718 @@
                                         'checksubdirs' => False,
                                         'nofiles'       => False,
-                                        'orderby'       => $this->sortby
+                                        'orderby'       => $this->criteria,
+                                        'otype'         => $this->otype,
+                                        'limit'         => $this->limit,
+                                        'offset'        => $this->offset
                                 ));