Changeset 5327 for trunk/filemanager/inc/class.uifilemanager.inc.php

Timestamp:

01/09/12 09:17:50 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #2260 - Sincronismo do módulo Filemanager para o trunk.

File:

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

trunk/filemanager/inc/class.uifilemanager.inc.php

@@ -568 +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;
                 }
@@ -610 +612 @@
                         $return[] = $dir['directory'] . $dir['name'];
                 sort(&$return, SORT_STRING);
+
                 echo serialize($return);
         }
@@ -753 +756 @@
         }
 
-        function createdir() {
+        function createdir()
+        {
                 if ($this->bo->badchar = $this->bo->bad_chars($this->filename, True, True)) {
                         echo lang('Error:') . $this->bo->html_encode(lang('Directory names cannot contain "%1"', $badchar), 1);
@@ -772 +776 @@
                 $fileinfo = $ls_array[0];
 
-                if ($fileinfo['name']) {
+                if ($fileinfo['name'])
+                {
                         if ($fileinfo['mime_type'] != 'Directory') {
                                 echo lang('Error:') . lang('%1 already exists as a file', $fileinfo['name']);
@@ -778 +783 @@
                                 echo lang('Error:') . lang('Directory %1 already exists', $fileinfo['name']);
                         }
-                } else {
+                }
+                else
+                {
                         $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
 
-                        if ($this->bo->vfs->mkdir(array('string' => $this->filename))) {
-                                echo lang('Created directory %1', $this->disppath . '/' . $this->filename);
-                        } else {
+                        if ($this->bo->vfs->mkdir(array('string' => $this->filename)))
+                        {
+                                echo "True";
+                                //echo lang('Created directory %1', $this->disppath . '/' . $this->filename);
+                        }
+                        else
+                        {
                                 echo lang('Error:') . lang('Could not create %1', $this->disppath . '/' . $this->filename);
                         }
                 }
-                echo lang('Directory created');
+                
         }