@@ -2,19 +2,19 @@ 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 | */ |
| 12 | 12 | class JsonStorage implements Storage |
| 13 | 13 | { |
| 14 | 14 | private $storageDir; |
| 15 | - /** |
|
| 16 | - * @var Repository |
|
| 17 | - */ |
|
| 15 | + /** |
|
| 16 | + * @var Repository |
|
| 17 | + */ |
|
| 18 | 18 | private $repository; |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -76,12 +76,12 @@ discard block |
||
| 76 | 76 | return $return; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - /** |
|
| 80 | - * Get user by slug |
|
| 81 | - * |
|
| 82 | - * @param $slug |
|
| 83 | - * @return array |
|
| 84 | - */ |
|
| 79 | + /** |
|
| 80 | + * Get user by slug |
|
| 81 | + * |
|
| 82 | + * @param $slug |
|
| 83 | + * @return array |
|
| 84 | + */ |
|
| 85 | 85 | public function getUserBySlug($slug) |
| 86 | 86 | { |
| 87 | 87 | $return = array(); |
@@ -97,23 +97,23 @@ discard block |
||
| 97 | 97 | return $return; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - /** |
|
| 101 | - * Get all users |
|
| 102 | - * |
|
| 103 | - * @return mixed |
|
| 104 | - */ |
|
| 100 | + /** |
|
| 101 | + * Get all users |
|
| 102 | + * |
|
| 103 | + * @return mixed |
|
| 104 | + */ |
|
| 105 | 105 | public function getUsers() |
| 106 | 106 | { |
| 107 | 107 | return $this->repository->users; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - /** |
|
| 111 | - * Save user |
|
| 112 | - * |
|
| 113 | - * @param $slug |
|
| 114 | - * @param $postValues |
|
| 115 | - * @throws \Exception |
|
| 116 | - */ |
|
| 110 | + /** |
|
| 111 | + * Save user |
|
| 112 | + * |
|
| 113 | + * @param $slug |
|
| 114 | + * @param $postValues |
|
| 115 | + * @throws \Exception |
|
| 116 | + */ |
|
| 117 | 117 | public function saveUser($slug, $postValues) |
| 118 | 118 | { |
| 119 | 119 | $userObj = $this->createUserFromPostValues($postValues); |
@@ -134,12 +134,12 @@ discard block |
||
| 134 | 134 | $this->save(); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - /** |
|
| 138 | - * Add user |
|
| 139 | - * |
|
| 140 | - * @param $postValues |
|
| 141 | - * @throws \Exception |
|
| 142 | - */ |
|
| 137 | + /** |
|
| 138 | + * Add user |
|
| 139 | + * |
|
| 140 | + * @param $postValues |
|
| 141 | + * @throws \Exception |
|
| 142 | + */ |
|
| 143 | 143 | public function addUser($postValues) |
| 144 | 144 | { |
| 145 | 145 | $userObj = $this->createUserFromPostValues($postValues); |
@@ -148,17 +148,17 @@ discard block |
||
| 148 | 148 | if (!empty($doesItExist)) { |
| 149 | 149 | throw new \Exception('Trying to add username that already exists.'); |
| 150 | 150 | } |
| 151 | - $users = $this->repository->users; |
|
| 152 | - $users[] = $userObj; |
|
| 153 | - $this->repository->users = $users; |
|
| 151 | + $users = $this->repository->users; |
|
| 152 | + $users[] = $userObj; |
|
| 153 | + $this->repository->users = $users; |
|
| 154 | 154 | $this->save(); |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - /** |
|
| 158 | - * Delete user by slug |
|
| 159 | - * @param $slug |
|
| 160 | - * @throws \Exception |
|
| 161 | - */ |
|
| 157 | + /** |
|
| 158 | + * Delete user by slug |
|
| 159 | + * @param $slug |
|
| 160 | + * @throws \Exception |
|
| 161 | + */ |
|
| 162 | 162 | public function deleteUserBySlug($slug) |
| 163 | 163 | { |
| 164 | 164 | $userToDelete = $this->getUserBySlug($slug); |
@@ -175,12 +175,12 @@ discard block |
||
| 175 | 175 | $this->save(); |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - /** |
|
| 179 | - * Create user from POST values |
|
| 180 | - * @param $postValues |
|
| 181 | - * @return \stdClass |
|
| 182 | - * @throws \Exception |
|
| 183 | - */ |
|
| 178 | + /** |
|
| 179 | + * Create user from POST values |
|
| 180 | + * @param $postValues |
|
| 181 | + * @return \stdClass |
|
| 182 | + * @throws \Exception |
|
| 183 | + */ |
|
| 184 | 184 | private function createUserFromPostValues($postValues) |
| 185 | 185 | { |
| 186 | 186 | if (isset($postValues['username'])) { |
@@ -229,40 +229,40 @@ discard block |
||
| 229 | 229 | */ |
| 230 | 230 | public function getDocumentBySlug($slug) |
| 231 | 231 | { |
| 232 | - $path = '/' . $slug; |
|
| 232 | + $path = '/' . $slug; |
|
| 233 | 233 | return $this->repository->getDocumentByPath($path); |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | public function saveDocument($postValues) |
| 237 | 237 | { |
| 238 | - $oldPath = '/' . $postValues['path']; |
|
| 239 | - |
|
| 240 | - $container = $this->getDocumentContainerByPath($oldPath); |
|
| 241 | - $documentObject = $this->createDocumentFromPostValues($postValues); |
|
| 242 | - if ($container->path === '/') { |
|
| 243 | - $newPath = $container->path . $documentObject->slug; |
|
| 244 | - } else { |
|
| 245 | - $newPath = $container->path . '/' . $documentObject->slug; |
|
| 246 | - } |
|
| 247 | - $documentObject->path = $newPath; |
|
| 248 | - $this->repository->saveDocument($documentObject); |
|
| 249 | - } |
|
| 238 | + $oldPath = '/' . $postValues['path']; |
|
| 239 | + |
|
| 240 | + $container = $this->getDocumentContainerByPath($oldPath); |
|
| 241 | + $documentObject = $this->createDocumentFromPostValues($postValues); |
|
| 242 | + if ($container->path === '/') { |
|
| 243 | + $newPath = $container->path . $documentObject->slug; |
|
| 244 | + } else { |
|
| 245 | + $newPath = $container->path . '/' . $documentObject->slug; |
|
| 246 | + } |
|
| 247 | + $documentObject->path = $newPath; |
|
| 248 | + $this->repository->saveDocument($documentObject); |
|
| 249 | + } |
|
| 250 | 250 | |
| 251 | 251 | public function addDocument($postValues) |
| 252 | 252 | { |
| 253 | 253 | $documentObject = $this->createDocumentFromPostValues($postValues); |
| 254 | - if ($postValues['path'] === '/') { |
|
| 255 | - $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
| 256 | - } else { |
|
| 257 | - $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
| 258 | - } |
|
| 254 | + if ($postValues['path'] === '/') { |
|
| 255 | + $documentObject->path = $postValues['path'] . $documentObject->slug; |
|
| 256 | + } else { |
|
| 257 | + $documentObject->path = $postValues['path'] . '/' . $documentObject->slug; |
|
| 258 | + } |
|
| 259 | 259 | |
| 260 | - $this->repository->saveDocument($documentObject); |
|
| 260 | + $this->repository->saveDocument($documentObject); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | public function deleteDocumentBySlug($slug) |
| 264 | 264 | { |
| 265 | - $path = '/' . $slug; |
|
| 265 | + $path = '/' . $slug; |
|
| 266 | 266 | $this->repository->deleteDocumentByPath($path); |
| 267 | 267 | } |
| 268 | 268 | |
@@ -313,13 +313,13 @@ discard block |
||
| 313 | 313 | $brickArray[] = $brickObj; |
| 314 | 314 | } |
| 315 | 315 | |
| 316 | - $bricks = $documentObj->bricks; |
|
| 316 | + $bricks = $documentObj->bricks; |
|
| 317 | 317 | $bricks[$brickSlug] = $brickArray; |
| 318 | - $documentObj->bricks = $bricks; |
|
| 318 | + $documentObj->bricks = $bricks; |
|
| 319 | 319 | } else { |
| 320 | - $bricks = $documentObj->bricks; |
|
| 320 | + $bricks = $documentObj->bricks; |
|
| 321 | 321 | $bricks[$brickSlug] = $brick; |
| 322 | - $documentObj->bricks = $bricks; |
|
| 322 | + $documentObj->bricks = $bricks; |
|
| 323 | 323 | } |
| 324 | 324 | } |
| 325 | 325 | } |
@@ -330,9 +330,9 @@ discard block |
||
| 330 | 330 | $brickObj = new \stdClass(); |
| 331 | 331 | $brickObj->type = $brickTypeSlug; |
| 332 | 332 | $brickObj->fields = $brickContent; |
| 333 | - $dynamicBricks = $documentObj->dynamicBricks; |
|
| 333 | + $dynamicBricks = $documentObj->dynamicBricks; |
|
| 334 | 334 | $dynamicBricks[] = $brickObj; |
| 335 | - $documentObj->dynamicBricks = $dynamicBricks; |
|
| 335 | + $documentObj->dynamicBricks = $dynamicBricks; |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | } |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | */ |
| 349 | 349 | public function addDocumentFolder($postValues) |
| 350 | 350 | { |
| 351 | - $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
|
| 352 | - if ($postValues['path'] === '/') { |
|
| 353 | - $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
| 354 | - } else { |
|
| 355 | - $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
| 356 | - } |
|
| 357 | - $this->repository->saveDocument($documentFolderObject); |
|
| 351 | + $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues); |
|
| 352 | + if ($postValues['path'] === '/') { |
|
| 353 | + $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug; |
|
| 354 | + } else { |
|
| 355 | + $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug; |
|
| 356 | + } |
|
| 357 | + $this->repository->saveDocument($documentFolderObject); |
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | /** |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | */ |
| 367 | 367 | public function deleteDocumentFolderBySlug($slug) |
| 368 | 368 | { |
| 369 | - $path = '/' . $slug; |
|
| 369 | + $path = '/' . $slug; |
|
| 370 | 370 | $this->repository->deleteDocumentByPath($path); |
| 371 | 371 | } |
| 372 | 372 | |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | */ |
| 381 | 381 | public function getDocumentFolderBySlug($slug) |
| 382 | 382 | { |
| 383 | - $path = '/' . $slug; |
|
| 383 | + $path = '/' . $slug; |
|
| 384 | 384 | return $this->repository->getDocumentByPath($path); |
| 385 | 385 | } |
| 386 | 386 | |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | */ |
| 394 | 394 | public function saveDocumentFolder($postValues) |
| 395 | 395 | { |
| 396 | - $this->addDocumentFolder($postValues); |
|
| 396 | + $this->addDocumentFolder($postValues); |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | /** |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | private function getDocumentContainerByPath($path) |
| 408 | 408 | { |
| 409 | - return $this->repository->getDocumentContainerByPath($path); |
|
| 409 | + return $this->repository->getDocumentContainerByPath($path); |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | /** |
@@ -610,9 +610,9 @@ discard block |
||
| 610 | 610 | $imageObject->size = $postValues['size']; |
| 611 | 611 | $imageObject->set = $fileNames; |
| 612 | 612 | |
| 613 | - $images = $this->repository->images; |
|
| 613 | + $images = $this->repository->images; |
|
| 614 | 614 | $images[] = $imageObject; |
| 615 | - $this->repository->images = $images; |
|
| 615 | + $this->repository->images = $images; |
|
| 616 | 616 | |
| 617 | 617 | $this->save(); |
| 618 | 618 | } else { |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | /** |
| 648 | 648 | * @param $filename |
| 649 | 649 | * @return null |
| 650 | - */ |
|
| 650 | + */ |
|
| 651 | 651 | public function getImageByName($filename) |
| 652 | 652 | { |
| 653 | 653 | $images = $this->getImages(); |
@@ -698,9 +698,9 @@ discard block |
||
| 698 | 698 | $file->type = $postValues['type']; |
| 699 | 699 | $file->size = $postValues['size']; |
| 700 | 700 | |
| 701 | - $files = $this->repository->files; |
|
| 701 | + $files = $this->repository->files; |
|
| 702 | 702 | $files[] = $file; |
| 703 | - $this->repository->files = $files; |
|
| 703 | + $this->repository->files = $files; |
|
| 704 | 704 | $this->save(); |
| 705 | 705 | } else { |
| 706 | 706 | throw new \Exception('Error moving uploaded file'); |
@@ -739,7 +739,7 @@ discard block |
||
| 739 | 739 | /** |
| 740 | 740 | * @param $filename |
| 741 | 741 | * @return null |
| 742 | - */ |
|
| 742 | + */ |
|
| 743 | 743 | public function getFileByName($filename) |
| 744 | 744 | { |
| 745 | 745 | $files = $this->getFiles(); |
@@ -754,7 +754,7 @@ discard block |
||
| 754 | 754 | /** |
| 755 | 755 | * @param $filename |
| 756 | 756 | * @throws \Exception |
| 757 | - */ |
|
| 757 | + */ |
|
| 758 | 758 | public function deleteFileByName($filename) |
| 759 | 759 | { |
| 760 | 760 | $destinationPath = realpath(__DIR__ . '/../../www/files/'); |
@@ -799,9 +799,9 @@ discard block |
||
| 799 | 799 | { |
| 800 | 800 | $documentTypeObject = $this->createDocumentTypeFromPostValues($postValues); |
| 801 | 801 | |
| 802 | - $documentTypes = $this->repository->documentTypes; |
|
| 803 | - $documentTypes[] = $documentTypeObject; |
|
| 804 | - $this->repository->documentTypes = $documentTypes; |
|
| 802 | + $documentTypes = $this->repository->documentTypes; |
|
| 803 | + $documentTypes[] = $documentTypeObject; |
|
| 804 | + $this->repository->documentTypes = $documentTypes; |
|
| 805 | 805 | |
| 806 | 806 | $this->save(); |
| 807 | 807 | } |
@@ -947,9 +947,9 @@ discard block |
||
| 947 | 947 | { |
| 948 | 948 | $brickObject = $this->createBrickFromPostValues($postValues); |
| 949 | 949 | |
| 950 | - $bricks = $this->repository->bricks; |
|
| 951 | - $bricks[] = $brickObject; |
|
| 952 | - $this->repository->bricks = $bricks; |
|
| 950 | + $bricks = $this->repository->bricks; |
|
| 951 | + $bricks[] = $brickObject; |
|
| 952 | + $this->repository->bricks = $bricks; |
|
| 953 | 953 | |
| 954 | 954 | $this->save(); |
| 955 | 955 | } |
@@ -1154,9 +1154,9 @@ discard block |
||
| 1154 | 1154 | { |
| 1155 | 1155 | $imageSetObject = $this->createImageSetFromPostValues($postValues); |
| 1156 | 1156 | |
| 1157 | - $imageSet = $this->repository->imageSet; |
|
| 1158 | - $imageSet[] = $imageSetObject; |
|
| 1159 | - $this->repository->imageSet = $imageSet; |
|
| 1157 | + $imageSet = $this->repository->imageSet; |
|
| 1158 | + $imageSet[] = $imageSetObject; |
|
| 1159 | + $this->repository->imageSet = $imageSet; |
|
| 1160 | 1160 | |
| 1161 | 1161 | $this->save(); |
| 1162 | 1162 | } |