Changeset 5038 for trunk/filemanager/inc

Timestamp:

09/05/11 17:16:12 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #2260 - Sincronismo do branch2.2(versão 2.2.8) do modulo filemanager para 2.4

Location:

trunk/filemanager/inc

Files:

• class.uifilemanager.inc.php (modified) (4 diffs)
• class.vfs_functions.inc.php (modified) (1 diff)

trunk/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));
@@ -1000 +1001 @@
                                 {
                                         $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']),

trunk/filemanager/inc/class.vfs_functions.inc.php

@@ -134 +134 @@
                 }
                 
+                function convertDateForm($pDate)
+                {
+                        /**
+                         * Recebe a data no formato      : aaaa-mm-dd
+                         * Retorna a data no formato : dd/mm/aaaa
+                         **/
+                
+                        $cDate = date_parse($pDate);
+                        $day   = ( strlen($cDate['day']) > 1 ) ? $cDate['day'] : "0".$cDate['day'];
+                        $month = ( strlen($cDate['month']) > 1 ) ? $cDate['month'] : "0".$cDate['month'];
+                        $year  = $cDate['year'];
+                
+                        return $day."/".$month."/".$year;
+                }
+                
                 // String format is YYYY-MM-DD HH:MM
                 function dateString2timeStamp($string)
                 {
-                        return mktime($string[11].$string[12],
-                                $string[14].$string[15],
-                                $string[17].$string[18], 
-                                $string[5].$string[6], 
-                                $string[8].$string[9],
-                                $string[0].$string[1].
-                                $string[2].$string[3]);
+                        /**
+                         * Recebe a data no formato      : aaaa-mm-dd
+                         * Retorna a data no formato : dd/mm/aaaa
+                         **/
+                
+                        $cDate = date_parse($string);
+                        $day   = ( strlen($cDate['day']) > 1 ) ? $cDate['day'] : "0".$cDate['day'];
+                        $month = ( strlen($cDate['month']) > 1 ) ? $cDate['month'] : "0".$cDate['month'];
+                        $year  = $cDate['year'];
+                
+                        return $day."/".$month."/".$year;
                 }