Merge pull-request #699

3 files changed, 73 insertions, 8 deletions

diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index a6e002f2..17170317 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -441,7 +441,8 @@ class Board extends Base
         $task = $this->getTask();
 
         $this->response->html($this->template->render('board/files', array(
-            'files' => $this->file->getAll($task['id']),
+            'files' => $this->file->getAllDocuments($task['id']),
+            'images' => $this->file->getAllImages($task['id']),
             'task' => $task,
         )));
     }
diff --git a/app/Controller/File.php b/app/Controller/File.php
index 3255fe84..1e719d2f 100644
--- a/app/Controller/File.php
+++ b/app/Controller/File.php
@@ -20,8 +20,8 @@ class File extends Base
         $task = $this->getTask();
 
         $this->response->html($this->taskLayout('file/new', array(
-            'task' => $task,
-            'max_size' => ini_get('upload_max_filesize'),
+                    'task' => $task,
+                    'max_size' => ini_get('upload_max_filesize'),
         )));
     }
 
@@ -74,8 +74,8 @@ class File extends Base
 
         if ($file['task_id'] == $task['id']) {
             $this->response->html($this->template->render('file/open', array(
-                'file' => $file,
-                'task' => $task,
+                        'file' => $file,
+                        'task' => $task,
             )));
         }
     }
@@ -102,6 +102,69 @@ class File extends Base
     }
 
     /**
+     * Return the file content (work only for images) resized
+     *
+     * @access public
+     */
+    public function imageThumbnail() {
+        $task = $this->getTask();
+        $file = $this->file->getById($this->request->getIntegerParam('file_id'));
+        $width_param = $this->request->getIntegerParam('width');
+        $height_param = $this->request->getIntegerParam('height');
+        $filename = FILES_DIR . $file['path'];
+
+        if ($file['task_id'] == $task['id'] && file_exists($filename)) {
+
+            // Get new sizes
+            list($width, $height) = getimagesize($filename);
+            if ($width_param == 0 && $height_param == 0) {
+                $newwidth = 100;
+                $newheight = 100;
+            } elseif ($width_param > 0 && $height_param == 0) {
+                $newwidth = $width_param;
+                $newheight = floor($height * ( $width_param / $width ));
+            } elseif ($width_param == 0 && $height_param > 0) {
+                $newwidth = floor($width * ( $height_param / $height ));
+                $newheight = $height_param;
+            } else {
+                $newwidth = $width_param;
+                $newheight = $height_param;
+            }
+
+            // Load
+            $thumb = imagecreatetruecolor($newwidth, $newheight);
+
+            $info = pathinfo($file['name']);
+            $extension = strtolower($info['extension']);
+
+            switch ($extension) {
+                case 'jpeg':
+                case 'jpg':
+                    $source = imagecreatefromjpeg($filename);
+                    break;
+                case 'png':
+                    $source = imagecreatefrompng($filename);
+                    break;
+                case 'gif':
+                    $source = imagecreatefromgif($filename);
+                    break;
+                default:
+                    die('File "' . $filename . '" is not valid jpg, png or gif image.');
+                    break;
+            }
+
+            // Resize        
+            imagecopyresampled($thumb, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
+
+            $metadata = getimagesize($filename);
+            if (isset($metadata['mime'])) {
+                $this->response->contentType($metadata['mime']);
+                imagejpeg($thumb);
+            }
+        }
+    }
+    
+    /**
      * Remove a file
      *
      * @access public
@@ -132,8 +195,8 @@ class File extends Base
         $file = $this->file->getById($this->request->getIntegerParam('file_id'));
 
         $this->response->html($this->taskLayout('file/remove', array(
-            'task' => $task,
-            'file' => $file,
+                    'task' => $task,
+                    'file' => $file,
         )));
     }
 }
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 741db61e..d94c5908 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -68,7 +68,8 @@ class Task extends Base
 
         $this->response->html($this->taskLayout('task/show', array(
             'project' => $this->project->getById($task['project_id']),
-            'files' => $this->file->getAll($task['id']),
+            'files' => $this->file->getAllDocuments($task['id']),
+            'images' => $this->file->getAllImages($task['id']),
             'comments' => $this->comment->getAll($task['id']),
             'subtasks' => $subtasks,
             'links' => $this->taskLink->getLinks($task['id']),