@@ -13,6 +13,10 @@ |
||
| 13 | 13 | { |
| 14 | 14 | protected $imagesDir; |
| 15 | 15 | |
| 16 | + /** |
|
| 17 | + * @param \CloudControl\Cms\storage\Repository $repository |
|
| 18 | + * @param string $imagesDir |
|
| 19 | + */ |
|
| 16 | 20 | public function __construct($repository, $imagesDir) |
| 17 | 21 | { |
| 18 | 22 | parent::__construct($repository); |
@@ -83,6 +83,9 @@ discard block |
||
| 83 | 83 | $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $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) |
@@ -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> |
@@ -31,26 +31,26 @@ |
||
| 31 | 31 | <div class="documentActions grid-box-2"> |
| 32 | 32 | <? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?> |
| 33 | 33 | <? renderAction('Publish', |
| 34 | - 'publish', |
|
| 35 | - $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
| 36 | - 'check'); ?> |
|
| 34 | + 'publish', |
|
| 35 | + $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
| 36 | + 'check'); ?> |
|
| 37 | 37 | <? endif ?> |
| 38 | 38 | <? if ($document->state == 'published') : ?> |
| 39 | 39 | <? renderAction('Unpublish', |
| 40 | - 'unpublish', |
|
| 41 | - $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
| 42 | - 'times'); ?> |
|
| 40 | + 'unpublish', |
|
| 41 | + $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
| 42 | + 'times'); ?> |
|
| 43 | 43 | <? endif ?> |
| 44 | 44 | <? renderAction('Edit', |
| 45 | - '', |
|
| 46 | - $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
| 47 | - 'pencil'); ?> |
|
| 45 | + '', |
|
| 46 | + $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
| 47 | + 'pencil'); ?> |
|
| 48 | 48 | <? if ($document->state == 'unpublished') : ?> |
| 49 | 49 | <? renderAction('Delete', |
| 50 | - 'error', |
|
| 51 | - $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
| 52 | - 'trash', |
|
| 53 | - 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 50 | + 'error', |
|
| 51 | + $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
| 52 | + 'trash', |
|
| 53 | + 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 54 | 54 | <? endif ?> |
| 55 | 55 | </div> |
| 56 | 56 | <? } ?> |
@@ -17,14 +17,14 @@ |
||
| 17 | 17 | </div> |
| 18 | 18 | <div class="documentActions grid-box-4"> |
| 19 | 19 | <? renderAction('Edit', |
| 20 | - '', |
|
| 21 | - $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug, |
|
| 22 | - 'pencil'); ?> |
|
| 20 | + '', |
|
| 21 | + $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug, |
|
| 22 | + 'pencil'); ?> |
|
| 23 | 23 | <? renderAction('Delete', |
| 24 | - 'error', |
|
| 25 | - $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug, |
|
| 26 | - 'trash', |
|
| 27 | - 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 24 | + 'error', |
|
| 25 | + $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug, |
|
| 26 | + 'trash', |
|
| 27 | + 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
| 28 | 28 | </div> |
| 29 | 29 | <ul class="documents grid-wrapper nested<?= $root ? ' root' : '' ?>"> |
| 30 | 30 | <? foreach ($document->getContent() as $subDocument) : ?> |
@@ -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; ?> |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | - * @param $request |
|
| 71 | + * @param Request $request |
|
| 72 | 72 | * @param CmsComponent $cmsComponent |
| 73 | 73 | */ |
| 74 | 74 | private function newRoute($request, $cmsComponent) |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | - * @param $request |
|
| 86 | + * @param Request $request |
|
| 87 | 87 | * @param CmsComponent $cmsComponent |
| 88 | 88 | */ |
| 89 | 89 | private function deleteRoute($request, $cmsComponent) |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @param string $imagePath |
| 77 | 77 | * @param bool $getExtension |
| 78 | 78 | * |
| 79 | - * @return bool|int|string |
|
| 79 | + * @return integer |
|
| 80 | 80 | */ |
| 81 | 81 | public function getImageMimeType($imagePath, $getExtension = false) |
| 82 | 82 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
| 152 | - * @param $pathToBitmapFile |
|
| 152 | + * @param string $pathToBitmapFile |
|
| 153 | 153 | * |
| 154 | 154 | * @return string |
| 155 | 155 | */ |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
| 168 | - * @param $header |
|
| 168 | + * @param string $header |
|
| 169 | 169 | * |
| 170 | 170 | * @return array |
| 171 | 171 | */ |
@@ -195,14 +195,14 @@ discard block |
||
| 195 | 195 | * Loop through the data in the body of the bitmap |
| 196 | 196 | * file and calculate each individual pixel based on the |
| 197 | 197 | * bytes |
| 198 | - * @param $bodySize |
|
| 199 | - * @param $x |
|
| 198 | + * @param integer $bodySize |
|
| 199 | + * @param integer $x |
|
| 200 | 200 | * @param $width |
| 201 | - * @param $usePadding |
|
| 202 | - * @param $y |
|
| 201 | + * @param boolean $usePadding |
|
| 202 | + * @param integer $y |
|
| 203 | 203 | * @param $height |
| 204 | - * @param $body |
|
| 205 | - * @param $image |
|
| 204 | + * @param string $body |
|
| 205 | + * @param resource $image |
|
| 206 | 206 | */ |
| 207 | 207 | private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image) |
| 208 | 208 | { |
@@ -10,6 +10,10 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | protected $filesDir; |
| 12 | 12 | |
| 13 | + /** |
|
| 14 | + * @param \CloudControl\Cms\storage\Repository $repository |
|
| 15 | + * @param string $filesDir |
|
| 16 | + */ |
|
| 13 | 17 | public function __construct($repository, $filesDir) |
| 14 | 18 | { |
| 15 | 19 | parent::__construct($repository); |
@@ -102,7 +106,7 @@ discard block |
||
| 102 | 106 | } |
| 103 | 107 | |
| 104 | 108 | /** |
| 105 | - * @return mixed |
|
| 109 | + * @return string |
|
| 106 | 110 | */ |
| 107 | 111 | public function getFilesDir() |
| 108 | 112 | { |