@@ -83,6 +83,9 @@ discard block |
||
| 83 | 83 | $this->storage = new Storage($this->getStorageDir(), $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) |
@@ -268,6 +271,9 @@ discard block |
||
| 268 | 271 | return $this->config->templateDir; |
| 269 | 272 | } |
| 270 | 273 | |
| 274 | + /** |
|
| 275 | + * @return string |
|
| 276 | + */ |
|
| 271 | 277 | public function getStorageDir() |
| 272 | 278 | { |
| 273 | 279 | return $this->config->storageDir; |
@@ -141,8 +141,8 @@ |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * @param $template |
|
| 145 | - * @param null $application |
|
| 144 | + * @param string $template |
|
| 145 | + * @param null|Application $application |
|
| 146 | 146 | * @return string |
| 147 | 147 | */ |
| 148 | 148 | protected function getTemplatePath($template, $application=null) |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
| 183 | - * @param \cc\Request $request |
|
| 183 | + * @param \CloudControl\Cms\cc\Request $request |
|
| 184 | 184 | * @return array |
| 185 | 185 | */ |
| 186 | 186 | private function getPostValues($request) |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
| 294 | - * @return \cc\Request |
|
| 294 | + * @return \CloudControl\Cms\cc\Request |
|
| 295 | 295 | */ |
| 296 | 296 | private function setPathBackup() |
| 297 | 297 | { |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | - * @param \cc\Request $request |
|
| 308 | + * @param \CloudControl\Cms\cc\Request $request |
|
| 309 | 309 | */ |
| 310 | 310 | private function resetPathBackup($request) |
| 311 | 311 | { |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /** |
| 320 | - * @param $form |
|
| 320 | + * @param string|null $form |
|
| 321 | 321 | */ |
| 322 | 322 | private function setFormParameter($form) |
| 323 | 323 | { |
@@ -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); |
@@ -63,7 +63,9 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | protected function calculateX($imageResource) |
| 65 | 65 | { |
| 66 | - if (intval($this->_x) === $this->_x) return $this->_x; |
|
| 66 | + if (intval($this->_x) === $this->_x) { |
|
| 67 | + return $this->_x; |
|
| 68 | + } |
|
| 67 | 69 | |
| 68 | 70 | $x = strtolower($this->_x); |
| 69 | 71 | |
@@ -88,7 +90,9 @@ discard block |
||
| 88 | 90 | */ |
| 89 | 91 | public function calculateY($imageResource) |
| 90 | 92 | { |
| 91 | - if (intval($this->_y) === $this->_y) return $this->_y; |
|
| 93 | + if (intval($this->_y) === $this->_y) { |
|
| 94 | + return $this->_y; |
|
| 95 | + } |
|
| 92 | 96 | |
| 93 | 97 | $y = strtolower($this->_y); |
| 94 | 98 | |
@@ -125,7 +129,9 @@ discard block |
||
| 125 | 129 | */ |
| 126 | 130 | public function GetWatermark() |
| 127 | 131 | { |
| 128 | - if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark'); |
|
| 132 | + if ($this->_watermark == null) { |
|
| 133 | + throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark'); |
|
| 134 | + } |
|
| 129 | 135 | return $this->_watermark; |
| 130 | 136 | } |
| 131 | 137 | |
@@ -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 : '' ?>" 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"> |