Changeset 3936

Timestamp:

03/31/11 16:51:47 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1659 - Correcao para exportar arquivos sem conteudo

Location:

branches/2.2/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (3 diffs)
• js/draw_api.js (modified) (1 diff)

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

@@ -1038 +1038 @@
         }
 
-        function export() {
-                if ($this->file) {
+        function export()
+        {
+                if ($this->file)
+                {
                         $ls_array = $this->bo->vfs->ls(array(
                                                         'string' => $this->path . '/' . $this->file,
@@ -1046 +1048 @@
                                                         'nofiles' => True
                                           ));
-                        /* $timestamp = $this->vfs_functions->dateString2timeStamp($ls_array[0]['modified']);
-                          if (time() - $timestamp < 60 && $ls_array[0]['modifiedby_id'] != $GLOBALS['phpgw_info']['user']['account_id']);
-                          {
-                          // recently than last minute: someone is editing
-                          } */
+
                         $mime_type = $ls_array[0]['mime_type'];
+                        
                         $formats = array('text/html');
-                        if (!in_array($mime_type, $formats)) {
+                        
+                        if (!in_array($mime_type, $formats))
+                        {
                                 echo lang('Impossible to export this file');
                                 return False;
                         }
+                        
                         $content = $this->bo->vfs->read(array('string' => $this->path . '/' . $this->file,
                                                         'relatives' => array(RELATIVE_NONE)
@@ -1062 +1064 @@
 
                         include_once('filemanager/tp/dompdf/dompdf_config.inc.php');
+                        
                         $dompdf = new DOMPDF();
                         $dompdf->load_html($content);

branches/2.2/filemanager/js/draw_api.js

@@ -334 +334 @@
         {
                 case 'text/html':
-                        retBuff += '<td><a href="./index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><div class="exportButton" alt="'+get_lang('export')+'" title="'+get_lang('export')+'"></div></a></td>';
+                        if( file.size > 0 )
+                                retBuff += '<td><a href="./index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><div class="exportButton" alt="'+get_lang('export')+'" title="'+get_lang('export')+'"></div></a></td>';
+                        else
+                                retBuff += '<td><a href="javascript:void();"></a></td>';
                         break;
                 case 'application/zip':