Changeset 1838

Timestamp:

12/15/09 12:31:37 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhoria do FM, Imagem padrão ao buscar thumbnail

Location:

sandbox/filemanager

Files:

• inc/class.vfs_functions.inc.php (modified) (1 diff)
• inc/upload.php (modified) (2 diffs)
• templates/default/images/error.gif (added)

sandbox/filemanager/inc/class.vfs_functions.inc.php

@@ -224 +224 @@
                                 header("Pragma: public");
                                 header("Expires: ".gmdate('D, d M Y H:i:s', time()+$expires));
-                                echo $this->bo->vfs->summary(array('path' => $this->path,
+                                $content = $this->bo->vfs->summary(array('path' => $this->path,
                                         'string' => $this->file
                                 ));
+                                if (sizeof($content) > 0)
+                                        echo $content;
+                                else
+                                {
+                                        $filename = './filemanager/templates/default/images/error.gif';
+                                        $handle = fopen($filename,'rb');
+                                        echo fread($handle,filesize($filename));
+                                        fclose($handle);
+                                }
+
                                 $GLOBALS['phpgw']->common->phpgw_exit();
                         }

sandbox/filemanager/inc/upload.php

@@ -36 +36 @@
                 break;
         default:
-                return;
+                return false;
         }
         $max_resolution = 48;
@@ -149 +149 @@
                                         {
                                                 $content = create_summaryImage($_FILES['upload_file']['tmp_name'][$i]);
-                                                $bo->vfs->set_summary(array(
-                                                'string'=> $_FILES['upload_file']['name'][$i],
-                                                'relatives' => array(RELATIVE_ALL),
-                                                'summary'=> $content
-                                        ));
+                                                if ($content){
+                                                        $bo->vfs->set_summary(array(
+                                                        'string'=> $_FILES['upload_file']['name'][$i],
+                                                        'relatives' => array(RELATIVE_ALL),
+                                                        'summary'=> $content
+                                                        ));
+                                                }
+
                                         }
                                 }