@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | /** |
| 198 | - * @param $request |
|
| 198 | + * @param \CloudControl\Cms\cc\Request $request |
|
| 199 | 199 | * |
| 200 | 200 | * @return mixed|string |
| 201 | 201 | */ |
@@ -228,6 +228,9 @@ discard block |
||
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | + /** |
|
| 232 | + * @param \CloudControl\Cms\cc\Request $request |
|
| 233 | + */ |
|
| 231 | 234 | private function logOffRouting($request, $relativeCmsUri) |
| 232 | 235 | { |
| 233 | 236 | if ($relativeCmsUri == '/log-off') { |
@@ -327,7 +330,7 @@ discard block |
||
| 327 | 330 | } |
| 328 | 331 | |
| 329 | 332 | /** |
| 330 | - * @param $crypt |
|
| 333 | + * @param Crypt $crypt |
|
| 331 | 334 | * @param $request |
| 332 | 335 | */ |
| 333 | 336 | protected function invalidCredentials($crypt, $request) |
@@ -339,7 +342,7 @@ discard block |
||
| 339 | 342 | |
| 340 | 343 | /** |
| 341 | 344 | * @param $user |
| 342 | - * @param $crypt |
|
| 345 | + * @param Crypt $crypt |
|
| 343 | 346 | * @param $request |
| 344 | 347 | */ |
| 345 | 348 | protected function checkPassword($user, $crypt, $request) |
@@ -359,7 +362,7 @@ discard block |
||
| 359 | 362 | } |
| 360 | 363 | |
| 361 | 364 | /** |
| 362 | - * @param $request |
|
| 365 | + * @param \CloudControl\Cms\cc\Request $request |
|
| 363 | 366 | */ |
| 364 | 367 | protected function checkLoginAttempt($request) |
| 365 | 368 | { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | - * @param $request |
|
| 48 | + * @param Request $request |
|
| 49 | 49 | * @param CmsComponent $cmsComponent |
| 50 | 50 | */ |
| 51 | 51 | private function newRoute($request, $cmsComponent) |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * @param $request |
|
| 63 | + * @param Request $request |
|
| 64 | 64 | * @param CmsComponent $cmsComponent |
| 65 | 65 | */ |
| 66 | 66 | private function editRoute($request, $cmsComponent) |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | - * @param $request |
|
| 81 | + * @param Request $request |
|
| 82 | 82 | * @param CmsComponent $cmsComponent |
| 83 | 83 | */ |
| 84 | 84 | private function deleteRoute($request, $cmsComponent) |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | - * @param $request |
|
| 48 | + * @param Request $request |
|
| 49 | 49 | * @param CmsComponent $cmsComponent |
| 50 | 50 | */ |
| 51 | 51 | private function newRoute($request, $cmsComponent) |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * @param $request |
|
| 63 | + * @param Request $request |
|
| 64 | 64 | * @param CmsComponent $cmsComponent |
| 65 | 65 | */ |
| 66 | 66 | private function editRoute($request, $cmsComponent) |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | - * @param $request |
|
| 81 | + * @param Request $request |
|
| 82 | 82 | * @param CmsComponent $cmsComponent |
| 83 | 83 | */ |
| 84 | 84 | private function deleteRoute($request, $cmsComponent) |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | - * @param $request |
|
| 35 | + * @param Request $request |
|
| 36 | 36 | * @param CmsComponent $cmsComponent |
| 37 | 37 | */ |
| 38 | 38 | private function newFolderRoute($request, $cmsComponent) |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | - * @param $request |
|
| 51 | + * @param Request $request |
|
| 52 | 52 | * @param CmsComponent $cmsComponent |
| 53 | 53 | */ |
| 54 | 54 | private function editFolderRoute($request, $cmsComponent) |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | - * @param $request |
|
| 78 | + * @param Request $request |
|
| 79 | 79 | * @param CmsComponent $cmsComponent |
| 80 | 80 | */ |
| 81 | 81 | private function deleteFolderRoute($request, $cmsComponent) |
@@ -35,8 +35,8 @@ |
||
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | - * @param $request |
|
| 39 | - * @param $relativeCmsUri |
|
| 38 | + * @param Request $request |
|
| 39 | + * @param string $relativeCmsUri |
|
| 40 | 40 | * @param CmsComponent $cmsComponent |
| 41 | 41 | * @throws \Exception |
| 42 | 42 | */ |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | - * @param $request |
|
| 59 | + * @param Request $request |
|
| 60 | 60 | * @param CmsComponent $cmsComponent |
| 61 | 61 | */ |
| 62 | 62 | private function newRoute($request, $cmsComponent) |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | - * @param $request |
|
| 74 | + * @param Request $request |
|
| 75 | 75 | * @param CmsComponent $cmsComponent |
| 76 | 76 | */ |
| 77 | 77 | private function deleteRoute($request, $cmsComponent) |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
| 85 | - * @param $request |
|
| 85 | + * @param Request $request |
|
| 86 | 86 | * @param CmsComponent $cmsComponent |
| 87 | 87 | */ |
| 88 | 88 | private function showRoute($request, $cmsComponent) |
@@ -31,29 +31,29 @@ |
||
| 31 | 31 | </div> |
| 32 | 32 | <div class="documentActions grid-box-2"> |
| 33 | 33 | <? renderAction( |
| 34 | - $document->state == 'unpublished' || $document->unpublishedChanges, |
|
| 35 | - 'Publish', |
|
| 36 | - 'publish', |
|
| 37 | - $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
| 38 | - 'check'); ?> |
|
| 34 | + $document->state == 'unpublished' || $document->unpublishedChanges, |
|
| 35 | + 'Publish', |
|
| 36 | + 'publish', |
|
| 37 | + $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
| 38 | + 'check'); ?> |
|
| 39 | 39 | <? renderAction( |
| 40 | - $document->state == 'published', |
|
| 41 | - 'Unpublish', |
|
| 42 | - 'unpublish', |
|
| 43 | - $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
| 44 | - 'times'); ?> |
|
| 40 | + $document->state == 'published', |
|
| 41 | + 'Unpublish', |
|
| 42 | + 'unpublish', |
|
| 43 | + $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
| 44 | + 'times'); ?> |
|
| 45 | 45 | <? renderAction( |
| 46 | - true, |
|
| 47 | - 'Edit', |
|
| 48 | - '', |
|
| 49 | - $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
| 50 | - 'pencil'); ?> |
|
| 46 | + true, |
|
| 47 | + 'Edit', |
|
| 48 | + '', |
|
| 49 | + $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
| 50 | + 'pencil'); ?> |
|
| 51 | 51 | <? renderAction( |
| 52 | - $document->state == 'unpublished', |
|
| 53 | - 'Delete', |
|
| 54 | - 'error', |
|
| 55 | - $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
| 56 | - 'trash', |
|
| 57 | - 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 52 | + $document->state == 'unpublished', |
|
| 53 | + 'Delete', |
|
| 54 | + 'error', |
|
| 55 | + $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
| 56 | + 'trash', |
|
| 57 | + 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 58 | 58 | </div> |
| 59 | 59 | <? } ?> |
@@ -17,18 +17,18 @@ |
||
| 17 | 17 | </div> |
| 18 | 18 | <div class="documentActions grid-box-4"> |
| 19 | 19 | <? renderAction( |
| 20 | - true, |
|
| 21 | - 'Edit', |
|
| 22 | - '', |
|
| 23 | - $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug, |
|
| 24 | - 'pencil'); ?> |
|
| 20 | + true, |
|
| 21 | + 'Edit', |
|
| 22 | + '', |
|
| 23 | + $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug, |
|
| 24 | + 'pencil'); ?> |
|
| 25 | 25 | <? renderAction( |
| 26 | - true, |
|
| 27 | - 'Delete', |
|
| 28 | - 'error', |
|
| 29 | - $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug, |
|
| 30 | - 'trash', |
|
| 31 | - 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 26 | + true, |
|
| 27 | + 'Delete', |
|
| 28 | + 'error', |
|
| 29 | + $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug, |
|
| 30 | + 'trash', |
|
| 31 | + 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 32 | 32 | </div> |
| 33 | 33 | <ul class="documents grid-wrapper nested<?= $root ? ' root' : '' ?>"> |
| 34 | 34 | <? foreach ($document->getContent() as $subDocument) : ?> |
@@ -83,6 +83,9 @@ discard block |
||
| 83 | 83 | $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->imagesDir, $this->config->filesDir); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | + /** |
|
| 87 | + * @param Request $request |
|
| 88 | + */ |
|
| 86 | 89 | private function redirectMatching($request) |
| 87 | 90 | { |
| 88 | 91 | $redirects = $this->storage->getRedirects()->getRedirects(); |
@@ -112,7 +115,7 @@ discard block |
||
| 112 | 115 | * Loop through sitemap items and see if one matches the requestUri. |
| 113 | 116 | * If it does, add it tot the matchedSitemapItems array |
| 114 | 117 | * |
| 115 | - * @param $request |
|
| 118 | + * @param Request $request |
|
| 116 | 119 | */ |
| 117 | 120 | private function sitemapMatching($request) |
| 118 | 121 | { |
@@ -177,7 +180,7 @@ discard block |
||
| 177 | 180 | * @param array $parameters |
| 178 | 181 | * @param \stdClass|null $matchedSitemapItem |
| 179 | 182 | * |
| 180 | - * @return mixed |
|
| 183 | + * @return Component |
|
| 181 | 184 | * @throws \Exception |
| 182 | 185 | */ |
| 183 | 186 | private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem) |