Changeset 1750

Timestamp:

12/04/09 14:41:37 (14 years ago)

Author:

amuller

Message:

Ticket #597 - melhoria no módulos gerenciador de arquivos do expresso livre

Files:

• sandbox/filemanager/inc/class.uifilemanager.inc.php (modified) (2 diffs)
• sandbox/filemanager/js/common_functions.js (modified) (1 diff)
• sandbox/filemanager/js/draw_api.js (modified) (1 diff)
• trunk/phpgwapi/inc/class.vfs_sql.inc.php (modified) (2 diffs)

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

@@ -627 +627 @@
 
                                 // create dir and file button
-                                if($this->can_add)
-                                {
-                                        //TODO : create folder with problems
-                                        //$toolbar3.=$this->toolButton('newdir','createdir',lang('Create Folder'));
-                                        $vars[new_button]=$this->toolButton('new','createfile',lang('New...'));
-                                        $vars[new_button].='<input type="hidden" id="newfile_or_dir" name="newfile_or_dir" value="" />';
-                                }
-                                else
-                                        $vars[new_button]='';
-
+                                //TODO : create folder with problems
+                                //$toolbar3.=$this->toolButton('newdir','createdir',lang('Create Folder'));
+                                
+                                $vars[new_button]=$this->toolButton('new','createfile',lang('New...'));
+                                $vars[new_button].='<input type="hidden" id="newfile_or_dir" name="newfile_or_dir" value="" />';
+                                
                                 // reload button with this url
                                 $vars[refresh_button]=$this->toolButton('reload','reload',lang('reload'));
@@ -1210 +1206 @@
                                         $mime_type = 'text/plain';
                                 }
-                                $viewable = array('','text/plain','text/csv','text/html','text/text');
-
-                                if(in_array($mime_type,$viewable))
+                                $viewable = array('','text/plain','text/csv','text/html',
+                                        'text/text','image/jpeg','image/png','image/gif');
+
+                                if(in_array($mime_type,$viewable) || $ls_array[0]['size'] < 10240)
                                 {
                                         /*Note: if you put application/octet-stream you force download */

sandbox/filemanager/js/common_functions.js

@@ -241 +241 @@
                 inputHTML+'createdby_id" '+check('createdby_id')+'>'+get_lang('created by')+'<br>'+
                 inputHTML+'modifiedby_id" '+check('modifiedby_id')+'>'+get_lang('modified by')+'<br>'+
-                inputHTML+'application" '+check('application')+'>'+get_lang('application')+'<br>'+
+        //      inputHTML+'application" '+check('application')+'>'+get_lang('application')+'<br>'+
                 inputHTML+'comment" '+check('comment')+'>'+get_lang('comment')+'<br>'+
                 inputHTML+'version" '+check('version')+'>'+get_lang('version')+'<br>'+

sandbox/filemanager/js/draw_api.js

@@ -220 +220 @@
                 if (preferences.createdby_id =='1') newpage += fl.td+files[i].createdby_id+'</td>';
                 if (preferences.modifiedby_id =='1') newpage += fl.td+files[i].modifiedby_id+'</td>';
-                if (files[i].comment == null || files[i].comment.length == 0)
-                        files[i].comment = "&lt;"+get_lang("no comments")+"&gt;";
                 if (preferences.comment =='1') newpage += fl.td+'<span id="'+files[i].name+'">'+files[i].comment+'</span></td>';
                 if (preferences.version =='1') newpage += fl.td+'<span>'+files[i].version+'</span></td></tr>';

trunk/phpgwapi/inc/class.vfs_sql.inc.php

@@ -821 +821 @@
                                 return False;
                         }
+                        session_write_close();
                                 if ($fp = fopen ($p->real_full_path, 'rb'))
                                 {
@@ -827 +828 @@
                                                 echo fread($fp, $i);
                                                 flush();
-                                                ob_clean();
+                                                usleep(50);
                                         }
                                         fclose ($fp);