Merge pull request #105 from funktechno/f/image_view_fix

fix image regex viewer

Author: lastlink

ChangeLog.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Version 0.5.0
+* contributors: @imfx77
 
 ---
 
@@ -34,6 +35,7 @@ Actions like changing the parent shouldn't trigger new editions to avoid unneces
 * Improved this very `ChangeLog`, transforming it into MD. 
 
 ### Bug fixes:
+* Fixed file viewer
 * Fixed routes for all controller actions in use.
 They used to be copy pasted and were useless as they were all the same.
 Minimalistic possible and sensible notation is proposed.

Controller/WikiFileViewController.php

@@ -59,11 +59,13 @@ public function thumbnail()
     {
         $file = $this->wikiFileModel->getById($this->request->getIntegerParam('file_id'));
         $filename = $this->wikiFileModel->getThumbnailPath($file['path']);
+        
+        $etag = md5($filename);
 
-        $this->response->withCache(5 * 86400, $file['etag']);
+        $this->response->withCache(5 * 86400, $etag);
         $this->response->withContentType('image/png');
 
-        if ($this->request->getHeader('If-None-Match') === '"'.$file['etag'].'"') {
+        if ($this->request->getHeader('If-None-Match') === '"'.$etag.'"') {
             $this->response->status(304);
         } else {
             $this->response->send();

Template/wiki_file/images.php

@@ -5,8 +5,7 @@
                 <?= $this->app->component('image-slideshow', array(
                     'images' => $images,
                     'image' => $file,
-                    'regex_file_id' => 'FILE_ID',
-                    'regex_etag' => 'ETAG',
+                    'regex' => 'FILE_ID',
                     'url' => array(
                         'image'     => $this->url->to('WikiFileViewController', 'image', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
                         'thumbnail' => $this->url->to('WikiFileViewController', 'thumbnail', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),