@@ -22,11 +22,11 @@ discard block |
||
22 | 22 | <div class="form-element"> |
23 | 23 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
24 | 24 | <?php 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 | <?php 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 | <?php 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 | <?php 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 | <?php elseif ($field->multiple == true) : ?> |
82 | 82 | <?php 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 | <?php foreach ($iterable as $value) : ?> |
88 | 88 | |
89 | 89 | <li> |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | <?php foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?> |
119 | 119 | <?php foreach ($brickArray as $dynamicBrick) : ?> |
120 | 120 | <?php 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 | <?php 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 | <?php 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 | <?php 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 | <?php 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 | <?php 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 | <?php elseif ($field->multiple == true) : ?> |
204 | 204 | <?php 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 | <?php foreach ($iterable as $value) : ?> |
211 | 211 | |
212 | 212 | <li> |
@@ -246,10 +246,10 @@ discard block |
||
246 | 246 | <?php if (isset($document)) : ?> |
247 | 247 | <?php foreach ($document->dynamicBricks as $dynamicBrick) : ?> |
248 | 248 | <?php 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 | <?php $static = false; ?> |
@@ -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 | <?php endif ?> |
20 | - <?php $fieldPrefix='fields';?> |
|
20 | + <?php $fieldPrefix = 'fields'; ?> |
|
21 | 21 | <?php 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 | - <?php $value='';?> |
|
76 | + <?php $value = ''; ?> |
|
77 | 77 | <?php endforeach ?> |
78 | 78 | <?php endif ?> |
79 | 79 | </ul> |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | <?php include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
94 | 94 | </div> |
95 | 95 | </li> |
96 | - <?php $value='';?> |
|
96 | + <?php $value = ''; ?> |
|
97 | 97 | <?php endforeach ?> |
98 | 98 | <?php endif ?> |
99 | 99 | </div> |
@@ -102,17 +102,17 @@ discard block |
||
102 | 102 | <a class="btn js-addrtemultiple">+</a> |
103 | 103 | <?php endif ?> |
104 | 104 | </div> |
105 | - <?php $value='';?> |
|
105 | + <?php $value = ''; ?> |
|
106 | 106 | <?php endforeach ?> |
107 | 107 | <hr /> |
108 | - <?php $static_brick_nr = 0;?> |
|
108 | + <?php $static_brick_nr = 0; ?> |
|
109 | 109 | <?php foreach ($documentType->bricks as $brick) : ?> |
110 | 110 | <div class="brick"> |
111 | 111 | <label><?=$brick->title?></label> |
112 | 112 | <?php if ($brick->multiple == 'true') : ?> |
113 | 113 | <input type="hidden" value="<?=$brick->brickSlug?>"/> |
114 | 114 | <input type="hidden" value="<?=$brick->slug?>"/> |
115 | - <?php $myBrickSlug=$brick->slug;?> |
|
115 | + <?php $myBrickSlug = $brick->slug; ?> |
|
116 | 116 | <ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable"> |
117 | 117 | <?php if (isset($document)) : ?> |
118 | 118 | <?php 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 | <?php $static_brick_nr += 1?> |
138 | 138 | <?php else : ?> |
139 | - <?php $fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
139 | + <?php $fieldPrefix = 'bricks[' . $brick->slug . '][fields]'; ?> |
|
140 | 140 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
141 | 141 | <?php 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 | - <?php $value='';?> |
|
198 | + <?php $value = ''; ?> |
|
199 | 199 | <?php endforeach ?> |
200 | 200 | <?php endif ?> |
201 | 201 | </ul> |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | <?php include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?> |
217 | 217 | </div> |
218 | 218 | </li> |
219 | - <?php $value='';?> |
|
219 | + <?php $value = ''; ?> |
|
220 | 220 | <?php endforeach ?> |
221 | 221 | <?php endif ?> |
222 | 222 | </div> |
@@ -225,12 +225,12 @@ discard block |
||
225 | 225 | <a class="btn js-addrtemultiple">+</a> |
226 | 226 | <?php endif ?> |
227 | 227 | </div> |
228 | - <?php $value='';?> |
|
228 | + <?php $value = ''; ?> |
|
229 | 229 | <?php endforeach ?> |
230 | 230 | <?php endif ?> |
231 | 231 | </div> |
232 | 232 | <hr /> |
233 | - <?php endforeach;?> |
|
233 | + <?php 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 | <?php if (!isset($hideTitleAndState)) : ?> |
3 | 3 | <input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/> |
4 | - <?php else : ?> |
|
4 | + <?php else { |
|
5 | + : ?> |
|
5 | 6 | <input type="hidden" name="formId" value="<?= $formId ?>"/> |
6 | 7 | <a name="<?= $formId ?>"></a> |
7 | 8 | <?php 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 | <?php endif ?> |
20 | - <?php $fieldPrefix='fields';?> |
|
21 | + <?php $fieldPrefix='fields'; |
|
22 | +} |
|
23 | +?> |
|
21 | 24 | <?php foreach ($documentType->fields as $field) : ?> |
22 | 25 | <div class="form-element"> |
23 | 26 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
24 | 27 | <?php 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 | <?php 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 | <?php $static_brick_nr += 1?> |
138 | - <?php else : ?> |
|
139 | - <?php $fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
143 | + <?php else { |
|
144 | + : ?> |
|
145 | + <?php $fieldPrefix='bricks[' . $brick->slug . '][fields]'; |
|
146 | +} |
|
147 | +?> |
|
140 | 148 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
141 | 149 | <?php 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 | <?php if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
152 | 162 | <ul class="grid-wrapper sortable"> |
@@ -260,7 +270,8 @@ discard block |
||
260 | 270 | </ul> |
261 | 271 | </div> |
262 | 272 | <?php endif ?> |
263 | - <?php else : ?> |
|
273 | + <?php else { |
|
274 | + : ?> |
|
264 | 275 | <div class="form-element"> |
265 | 276 | <label for="documentType">Document Type</label> |
266 | 277 | <select id="documentType" name="documentType"> |
@@ -277,6 +288,8 @@ discard block |
||
277 | 288 | <input class="btn" type="submit" name="btn_save_and_publish" value="Save and publish now"/> |
278 | 289 | <?php else : ?> |
279 | 290 | <input class="btn" type="submit" value="Create"/> |
280 | - <?php endif; ?> |
|
291 | + <?php endif; |
|
292 | +} |
|
293 | +?> |
|
281 | 294 | </div> |
282 | 295 | </form> |
283 | 296 | \ No newline at end of file |
@@ -55,7 +55,7 @@ |
||
55 | 55 | */ |
56 | 56 | public function __toString() |
57 | 57 | { |
58 | - return (string)print_r(self::$instance, true); |
|
58 | + return (string) print_r(self::$instance, true); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -35,7 +35,7 @@ |
||
35 | 35 | */ |
36 | 36 | public function __toString() |
37 | 37 | { |
38 | - return (string)$this->filteredString; |
|
38 | + return (string) $this->filteredString; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -43,7 +43,7 @@ |
||
43 | 43 | { |
44 | 44 | if (!isset($this->set->{$imageVariant})) { |
45 | 45 | throw new \Exception('Image variant `' . $imageVariant . '` does not exist. Existing variants are ' . implode(', ', |
46 | - array_keys((array)$this->set))); |
|
46 | + array_keys((array) $this->set))); |
|
47 | 47 | } |
48 | 48 | return Request::$subfolders . $this->imagePath . '/' . $this->set->{$imageVariant}; |
49 | 49 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | */ |
25 | 25 | public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem) |
26 | 26 | { |
27 | - $this->parameters = (array)$matchedSitemapItem->parameters; |
|
27 | + $this->parameters = (array) $matchedSitemapItem->parameters; |
|
28 | 28 | $selfParameters = $this->getParametersForNameSpace('self'); |
29 | 29 | $this->parameters = array_merge($this->parameters, $selfParameters); |
30 | 30 | parent::__construct($template, $request, $this->parameters, $matchedSitemapItem); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function __construct($template, Request $request, $parameters, $matchedSitemapItem) |
41 | 41 | { |
42 | - $this->parameters = (array)$parameters; |
|
42 | + $this->parameters = (array) $parameters; |
|
43 | 43 | $this->checkParameters(); |
44 | 44 | |
45 | 45 | $lang = substr(isset($_SERVER[self::HTTP_ACCEPT_LANGUAGE]) ? $_SERVER[self::HTTP_ACCEPT_LANGUAGE] : self::$DEFAULT_LANGUAGE, |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | unset($this->parameters[self::PARAMETER_LANGUAGE_PARAMETER_NAME]); |
79 | 79 | } |
80 | 80 | if (isset($this->parameters[self::PARAMETER_FORCE_REDIRECT])) { |
81 | - $this->forceRedirect = (bool)$this->parameters[self::PARAMETER_FORCE_REDIRECT]; |
|
81 | + $this->forceRedirect = (bool) $this->parameters[self::PARAMETER_FORCE_REDIRECT]; |
|
82 | 82 | unset($this->parameters[self::PARAMETER_FORCE_REDIRECT]); |
83 | 83 | } |
84 | 84 | } |
@@ -6,7 +6,7 @@ |
||
6 | 6 | ?> |
7 | 7 | <div class="rte"> |
8 | 8 | <div id="summernote_<?= str_replace(']', '-', str_replace('[', '-', |
9 | - $fieldPrefix)) . $field->slug ?>_rte_<?= $summernoteInstances ?>" class="summernote"><?= isset($value) ? $value : '' ?></div> |
|
9 | + $fieldPrefix)) . $field->slug ?>_rte_<?= $summernoteInstances ?>" class="summernote"><?= isset($value) ? $value : '' ?></div> |
|
10 | 10 | </div> |
11 | 11 | <textarea style="display:none;" id="summernote_<?= $field->slug ?>_container_<?= $summernoteInstances ?>" name="<?= $fieldPrefix ?>[<?= $field->slug ?>][]"></textarea> |
12 | 12 | <script> |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function SetTransparency($transparency) |
39 | 39 | { |
40 | - $this->_transparency = (int)$transparency; |
|
40 | + $this->_transparency = (int) $transparency; |
|
41 | 41 | return $this; |
42 | 42 | } |
43 | 43 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | protected function calculateX($imageResource) |
66 | 66 | { |
67 | - if ((int)$this->_x === $this->_x) { |
|
67 | + if ((int) $this->_x === $this->_x) { |
|
68 | 68 | return $this->_x; |
69 | 69 | } |
70 | 70 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | } elseif ($x == 'right') { |
81 | 81 | $x = $imageWidth - $watermarkWidth; |
82 | 82 | } |
83 | - return (int)$x; |
|
83 | + return (int) $x; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function calculateY($imageResource) |
94 | 94 | { |
95 | - if ((int)$this->_y === $this->_y) { |
|
95 | + if ((int) $this->_y === $this->_y) { |
|
96 | 96 | return $this->_y; |
97 | 97 | } |
98 | 98 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | } elseif ($y == 'bottom') { |
109 | 109 | $y = $imageHeight - $watermarkHeight; |
110 | 110 | } |
111 | - return (int)$y; |
|
111 | + return (int) $y; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $cacheExists = $this->cache !== false; |
102 | 102 | $cacheExpired = false; |
103 | 103 | if ($cacheExists) { |
104 | - $cacheCreationStamp = (int)$this->cache->creationStamp; |
|
104 | + $cacheCreationStamp = (int) $this->cache->creationStamp; |
|
105 | 105 | $currentTime = time(); |
106 | 106 | $cacheAge = $currentTime - $cacheCreationStamp; |
107 | 107 | $maxAgeInterval = new \DateInterval($this->maxAge); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | private function setHeadersFromCache() |
129 | 129 | { |
130 | 130 | if (isset($this->cache->headers)) { |
131 | - $headers = (array)json_decode($this->cache->headers); |
|
131 | + $headers = (array) json_decode($this->cache->headers); |
|
132 | 132 | /** @var array $headers */ |
133 | 133 | foreach ($headers as $headerName => $headerContent) { |
134 | 134 | ResponseHeaders::add($headerName, $headerContent); |