@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | namespace library\storage |
3 | 3 | { |
4 | 4 | |
5 | - use library\crypt\Crypt; |
|
6 | - use library\images\ImageResizer; |
|
5 | + use library\crypt\Crypt; |
|
6 | + use library\images\ImageResizer; |
|
7 | 7 | |
8 | - /** |
|
8 | + /** |
|
9 | 9 | * Class JsonStorage |
10 | 10 | * @package library\storage |
11 | 11 | */ |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | * @var String |
16 | 16 | */ |
17 | 17 | private $storageDir; |
18 | - /** |
|
19 | - * @var Repository |
|
20 | - */ |
|
18 | + /** |
|
19 | + * @var Repository |
|
20 | + */ |
|
21 | 21 | private $repository; |
22 | 22 | |
23 | 23 | /** |
@@ -79,12 +79,12 @@ discard block |
||
79 | 79 | return $return; |
80 | 80 | } |
81 | 81 | |
82 | - /** |
|
83 | - * Get user by slug |
|
84 | - * |
|
85 | - * @param $slug |
|
86 | - * @return array |
|
87 | - */ |
|
82 | + /** |
|
83 | + * Get user by slug |
|
84 | + * |
|
85 | + * @param $slug |
|
86 | + * @return array |
|
87 | + */ |
|
88 | 88 | public function getUserBySlug($slug) |
89 | 89 | { |
90 | 90 | $return = array(); |
@@ -100,23 +100,23 @@ discard block |
||
100 | 100 | return $return; |
101 | 101 | } |
102 | 102 | |
103 | - /** |
|
104 | - * Get all users |
|
105 | - * |
|
106 | - * @return mixed |
|
107 | - */ |
|
103 | + /** |
|
104 | + * Get all users |
|
105 | + * |
|
106 | + * @return mixed |
|
107 | + */ |
|
108 | 108 | public function getUsers() |
109 | 109 | { |
110 | 110 | return $this->repository->users; |
111 | 111 | } |
112 | 112 | |
113 | - /** |
|
114 | - * Save user |
|
115 | - * |
|
116 | - * @param $slug |
|
117 | - * @param $postValues |
|
118 | - * @throws \Exception |
|
119 | - */ |
|
113 | + /** |
|
114 | + * Save user |
|
115 | + * |
|
116 | + * @param $slug |
|
117 | + * @param $postValues |
|
118 | + * @throws \Exception |
|
119 | + */ |
|
120 | 120 | public function saveUser($slug, $postValues) |
121 | 121 | { |
122 | 122 | $userObj = $this->createUserFromPostValues($postValues); |
@@ -137,12 +137,12 @@ discard block |
||
137 | 137 | $this->save(); |
138 | 138 | } |
139 | 139 | |
140 | - /** |
|
141 | - * Add user |
|
142 | - * |
|
143 | - * @param $postValues |
|
144 | - * @throws \Exception |
|
145 | - */ |
|
140 | + /** |
|
141 | + * Add user |
|
142 | + * |
|
143 | + * @param $postValues |
|
144 | + * @throws \Exception |
|
145 | + */ |
|
146 | 146 | public function addUser($postValues) |
147 | 147 | { |
148 | 148 | $userObj = $this->createUserFromPostValues($postValues); |
@@ -151,17 +151,17 @@ discard block |
||
151 | 151 | if (!empty($doesItExist)) { |
152 | 152 | throw new \Exception('Trying to add username that already exists.'); |
153 | 153 | } |
154 | - $users = $this->repository->users; |
|
155 | - $users[] = $userObj; |
|
156 | - $this->repository->users = $users; |
|
154 | + $users = $this->repository->users; |
|
155 | + $users[] = $userObj; |
|
156 | + $this->repository->users = $users; |
|
157 | 157 | $this->save(); |
158 | 158 | } |
159 | 159 | |
160 | - /** |
|
161 | - * Delete user by slug |
|
162 | - * @param $slug |
|
163 | - * @throws \Exception |
|
164 | - */ |
|
160 | + /** |
|
161 | + * Delete user by slug |
|
162 | + * @param $slug |
|
163 | + * @throws \Exception |
|
164 | + */ |
|
165 | 165 | public function deleteUserBySlug($slug) |
166 | 166 | { |
167 | 167 | $userToDelete = $this->getUserBySlug($slug); |
@@ -178,12 +178,12 @@ discard block |
||
178 | 178 | $this->save(); |
179 | 179 | } |
180 | 180 | |
181 | - /** |
|
182 | - * Create user from POST values |
|
183 | - * @param $postValues |
|
184 | - * @return \stdClass |
|
185 | - * @throws \Exception |
|
186 | - */ |
|
181 | + /** |
|
182 | + * Create user from POST values |
|
183 | + * @param $postValues |
|
184 | + * @return \stdClass |
|
185 | + * @throws \Exception |
|
186 | + */ |
|
187 | 187 | private function createUserFromPostValues($postValues) |
188 | 188 | { |
189 | 189 | if (isset($postValues['username'])) { |
@@ -237,40 +237,40 @@ discard block |
||
237 | 237 | */ |
238 | 238 | public function getDocumentBySlug($slug) |
239 | 239 | { |
240 | - $path = '/' . $slug; |
|
240 | + $path = '/' . $slug; |
|
241 | 241 | return $this->repository->getDocumentByPath($path); |
242 | 242 | } |
243 | 243 | |
244 | 244 | public function saveDocument($postValues) |
245 | 245 | { |
246 | - $oldPath = '/' . $postValues['path']; |
|
246 | + $oldPath = '/' . $postValues['path']; |
|
247 | 247 | |
248 | - $container = $this->getDocumentContainerByPath($oldPath); |
|
249 | - $documentObject = $this->createDocumentFromPostValues($postValues); |
|
250 | - if ($container->path === '/') { |
|
251 | - $newPath = $container->path . $documentObject->slug; |
|
252 | - } else { |
|
253 | - $newPath = $container->path . '/' . $documentObject->slug; |
|
254 | - } |
|
255 | - $documentObject->path = $newPath; |
|
256 | - $this->repository->saveDocument($documentObject); |
|
257 | - } |
|
248 | + $container = $this->getDocumentContainerByPath($oldPath); |
|
249 | + $documentObject = $this->createDocumentFromPostValues($postValues); |
|
250 | + if ($container->path === '/') { |
|
251 | + $newPath = $container->path . $documentObject->slug; |
|
252 | + } else { |
|
253 | + $newPath = $container->path . '/' . $documentObject->slug; |
|
254 | + } |
|
255 | + $documentObject->path = $newPath; |
|
256 | + $this->repository->saveDocument($documentObject); |
|
257 | + } |
|
258 | 258 | |
259 | 259 | public function addDocument($postValues) |
260 | 260 | { |
261 | 261 | $documentObject = $this->createDocumentFromPostValues($postValues); |
262 | - if ($postValues['path'] === '/') { |
|
263 | - $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
264 | - } else { |
|
265 | - $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
266 | - } |
|
262 | + if ($postValues['path'] === '/') { |
|
263 | + $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
264 | + } else { |
|
265 | + $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
266 | + } |
|
267 | 267 | |
268 | - $this->repository->saveDocument($documentObject); |
|
268 | + $this->repository->saveDocument($documentObject); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | public function deleteDocumentBySlug($slug) |
272 | 272 | { |
273 | - $path = '/' . $slug; |
|
273 | + $path = '/' . $slug; |
|
274 | 274 | $this->repository->deleteDocumentByPath($path); |
275 | 275 | } |
276 | 276 | |
@@ -321,13 +321,13 @@ discard block |
||
321 | 321 | $brickArray[] = $brickObj; |
322 | 322 | } |
323 | 323 | |
324 | - $bricks = $documentObj->bricks; |
|
324 | + $bricks = $documentObj->bricks; |
|
325 | 325 | $bricks[$brickSlug] = $brickArray; |
326 | - $documentObj->bricks = $bricks; |
|
326 | + $documentObj->bricks = $bricks; |
|
327 | 327 | } else { |
328 | - $bricks = $documentObj->bricks; |
|
328 | + $bricks = $documentObj->bricks; |
|
329 | 329 | $bricks[$brickSlug] = $brick; |
330 | - $documentObj->bricks = $bricks; |
|
330 | + $documentObj->bricks = $bricks; |
|
331 | 331 | } |
332 | 332 | } |
333 | 333 | } |
@@ -338,9 +338,9 @@ discard block |
||
338 | 338 | $brickObj = new \stdClass(); |
339 | 339 | $brickObj->type = $brickTypeSlug; |
340 | 340 | $brickObj->fields = $brickContent; |
341 | - $dynamicBricks = $documentObj->dynamicBricks; |
|
341 | + $dynamicBricks = $documentObj->dynamicBricks; |
|
342 | 342 | $dynamicBricks[] = $brickObj; |
343 | - $documentObj->dynamicBricks = $dynamicBricks; |
|
343 | + $documentObj->dynamicBricks = $dynamicBricks; |
|
344 | 344 | } |
345 | 345 | } |
346 | 346 | } |
@@ -356,13 +356,13 @@ discard block |
||
356 | 356 | */ |
357 | 357 | public function addDocumentFolder($postValues) |
358 | 358 | { |
359 | - $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
|
360 | - if ($postValues['path'] === '/') { |
|
361 | - $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
362 | - } else { |
|
363 | - $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
364 | - } |
|
365 | - $this->repository->saveDocument($documentFolderObject); |
|
359 | + $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
|
360 | + if ($postValues['path'] === '/') { |
|
361 | + $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
362 | + } else { |
|
363 | + $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
364 | + } |
|
365 | + $this->repository->saveDocument($documentFolderObject); |
|
366 | 366 | } |
367 | 367 | |
368 | 368 | /** |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | */ |
375 | 375 | public function deleteDocumentFolderBySlug($slug) |
376 | 376 | { |
377 | - $path = '/' . $slug; |
|
377 | + $path = '/' . $slug; |
|
378 | 378 | $this->repository->deleteDocumentByPath($path); |
379 | 379 | } |
380 | 380 | |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | */ |
389 | 389 | public function getDocumentFolderBySlug($slug) |
390 | 390 | { |
391 | - $path = '/' . $slug; |
|
391 | + $path = '/' . $slug; |
|
392 | 392 | return $this->repository->getDocumentByPath($path); |
393 | 393 | } |
394 | 394 | |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | */ |
402 | 402 | public function saveDocumentFolder($postValues) |
403 | 403 | { |
404 | - $this->addDocumentFolder($postValues); |
|
404 | + $this->addDocumentFolder($postValues); |
|
405 | 405 | } |
406 | 406 | |
407 | 407 | /** |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | */ |
415 | 415 | private function getDocumentContainerByPath($path) |
416 | 416 | { |
417 | - return $this->repository->getDocumentContainerByPath($path); |
|
417 | + return $this->repository->getDocumentContainerByPath($path); |
|
418 | 418 | } |
419 | 419 | |
420 | 420 | /** |
@@ -618,9 +618,9 @@ discard block |
||
618 | 618 | $imageObject->size = $postValues['size']; |
619 | 619 | $imageObject->set = $fileNames; |
620 | 620 | |
621 | - $images = $this->repository->images; |
|
621 | + $images = $this->repository->images; |
|
622 | 622 | $images[] = $imageObject; |
623 | - $this->repository->images = $images; |
|
623 | + $this->repository->images = $images; |
|
624 | 624 | |
625 | 625 | $this->save(); |
626 | 626 | } else { |
@@ -655,7 +655,7 @@ discard block |
||
655 | 655 | /** |
656 | 656 | * @param $filename |
657 | 657 | * @return null |
658 | - */ |
|
658 | + */ |
|
659 | 659 | public function getImageByName($filename) |
660 | 660 | { |
661 | 661 | $images = $this->getImages(); |
@@ -719,9 +719,9 @@ discard block |
||
719 | 719 | $file->type = $postValues['type']; |
720 | 720 | $file->size = $postValues['size']; |
721 | 721 | |
722 | - $files = $this->repository->files; |
|
722 | + $files = $this->repository->files; |
|
723 | 723 | $files[] = $file; |
724 | - $this->repository->files = $files; |
|
724 | + $this->repository->files = $files; |
|
725 | 725 | $this->save(); |
726 | 726 | } else { |
727 | 727 | throw new \Exception('Error moving uploaded file'); |
@@ -760,7 +760,7 @@ discard block |
||
760 | 760 | /** |
761 | 761 | * @param $filename |
762 | 762 | * @return null |
763 | - */ |
|
763 | + */ |
|
764 | 764 | public function getFileByName($filename) |
765 | 765 | { |
766 | 766 | $files = $this->getFiles(); |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | /** |
776 | 776 | * @param $filename |
777 | 777 | * @throws \Exception |
778 | - */ |
|
778 | + */ |
|
779 | 779 | public function deleteFileByName($filename) |
780 | 780 | { |
781 | 781 | $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
@@ -820,9 +820,9 @@ discard block |
||
820 | 820 | { |
821 | 821 | $documentTypeObject = $this->createDocumentTypeFromPostValues($postValues); |
822 | 822 | |
823 | - $documentTypes = $this->repository->documentTypes; |
|
824 | - $documentTypes[] = $documentTypeObject; |
|
825 | - $this->repository->documentTypes = $documentTypes; |
|
823 | + $documentTypes = $this->repository->documentTypes; |
|
824 | + $documentTypes[] = $documentTypeObject; |
|
825 | + $this->repository->documentTypes = $documentTypes; |
|
826 | 826 | |
827 | 827 | $this->save(); |
828 | 828 | } |
@@ -968,9 +968,9 @@ discard block |
||
968 | 968 | { |
969 | 969 | $brickObject = $this->createBrickFromPostValues($postValues); |
970 | 970 | |
971 | - $bricks = $this->repository->bricks; |
|
972 | - $bricks[] = $brickObject; |
|
973 | - $this->repository->bricks = $bricks; |
|
971 | + $bricks = $this->repository->bricks; |
|
972 | + $bricks[] = $brickObject; |
|
973 | + $this->repository->bricks = $bricks; |
|
974 | 974 | |
975 | 975 | $this->save(); |
976 | 976 | } |
@@ -1175,9 +1175,9 @@ discard block |
||
1175 | 1175 | { |
1176 | 1176 | $imageSetObject = $this->createImageSetFromPostValues($postValues); |
1177 | 1177 | |
1178 | - $imageSet = $this->repository->imageSet; |
|
1179 | - $imageSet[] = $imageSetObject; |
|
1180 | - $this->repository->imageSet = $imageSet; |
|
1178 | + $imageSet = $this->repository->imageSet; |
|
1179 | + $imageSet[] = $imageSetObject; |
|
1180 | + $this->repository->imageSet = $imageSet; |
|
1181 | 1181 | |
1182 | 1182 | $this->save(); |
1183 | 1183 | } |