Fixes for images

Author: malamalca

src/Core/App.php

@@ -132,6 +132,16 @@ public static function url($params, $fullBase = false)
                     $url_base = self::getProjectFolder($area, $projectId, 'podatki');
                     $params = '/' . $image;
                 }
+                if (count($parts) == 4) {
+                    $image = $parts[3];
+                    $projectId = null;
+                    $area = $parts[1];
+
+                    $url_base = self::getProjectFolder($area, $projectId, 'podatki');
+                    $params = '/' . $image;
+                }
+
+                $url_base = 'file:///' . strtr($url_base, DS, '/');
             }
         } else {
             $url_base = (string)Configure::read('App.baseUrl', '/') . '/';

tmp/.gitempty

@@ -8,6 +8,7 @@
     $r->addRoute(['GET', 'POST'], '/pures/{controller}[/{action}[/{param1}[/{param2}[/{param3}]]]]', 'Pures');
     $r->addRoute(['GET', 'POST'], '/hrup/{controller}[/{action}[/{param1}[/{param2}]]]', 'Hrup');
     $r->addRoute(['GET'], '/project-image/{area}/{projectId}/{image}', 'ProjectImage');
+    $r->addRoute(['GET'], '/project-image/{area}/{image}', 'ProjectImage');
     $r->addRoute(['GET'], '/', 'Index');
 });
 
@@ -73,6 +74,15 @@
             case 'ProjectImage':
                 $controllerName = 'App';
                 $vars['action'] = 'projectImage';
+
+                // za primere, ko ni podan projectId
+                $vars = [
+                    'area' => $vars['area'],
+                    'projectId' => $vars['projectId'] ?? '',
+                    'image' => $vars['image'],
+                    'action' => 'projectImage'
+                ];
+
                 $handler = $vars['area'];
                 break;
             case 'Index':