| @@ -12,11 +12,11 @@ discard block | ||
| 12 | 12 | <div class="form-element"> | 
| 13 | 13 | <label for="<?=$field->slug?>"><?=$field->title?></label> | 
| 14 | 14 | <? if (isset($dynamicBrick)) : | 
| 15 | - $fieldSlug = $field->slug; | |
| 16 | - $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; | |
| 17 | - else : | |
| 18 | - $value = ''; | |
| 19 | - endif ?> | |
| 15 | + $fieldSlug = $field->slug; | |
| 16 | + $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; | |
| 17 | + else : | |
| 18 | + $value = ''; | |
| 19 | + endif ?> | |
| 20 | 20 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> | 
| 21 | 21 | <ul class="grid-wrapper sortable"> | 
| 22 | 22 | <li class="grid-container"> | 
| @@ -44,10 +44,10 @@ discard block | ||
| 44 | 44 | </div> | 
| 45 | 45 | </li> | 
| 46 | 46 | <? if (isset($dynamicBrick)) : | 
| 47 | - $fieldSlug = $field->slug; | |
| 48 | - $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); | |
| 49 | - array_shift($iterable); | |
| 50 | - ?> | |
| 47 | + $fieldSlug = $field->slug; | |
| 48 | + $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); | |
| 49 | + array_shift($iterable); | |
| 50 | + ?> | |
| 51 | 51 | <? foreach ($iterable as $value) : ?> | 
| 52 | 52 | |
| 53 | 53 | <li class="grid-container"> | 
| @@ -70,10 +70,10 @@ discard block | ||
| 70 | 70 | <a class="btn js-addmultiple">+</a> | 
| 71 | 71 | <? elseif ($field->multiple == true) : ?> | 
| 72 | 72 | <? if (isset($dynamicBrick)) : | 
| 73 | - $fieldSlug = $field->slug; | |
| 74 | - $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); | |
| 75 | - array_shift($iterable); | |
| 76 | - ?> | |
| 73 | + $fieldSlug = $field->slug; | |
| 74 | + $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); | |
| 75 | + array_shift($iterable); | |
| 76 | + ?> | |
| 77 | 77 | <? foreach ($iterable as $value) : ?> | 
| 78 | 78 | |
| 79 | 79 | <li> | 
| @@ -22,11 +22,11 @@ discard block | ||
| 22 | 22 | <div class="form-element"> | 
| 23 | 23 | <label for="<?=$field->slug?>"><?=$field->title?></label> | 
| 24 | 24 | <? if (isset($document)) : | 
| 25 | - $fieldSlug = $field->slug; | |
| 26 | - $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; | |
| 27 | - else : | |
| 28 | - $value = ''; | |
| 29 | - endif ?> | |
| 25 | + $fieldSlug = $field->slug; | |
| 26 | + $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; | |
| 27 | + else : | |
| 28 | + $value = ''; | |
| 29 | + endif ?> | |
| 30 | 30 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> | 
| 31 | 31 | <ul class="grid-wrapper sortable"> | 
| 32 | 32 | <li class="grid-container"> | 
| @@ -54,10 +54,10 @@ discard block | ||
| 54 | 54 | </div> | 
| 55 | 55 | </li> | 
| 56 | 56 | <? if (isset($document)) : | 
| 57 | - $fieldSlug = $field->slug; | |
| 58 | - $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); | |
| 59 | - array_shift($iterable); | |
| 60 | - ?> | |
| 57 | + $fieldSlug = $field->slug; | |
| 58 | + $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); | |
| 59 | + array_shift($iterable); | |
| 60 | + ?> | |
| 61 | 61 | <? foreach ($iterable as $value) : ?> | 
| 62 | 62 | |
| 63 | 63 | <li class="grid-container"> | 
| @@ -80,10 +80,10 @@ discard block | ||
| 80 | 80 | <a class="btn js-addmultiple">+</a> | 
| 81 | 81 | <? elseif ($field->multiple == true) : ?> | 
| 82 | 82 | <? if (isset($document)) : | 
| 83 | - $fieldSlug = $field->slug; | |
| 84 | - $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); | |
| 85 | - array_shift($iterable); | |
| 86 | - ?> | |
| 83 | + $fieldSlug = $field->slug; | |
| 84 | + $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); | |
| 85 | + array_shift($iterable); | |
| 86 | + ?> | |
| 87 | 87 | <? foreach ($iterable as $value) : ?> | 
| 88 | 88 | |
| 89 | 89 | <li> | 
| @@ -118,10 +118,10 @@ discard block | ||
| 118 | 118 | <? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?> | 
| 119 | 119 | <? foreach ($brickArray as $dynamicBrick) : ?> | 
| 120 | 120 | <? foreach ($bricks as $brick) : | 
| 121 | -										if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) { | |
| 122 | - break; | |
| 123 | - } | |
| 124 | - endforeach ?> | |
| 121 | +                                        if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) { | |
| 122 | + break; | |
| 123 | + } | |
| 124 | + endforeach ?> | |
| 125 | 125 | <? if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) : ?> | 
| 126 | 126 | <li class="brick form-element"> | 
| 127 | 127 | |
| @@ -142,12 +142,12 @@ discard block | ||
| 142 | 142 | <div class="form-element"> | 
| 143 | 143 | <label for="<?=$field->slug?>"><?=$field->title?></label> | 
| 144 | 144 | <? if (isset($document)) : | 
| 145 | - $brickSlug = $brick->slug; | |
| 146 | - $fieldSlug = $field->slug; | |
| 147 | - $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; | |
| 148 | - else : | |
| 149 | - $value = ''; | |
| 150 | - endif ?> | |
| 145 | + $brickSlug = $brick->slug; | |
| 146 | + $fieldSlug = $field->slug; | |
| 147 | + $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; | |
| 148 | + else : | |
| 149 | + $value = ''; | |
| 150 | + endif ?> | |
| 151 | 151 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> | 
| 152 | 152 | <ul class="grid-wrapper sortable"> | 
| 153 | 153 | <li class="grid-container"> | 
| @@ -175,11 +175,11 @@ discard block | ||
| 175 | 175 | </div> | 
| 176 | 176 | </li> | 
| 177 | 177 | <? if (isset($document)) : | 
| 178 | - $brickSlug = $brick->slug; | |
| 179 | - $fieldSlug = $field->slug; | |
| 180 | - $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); | |
| 181 | - array_shift($iterable); | |
| 182 | - ?> | |
| 178 | + $brickSlug = $brick->slug; | |
| 179 | + $fieldSlug = $field->slug; | |
| 180 | + $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); | |
| 181 | + array_shift($iterable); | |
| 182 | + ?> | |
| 183 | 183 | <? foreach ($iterable as $value) : ?> | 
| 184 | 184 | |
| 185 | 185 | <li class="grid-container"> | 
| @@ -202,11 +202,11 @@ discard block | ||
| 202 | 202 | <a class="btn js-addmultiple">+</a> | 
| 203 | 203 | <? elseif ($field->multiple == true) : ?> | 
| 204 | 204 | <? if (isset($document)) : | 
| 205 | - $brickSlug = $brick->slug; | |
| 206 | - $fieldSlug = $field->slug; | |
| 207 | - $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); | |
| 208 | - array_shift($iterable); | |
| 209 | - ?> | |
| 205 | + $brickSlug = $brick->slug; | |
| 206 | + $fieldSlug = $field->slug; | |
| 207 | + $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); | |
| 208 | + array_shift($iterable); | |
| 209 | + ?> | |
| 210 | 210 | <? foreach ($iterable as $value) : ?> | 
| 211 | 211 | |
| 212 | 212 | <li> | 
| @@ -246,10 +246,10 @@ discard block | ||
| 246 | 246 | <? if (isset($document)) : ?> | 
| 247 | 247 | <? foreach ($document->dynamicBricks as $dynamicBrick) : ?> | 
| 248 | 248 | <? foreach ($bricks as $brick) : | 
| 249 | -						if ($brick->slug == $dynamicBrick->type) { | |
| 250 | - break; | |
| 251 | - } | |
| 252 | - endforeach ?> | |
| 249 | +                        if ($brick->slug == $dynamicBrick->type) { | |
| 250 | + break; | |
| 251 | + } | |
| 252 | + endforeach ?> | |
| 253 | 253 | <li class="brick form-element"> | 
| 254 | 254 | <label><?=$brick->title?></label> | 
| 255 | 255 | <?$static = false; ?> | 
| @@ -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) : ?> | 
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | 56 | /** | 
| 57 | - * @param $request | |
| 57 | + * @param Request $request | |
| 58 | 58 | * @param CmsComponent $cmsComponent | 
| 59 | 59 | * | 
| 60 | 60 | * @throws \Exception | 
| @@ -89,7 +89,7 @@ discard block | ||
| 89 | 89 | } | 
| 90 | 90 | |
| 91 | 91 | /** | 
| 92 | - * @param $request | |
| 92 | + * @param Request $request | |
| 93 | 93 | * @param CmsComponent $cmsComponent | 
| 94 | 94 | */ | 
| 95 | 95 | private function editDocumentRoute($request, $cmsComponent) | 
| @@ -119,7 +119,7 @@ discard block | ||
| 119 | 119 | } | 
| 120 | 120 | |
| 121 | 121 | /** | 
| 122 | - * @param $request | |
| 122 | + * @param Request $request | |
| 123 | 123 | * @param CmsComponent $cmsComponent | 
| 124 | 124 | */ | 
| 125 | 125 | private function getBrickRoute($request, $cmsComponent) | 
| @@ -140,7 +140,7 @@ discard block | ||
| 140 | 140 | } | 
| 141 | 141 | |
| 142 | 142 | /** | 
| 143 | - * @param $request | |
| 143 | + * @param Request $request | |
| 144 | 144 | * @param CmsComponent $cmsComponent | 
| 145 | 145 | */ | 
| 146 | 146 | private function deleteDocumentRoute($request, $cmsComponent) | 
| @@ -152,7 +152,7 @@ discard block | ||
| 152 | 152 | } | 
| 153 | 153 | |
| 154 | 154 | /** | 
| 155 | - * @param $request | |
| 155 | + * @param Request $request | |
| 156 | 156 | * @param CmsComponent $cmsComponent | 
| 157 | 157 | */ | 
| 158 | 158 | private function publishDocumentRoute($request, $cmsComponent) | 
| @@ -166,7 +166,7 @@ discard block | ||
| 166 | 166 | } | 
| 167 | 167 | |
| 168 | 168 | /** | 
| 169 | - * @param $request | |
| 169 | + * @param Request $request | |
| 170 | 170 | * @param CmsComponent $cmsComponent | 
| 171 | 171 | */ | 
| 172 | 172 | private function unpublishDocumentRoute($request, $cmsComponent) | 
| @@ -17,7 +17,7 @@ | ||
| 17 | 17 | /** | 
| 18 | 18 | * ImagesRouting constructor. | 
| 19 | 19 | * @param \CloudControl\Cms\cc\Request $request | 
| 20 | - * @param mixed|string $relativeCmsUri | |
| 20 | + * @param string $relativeCmsUri | |
| 21 | 21 | * @param CmsComponent $cmsComponent | 
| 22 | 22 | */ | 
| 23 | 23 | public function __construct(Request $request, $relativeCmsUri, CmsComponent $cmsComponent) | 
| @@ -18,7 +18,7 @@ | ||
| 18 | 18 | /** | 
| 19 | 19 | * SitemapRouting constructor. | 
| 20 | 20 | * @param \CloudControl\Cms\cc\Request $request | 
| 21 | - * @param mixed|string $relativeCmsUri | |
| 21 | + * @param string $relativeCmsUri | |
| 22 | 22 | * @param CmsComponent $cmsComponent | 
| 23 | 23 | */ | 
| 24 | 24 | public function __construct(Request $request, $relativeCmsUri, CmsComponent $cmsComponent) | 
| @@ -154,8 +154,9 @@ | ||
| 154 | 154 | } | 
| 155 | 155 | |
| 156 | 156 | /** | 
| 157 | - * @param $template | |
| 157 | + * @param string $template | |
| 158 | 158 | * @param null | Application $application | 
| 159 | + * @param Application $application | |
| 159 | 160 | * @return string | 
| 160 | 161 | */ | 
| 161 | 162 | protected function getTemplateDir($template, $application = null) | 
| @@ -124,8 +124,8 @@ | ||
| 124 | 124 | } | 
| 125 | 125 | |
| 126 | 126 | /** | 
| 127 | - * @param $lang | |
| 128 | - * @param $request | |
| 127 | + * @param string $lang | |
| 128 | + * @param Request $request | |
| 129 | 129 | */ | 
| 130 | 130 | protected function checkForceRedirect($lang, $request) | 
| 131 | 131 |      { |