Passed
Push — develop ( 82ef93...b529d9 )
by Jens
03:30
created
src/templates/documents/brick.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@  discard block
 block discarded – undo
12 12
 			<div class="form-element">
13 13
 				<label for="<?=$field->slug?>"><?=$field->title?></label>
14 14
 				<?php 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
 				<?php 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
 block discarded – undo
44 44
 						</div>
45 45
 					</li>
46 46
 					<?php 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
 						<?php foreach ($iterable as $value) : ?>
52 52
 
53 53
 						<li class="grid-container">
@@ -70,10 +70,10 @@  discard block
 block discarded – undo
70 70
 				<a class="btn js-addmultiple">+</a>
71 71
 				<?php elseif ($field->multiple == true) : ?>
72 72
 					<?php 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
 						<?php foreach ($iterable as $value) : ?>
78 78
 
79 79
 						<li>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,8 +14,10 @@
 block discarded – undo
14 14
 				<?php if (isset($dynamicBrick)) :
15 15
 					$fieldSlug = $field->slug;
16 16
 					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
17
-				else :
17
+				else {
18
+				    :
18 19
 					$value = '';
20
+				}
19 21
 				endif ?>
20 22
 				<?php if ($field->multiple == true && $field->type != 'Rich Text') : ?>
21 23
 				<ul class="grid-wrapper sortable">
Please login to merge, or discard this patch.
src/templates/documents/document-form-form.php 2 patches
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -22,11 +22,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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; ?>
Please login to merge, or discard this patch.
Braces   +21 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/templates/documents/fieldTypes/Rich-Text.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
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>
Please login to merge, or discard this patch.
src/templates/documents.php 1 patch
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,8 @@  discard block
 block discarded – undo
19 19
                 <a href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/search/update-index?returnUrl=<?= urlencode($request::$subfolders . $cmsPrefix . '/documents') ?>"
20 20
                    title="Update Index">Update Index</a>
21 21
             </div>
22
-        <?php else : ?>
22
+        <?php else {
23
+    : ?>
23 24
             <div class="message valid">
24 25
                 <i class="fa fa-check"></i>
25 26
                 Search index is in sync with documents.
@@ -50,6 +51,7 @@  discard block
 block discarded – undo
50 51
         </tr>
51 52
         <?php
52 53
         $parentPath = substr($path, 0, strrpos($path, '/'));
54
+}
53 55
         if ($path !== '/' && substr_count($path, '/') === 1) {
54 56
             $parentPath = '/';
55 57
         }
@@ -69,8 +71,11 @@  discard block
 block discarded – undo
69 71
             <tr>
70 72
                 <?php if ($document->type === 'folder') : ?>
71 73
                     <?php include(__DIR__ . '/documents/folder.php') ?>
72
-                <?php else : ?>
73
-                    <?php include(__DIR__ . '/documents/document.php'); ?>
74
+                <?php else {
75
+    : ?>
76
+                    <?php include(__DIR__ . '/documents/document.php');
77
+}
78
+?>
74 79
                 <?php endif ?>
75 80
             </tr>
76 81
         <?php endforeach ?>
Please login to merge, or discard this patch.