Completed
Pull Request — master (#1644)
by Rico
10:33
created
admin_users.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -770,13 +770,15 @@
 block discarded – undo
770 770
 		<p>
771 771
 		<?php if ($ucnt): ?>
772 772
 			<input type="submit" value="<?= I18N::translate('delete') ?>">
773
-			<?php else: ?>
773
+			<?php else {
774
+	: ?>
774 775
 			<?= I18N::translate('Nothing found to cleanup') ?>
775 776
 			<?php endif ?>
776 777
 		</p>
777 778
 	</form>
778 779
 	<?php
779 780
 	break;
781
+}
780 782
 
781 783
 case 'cleanup2':
782 784
 	foreach (User::all() as $user) {
Please login to merge, or discard this patch.
app/Module/BatchUpdateModule.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,8 @@  discard block
 block discarded – undo
235 235
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
236 236
 					<?php // page, which makes them all again!  ?>
237 237
 					<script>reset_reload();</script>
238
-			<?php else: ?>
238
+			<?php else {
239
+	: ?>
239 240
 					<hr>
240 241
 					<div id="batch_update2" class="col-sm-12">
241 242
 						<?php if ($this->curr_xref): ?>
@@ -273,6 +274,7 @@  discard block
 block discarded – undo
273 274
 		foreach (array_keys($this->all_xrefs) as $key) {
274 275
 			if ($key > $xref) {
275 276
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
277
+}
276 278
 				if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
277 279
 					return $key;
278 280
 				}
Please login to merge, or discard this patch.
placelist.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,8 @@  discard block
 block discarded – undo
200 200
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
201 201
 				<?php if (empty($myindilist)): ?>
202 202
 						<p><?= I18N::translate('No results found.') ?></p>
203
-				<?php else: ?>
203
+				<?php else {
204
+	: ?>
204 205
 						<?= FunctionsPrintLists::individualTable($myindilist) ?>
205 206
 					<?php endif ?>
206 207
 			</div>
@@ -216,6 +217,7 @@  discard block
 block discarded – undo
216 217
 		<?php
217 218
 		}
218 219
 		echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
220
+}
219 221
 
220 222
 		if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
221 223
 			$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
Please login to merge, or discard this patch.
message.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,8 @@  discard block
 block discarded – undo
126 126
 				<div class="form-control"><?= e(Auth::user()->getRealName()) ?></div>
127 127
 			</div>
128 128
 		</div>
129
-	<?php else: ?>
129
+	<?php else {
130
+	: ?>
130 131
 		<div class="form-group row">
131 132
 			<label class="col-sm-3 col-form-label" for="from-name">
132 133
 				<?= I18N::translate('Your name') ?>
@@ -187,6 +188,7 @@  discard block
 block discarded – undo
187 188
 function recipients($to) {
188 189
 	if ($to === 'all') {
189 190
 		$recipients = User::all();
191
+}
190 192
 	} elseif ($to === 'last_6mo') {
191 193
 		$recipients = array_filter(User::all(), function (User $user) {
192 194
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
Please login to merge, or discard this patch.
app/Module/StoriesModule.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -382,7 +382,8 @@  discard block
 block discarded – undo
382 382
 						<a href="<?= e($individual->url()) ?>#tab-stories">
383 383
 							<?= $individual->getFullName() ?>
384 384
 						</a>
385
-						<?php else: ?>
385
+						<?php else {
386
+	: ?>
386 387
 							<?= $story->xref ?>
387 388
 						<?php endif ?>
388 389
 						</td>
@@ -411,6 +412,7 @@  discard block
 block discarded – undo
411 412
 	 */
412 413
 	private function showList() {
413 414
 		global $controller, $WT_TREE;
415
+}
414 416
 
415 417
 		$controller = new PageController;
416 418
 		$controller
Please login to merge, or discard this patch.
search_advanced.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -146,7 +146,8 @@  discard block
 block discarded – undo
146 146
 					value="<?= e($controller->getValue($i)) ?>">
147 147
 						<?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0): ?>
148 148
 							<select class="form-control form-control-sm col-3" name="fields[<?= $i ?>]">
149
-								<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>>
149
+								<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) {
150
+	echo 'selected' ?>>
150 151
 									<?= I18N::translate('Exact') ?>
151 152
 								</option>
152 153
 								<option value="<?= $currentField ?>:BEGINS" <?php if (preg_match('/:BEGINS$/', $currentFieldSearch) > 0) echo 'selected' ?>>
@@ -161,13 +162,15 @@  discard block
 block discarded – undo
161 162
 						<?php else: ?>
162 163
 							<input type="hidden" name="fields[<?= $i ?>]" value="<?= $controller->getField($i) ?>">
163 164
 						<?php endif;
165
+}
164 166
 						if (preg_match('/:DATE$/', $currentFieldSearch) > 0) {
165 167
 							?>
166 168
 							<select class="form-control form-control-sm col-3" name="plusminus[<?= $i ?>]">
167 169
 								<option value="">
168 170
 									<?= I18N::translate('Exact date') ?>
169 171
 								</option>
170
-								<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected' ?>>
172
+								<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
173
+	echo 'selected' ?>>
171 174
 									<?= I18N::plural('±%s year', '±%s years', 2, I18N::number(2)) ?>
172 175
 								</option>
173 176
 								<option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) echo 'selected' ?>>
@@ -183,6 +186,7 @@  discard block
 block discarded – undo
183 186
 					//-- relative fields
184 187
 					if ($i == 0 && $fct > 4) {
185 188
 						$j = $fct;
189
+}
186 190
 						// Get the current options for Father’s and Mother’s name searches
187 191
 						$fatherGivnOption = 'SDX';
188 192
 						$fatherSurnOption = 'SDX';
Please login to merge, or discard this patch.
app/Module/FamilyNavigatorModule.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -143,7 +143,8 @@  discard block
 block discarded – undo
143 143
 							<div class="small">
144 144
 								<?= $spouse->getLifeSpan() ?>
145 145
 							</div>
146
-							<?php else: ?>
146
+							<?php else {
147
+	: ?>
147 148
 								<?= $spouse->getFullName() ?>
148 149
 							<?php endif ?>
149 150
 						</td>
@@ -153,6 +154,7 @@  discard block
 block discarded – undo
153 154
 
154 155
 				foreach ($family->getChildren() as $child) {
155 156
 					$icon = $individual === $child ? '<i class="icon-selected"></i>' : '';
157
+}
156 158
 					$menu = new Menu($icon . Functions::getCloseRelationshipName($individual, $child));
157 159
 					$menu->addSubmenu(new Menu($this->getFamily($child)));
158 160
 					?>
@@ -170,7 +172,8 @@  discard block
 block discarded – undo
170 172
 							<div class="small">
171 173
 								<?= $child->getLifeSpan() ?>
172 174
 							</div>
173
-							<?php else: ?>
175
+							<?php else {
176
+	: ?>
174 177
 								<?= $child->getFullName() ?>
175 178
 							<?php endif ?>
176 179
 						</td>
@@ -194,6 +197,7 @@  discard block
 block discarded – undo
194 197
 	private function getHTML($person, $showUnknown = false) {
195 198
 		if ($person instanceof Individual) {
196 199
 			return sprintf(self::LNK, e($person->url()), $person->getFullName());
200
+}
197 201
 		} elseif ($showUnknown) {
198 202
 			return sprintf(self::MSG, I18N::translate('unknown'));
199 203
 		} else {
Please login to merge, or discard this patch.
resources/views/blocks/changes-list.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,12 @@
 block discarded – undo
3 3
 
4 4
 <?php if ($summary !== ''): ?>
5 5
 	<span class="details_label"><?= $summary ?></span>
6
-<?php else: ?>
6
+<?php else {
7
+	: ?>
7 8
 	<?php foreach ($facts as $fact): ?>
8
-		<?php $record = $fact->getParent(); ?>
9
+		<?php $record = $fact->getParent();
10
+}
11
+?>
9 12
 		<a href="<?= e($record->url()) ?>" class="list_item name2">
10 13
 			<?= $record->getFullName() ?>
11 14
 		</a>
Please login to merge, or discard this patch.