uri bugs fixing

Author: steevenz

src/Helpers/Url.php

@@ -27,11 +27,12 @@ function base_url($segments = null, $query = null)
 
         if($uri->getSubDomain() !== globals()->get('app')) {
             if(!empty(globals()->app->getSegments())) {
-                if(is_array($segments)) {
-                    $segments = array_merge(globals()->app->getSegments(), $segments);
-                } elseif(is_string($segments)) {
-                    $segments = implode('/', globals()->app->getSegments()) . '/' . $segments;
+                if(is_string($segments)) {
+                    $segments = explode('/', $segments);
+                    $segments = array_diff(globals()->app->getSegments(), $segments);
                 }
+
+                $segments = array_merge(globals()->app->getSegments(), $segments);
             }
         }
 
@@ -174,11 +175,11 @@ function storage_url($path)
      *
      * @return string
      */
-    function images_url($path)
+    function images_url($path, $size = null)
     {
         $urlPath = str_replace(PATH_STORAGE, '', $path);
 
-        return base_url('images/' . $urlPath);
+        return base_url('images/' . (isset($size) ? '/' . $size : '') . $urlPath);
     }
 }
 

src/Http/Controllers/Images.php

@@ -102,7 +102,7 @@ class Images extends Controller
     public function __construct()
     {
         $this->storagePath = PATH_STORAGE . 'images' . DIRECTORY_SEPARATOR;
-        $this->imageNotFoundFilename = $this->storagePath . 'default/not-found.jpg';
+        $this->imageNotFoundFilename = $this->storagePath . 'default'. DIRECTORY_SEPARATOR . 'not-found.jpg';
     }
 
     // ------------------------------------------------------------------------
@@ -115,7 +115,7 @@ public function route()
         $segments = server_request()->getUri()->segments->getArrayCopy();
 
         if (false !== ($key = array_search('images', $segments))) {
-            unset($segments[$key]);
+            $segments = array_slice($segments, $key + 1);
         } else {
             array_shift($segments);
         }

src/Http/Controllers/Storage.php

@@ -117,9 +117,7 @@ public function route()
                         }
 
                         header('Content-Type: ' . $fileInfo->getMime());
-                        header('Cache-Control: no-cache, no-store, must-revalidate');
-                        header('Pragma: no-cache');
-                        header('Expires: 0');
+                        header('Cache-Control: max-age=60');
                         header('Content-Length:' . ($lengthEnd - $lengthStart));
                         header("Content-Range: bytes " . ($lengthStart-$lengthEnd)/$fileInfo->getSize());
                         header("Content-Disposition: inline; filename=" . $fileInfo->getFilename() . '.' . $fileInfo->getExtension());

src/Http/Presenter/Assets/Collections/Javascripts.php~39ed76c34d9f5c8cd9d313cb694f613d68afd7c1

@@ -701,43 +701,41 @@ public function insertIfNotExists(SplArrayStorage $data, array $conditions = [])
      */
     public function update(SplArrayStorage $data, array $conditions = [])
     {
-        if (empty($this->updateValidationRules)) {
-            if (empty($this->primaryKeys)) {
-                $primaryKey = empty($this->primaryKey) ? 'id' : $this->primaryKey;
-                if ($data->offsetExists($primaryKey)) {
-                    if (!array_key_exists($primaryKey, $conditions)) {
+        if(empty($conditions)) {
+            if(count($this->primaryKeys)) {
+                foreach ($this->primaryKeys as $primaryKey) {
+                    if($data->offsetExists($primaryKey)) {
                         $conditions[$primaryKey] = $data->offsetGet($primaryKey);
                     }
-                }
 
-                $this->updateValidationRules[$primaryKey] = 'required';
-                $this->updateValidationCustomErrors[$primaryKey] = [
-                    'required' => language('LABEL_' . strtoupper($primaryKey)) . ' cannot be empty!',
-                ];
-            } else {
-                foreach ($this->primaryKeys as $primaryKey) {
-                    if ($data->offsetExists($primaryKey)) {
-                        if (!array_key_exists($primaryKey, $conditions)) {
-                            $conditions[$primaryKey] = $data->offsetGet($primaryKey);
-                        }
+                    if(empty($this->updateValidationRules)) {
+                        $this->updateValidationRules[$primaryKey] = 'required';
+                        $this->updateValidationCustomErrors[$primaryKey] = [
+                            'required' => language('LABEL_' . strtoupper($primaryKey)) . ' cannot be empty!',
+                        ];
                     }
-
-                    $this->updateValidationRules[$primaryKey] = 'required';
-                    $this->updateValidationCustomErrors[$primaryKey] = [
-                        'required' => language('LABEL_' . strtoupper($primaryKey)) . ' cannot be empty!',
-                    ];
                 }
             }
-        } elseif (empty($conditions)) {
-            if (empty($this->primaryKeys)) {
-                foreach ($this->primaryKeys as $primaryKey) {
-                    if ($data->offsetExists($primaryKey)) {
-                        $conditions[$primaryKey] = $data->offsetGet($primaryKey);
+        }
+
+        if($data instanceof AbstractInput) {
+            if (count($this->updateValidationRules)) {
+                $data->validation($this->updateValidationRules, $this->updateValidationCustomErrors);
+
+                if (!$data->validate()) {
+                    $this->addErrors($data->validator->getErrors());
+
+                    if (services()->has('session') and $this->flashMessage) {
+                        $errors = new Unordered();
+                        foreach ($data->validator->getErrors() as $error) {
+                            $errors->createList($error);
+                        }
+
+                        session()->setFlash('danger',
+                            language('FAILED_INSERT', $errors->__toString()));
                     }
-                }
-            } else {
-                if ($data->offsetExists($primaryKey)) {
-                    $conditions = [$primaryKey => $data->offsetGet($primaryKey)];
+
+                    return false;
                 }
             }
         }
@@ -877,11 +875,11 @@ public function update(SplArrayStorage $data, array $conditions = [])
                         $data['settings'] = new SplArrayObject();
 
                         if (empty($this->primaryKeys)) {
-                            $ownershipId = $data->offsetGet($this->primaryKey);
+                            $ownershipId = $data[$this->primaryKey];
                         } else {
                             $ownershipId = [];
                             foreach ($this->primaryKeys as $primaryKey) {
-                                array_push($ownershipId, $data->offsetGet($this->primaryKey));
+                                array_push($ownershipId, $data[$primaryKey]);
                             }
 
                             $ownershipId = implode('-', $ownershipId);
@@ -1188,7 +1186,7 @@ private function deleteRow(Row $row)
             } else {
                 $ownershipId = [];
                 foreach ($this->primaryKeys as $primaryKey) {
-                    array_push($ownershipId, $data[$primaryKey]);
+                    array_push($ownershipId, $row->offsetGet($primaryKey));
                 }
 
                 $ownershipId = implode('-', $ownershipId);