@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | { |
| 56 | 56 | if (!isset($_GET['unsanitized'])) { |
| 57 | 57 | $search = array( |
| 58 | - '/\>[^\S ]+/s', // strip whitespaces after tags, except space |
|
| 59 | - '/[^\S ]+\</s', // strip whitespaces before tags, except space |
|
| 60 | - '/(\s)+/s', // shorten multiple whitespace sequences |
|
| 58 | + '/\>[^\S ]+/s', // strip whitespaces after tags, except space |
|
| 59 | + '/[^\S ]+\</s', // strip whitespaces before tags, except space |
|
| 60 | + '/(\s)+/s', // shorten multiple whitespace sequences |
|
| 61 | 61 | '/<!--(.|\s)*?-->/' // Remove HTML comments |
| 62 | 62 | ); |
| 63 | 63 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | function utf8Convert($array) |
| 87 | 87 | { |
| 88 | - array_walk_recursive($array, function (&$item) { |
|
| 88 | + array_walk_recursive($array, function(&$item) { |
|
| 89 | 89 | if (!mb_detect_encoding($item, 'utf-8', true)) { |
| 90 | 90 | $item = utf8_encode($item); |
| 91 | 91 | } |
@@ -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) : ?> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | <input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" /> |
| 18 | 18 | </div> |
| 19 | 19 | <? endif ?> |
| 20 | - <?$fieldPrefix='fields';?> |
|
| 20 | + <?$fieldPrefix = 'fields'; ?> |
|
| 21 | 21 | <? foreach ($documentType->fields as $field) : ?> |
| 22 | 22 | <div class="form-element"> |
| 23 | 23 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | </div> |
| 74 | 74 | </div> |
| 75 | 75 | </li> |
| 76 | - <?$value='';?> |
|
| 76 | + <?$value = ''; ?> |
|
| 77 | 77 | <? endforeach ?> |
| 78 | 78 | <? endif ?> |
| 79 | 79 | </ul> |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
| 94 | 94 | </div> |
| 95 | 95 | </li> |
| 96 | - <?$value='';?> |
|
| 96 | + <?$value = ''; ?> |
|
| 97 | 97 | <? endforeach ?> |
| 98 | 98 | <? endif ?> |
| 99 | 99 | </div> |
@@ -102,17 +102,17 @@ discard block |
||
| 102 | 102 | <a class="btn js-addrtemultiple">+</a> |
| 103 | 103 | <? endif ?> |
| 104 | 104 | </div> |
| 105 | - <?$value='';?> |
|
| 105 | + <?$value = ''; ?> |
|
| 106 | 106 | <? endforeach ?> |
| 107 | 107 | <hr /> |
| 108 | - <? $static_brick_nr = 0;?> |
|
| 108 | + <? $static_brick_nr = 0; ?> |
|
| 109 | 109 | <? foreach ($documentType->bricks as $brick) : ?> |
| 110 | 110 | <div class="brick"> |
| 111 | 111 | <label><?=$brick->title?></label> |
| 112 | 112 | <? if ($brick->multiple == 'true') : ?> |
| 113 | 113 | <input type="hidden" value="<?=$brick->brickSlug?>"/> |
| 114 | 114 | <input type="hidden" value="<?=$brick->slug?>"/> |
| 115 | - <?$myBrickSlug=$brick->slug;?> |
|
| 115 | + <?$myBrickSlug = $brick->slug; ?> |
|
| 116 | 116 | <ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable"> |
| 117 | 117 | <? if (isset($document)) : ?> |
| 118 | 118 | <? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?> |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a> |
| 137 | 137 | <?$static_brick_nr += 1?> |
| 138 | 138 | <? else : ?> |
| 139 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
| 139 | + <?$fieldPrefix = 'bricks[' . $brick->slug . '][fields]'; ?> |
|
| 140 | 140 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
| 141 | 141 | <? foreach ($brick->structure->fields as $field) : ?> |
| 142 | 142 | <div class="form-element"> |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | </div> |
| 196 | 196 | </div> |
| 197 | 197 | </li> |
| 198 | - <?$value='';?> |
|
| 198 | + <?$value = ''; ?> |
|
| 199 | 199 | <? endforeach ?> |
| 200 | 200 | <? endif ?> |
| 201 | 201 | </ul> |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | <? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
| 217 | 217 | </div> |
| 218 | 218 | </li> |
| 219 | - <?$value='';?> |
|
| 219 | + <?$value = ''; ?> |
|
| 220 | 220 | <? endforeach ?> |
| 221 | 221 | <? endif ?> |
| 222 | 222 | </div> |
@@ -225,12 +225,12 @@ discard block |
||
| 225 | 225 | <a class="btn js-addrtemultiple">+</a> |
| 226 | 226 | <? endif ?> |
| 227 | 227 | </div> |
| 228 | - <?$value='';?> |
|
| 228 | + <?$value = ''; ?> |
|
| 229 | 229 | <? endforeach ?> |
| 230 | 230 | <? endif ?> |
| 231 | 231 | </div> |
| 232 | 232 | <hr /> |
| 233 | - <? endforeach;?> |
|
| 233 | + <? endforeach; ?> |
|
| 234 | 234 | |
| 235 | 235 | |
| 236 | 236 | |
@@ -1,7 +1,8 @@ discard block |
||
| 1 | 1 | <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>"> |
| 2 | 2 | <? if (!isset($hideTitleAndState)) : ?> |
| 3 | 3 | <input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/> |
| 4 | - <? else : ?> |
|
| 4 | + <? else { |
|
| 5 | + : ?> |
|
| 5 | 6 | <input type="hidden" name="formId" value="<?= $formId ?>"/> |
| 6 | 7 | <a name="<?= $formId ?>"></a> |
| 7 | 8 | <? endif ?> |
@@ -17,15 +18,19 @@ discard block |
||
| 17 | 18 | <input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" /> |
| 18 | 19 | </div> |
| 19 | 20 | <? endif ?> |
| 20 | - <?$fieldPrefix='fields';?> |
|
| 21 | + <?$fieldPrefix='fields'; |
|
| 22 | +} |
|
| 23 | +?> |
|
| 21 | 24 | <? foreach ($documentType->fields as $field) : ?> |
| 22 | 25 | <div class="form-element"> |
| 23 | 26 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
| 24 | 27 | <? if (isset($document)) : |
| 25 | 28 | $fieldSlug = $field->slug; |
| 26 | 29 | $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; |
| 27 | - else : |
|
| 30 | + else { |
|
| 31 | + : |
|
| 28 | 32 | $value = ''; |
| 33 | + } |
|
| 29 | 34 | endif ?> |
| 30 | 35 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
| 31 | 36 | <ul class="grid-wrapper sortable"> |
@@ -135,8 +140,11 @@ discard block |
||
| 135 | 140 | </ul> |
| 136 | 141 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a> |
| 137 | 142 | <?$static_brick_nr += 1?> |
| 138 | - <? else : ?> |
|
| 139 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
| 143 | + <? else { |
|
| 144 | + : ?> |
|
| 145 | + <?$fieldPrefix='bricks[' . $brick->slug . '][fields]'; |
|
| 146 | +} |
|
| 147 | +?> |
|
| 140 | 148 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
| 141 | 149 | <? foreach ($brick->structure->fields as $field) : ?> |
| 142 | 150 | <div class="form-element"> |
@@ -145,8 +153,10 @@ discard block |
||
| 145 | 153 | $brickSlug = $brick->slug; |
| 146 | 154 | $fieldSlug = $field->slug; |
| 147 | 155 | $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; |
| 148 | - else : |
|
| 156 | + else { |
|
| 157 | + : |
|
| 149 | 158 | $value = ''; |
| 159 | + } |
|
| 150 | 160 | endif ?> |
| 151 | 161 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
| 152 | 162 | <ul class="grid-wrapper sortable"> |
@@ -18,7 +18,8 @@ discard block |
||
| 18 | 18 | <i class="fa fa-exclamation-triangle"></i> Search index is no longer in sync with documents. |
| 19 | 19 | <a href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/search/update-index?returnUrl=<?= urlencode($request::$subfolders . $cmsPrefix . '/documents') ?>" title="Update Index">Update Index</a> |
| 20 | 20 | </div> |
| 21 | - <? else : ?> |
|
| 21 | + <? else { |
|
| 22 | + : ?> |
|
| 22 | 23 | <div class="message valid"> |
| 23 | 24 | <i class="fa fa-check"></i> Search index is in sync with documents. |
| 24 | 25 | </div> |
@@ -47,7 +48,9 @@ discard block |
||
| 47 | 48 | <? foreach ($documents as $document) : ?> |
| 48 | 49 | <li class="grid-container"> |
| 49 | 50 | <? if ($document->type == 'document') : ?> |
| 50 | - <? renderDocument($document, $cmsPrefix, '', $request); ?> |
|
| 51 | + <? renderDocument($document, $cmsPrefix, '', $request); |
|
| 52 | +} |
|
| 53 | +?> |
|
| 51 | 54 | <? elseif ($document->type == 'folder') : ?> |
| 52 | 55 | <? renderFolder($document, $cmsPrefix, '', true, $request); ?> |
| 53 | 56 | <? endif ?> |
@@ -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) |