fisharebest / webtrees

medialist.php

Braces +3 added lines, -1 removed lines

@@ -109,7 +109,8 @@ 
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
 				<?php endif ?>
@@ -133,6 +134,7 @@ 
 						<?php
 						foreach (['10', '20', '30', '40', '50', '75', '100', '125', '150', '200'] as $selectEntry) {
 							echo '<option value="', $selectEntry, '" ';
+}
 							if ($selectEntry == $max) {
 								echo 'selected';
 							}

admin_users.php

Braces +3 added lines, -1 removed lines

@@ -770,13 +770,15 @@
 		<p>
 		<?php if ($ucnt): ?>
 			<input type="submit" value="<?= I18N::translate('delete') ?>">
-			<?php else: ?>
+			<?php else {
+	: ?>
 			<?= I18N::translate('Nothing found to cleanup') ?>
 			<?php endif ?>
 		</p>
 	</form>
 	<?php
 	break;
+}
 
 case 'cleanup2':
 	foreach (User::all() as $user) {

search_advanced.php

Braces +3 added lines, -1 removed lines

@@ -154,7 +154,8 @@ 
 				<input type="text" id="value<?= $i ?>" name="values[<?= $i ?>]" value="<?= Filter::escapeHtml($controller->getValue($i)) ?>"<?= substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : '' ?>>
 			<?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0) { ?>
 				<select name="fields[<?= $i ?>]">
-					<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Exact') ?></option>
+					<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) {
+	echo 'selected' ?>><?= I18N::translate('Exact') ?></option>
 					<option value="<?= $currentField ?>:BEGINS" <?php if (preg_match('/:BEGINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Begins with') ?></option>
 					<option value="<?= $currentField ?>:CONTAINS" <?php if (preg_match('/:CONTAINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Contains') ?></option>
 					<option value="<?= $currentField ?>:SDX" <?php if (preg_match('/:SDX$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Sounds like') ?></option>
@@ -176,6 +177,7 @@ 
 		//-- relative fields
 		if ($i == 0 && $fct > 4) {
 			$j = $fct;
+}
 			// Get the current options for Father’s and Mother’s name searches
 			$fatherGivnOption = 'SDX';
 			$fatherSurnOption = 'SDX';

app/Module/BatchUpdateModule.php

Braces +3 added lines, -1 removed lines

@@ -235,7 +235,8 @@ 
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
 					<?php // page, which makes them all again!  ?>
 					<script>reset_reload();</script>
-			<?php else: ?>
+			<?php else {
+	: ?>
 					<hr>
 					<div id="batch_update2" class="col-sm-12">
 						<?php if ($this->curr_xref): ?>
@@ -273,6 +274,7 @@ 
 		foreach (array_keys($this->all_xrefs) as $key) {
 			if ($key > $xref) {
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
+}
 				if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
 					return $key;
 				}

message.php

Braces +3 added lines, -1 removed lines

@@ -128,7 +128,8 @@ 
 				<div class="form-control"><?= Filter::escapeHtml(Auth::user()->getRealName()) ?></div>
 			</div>
 		</div>
-	<?php else: ?>
+	<?php else {
+	: ?>
 		<div class="form-group row">
 			<label class="col-sm-3 col-form-label" for="from-name">
 				<?= I18N::translate('Your name') ?>
@@ -186,6 +187,7 @@ 
 function recipients($to) {
 	if ($to === 'all') {
 		$recipients =	User::all();
+}
 	} elseif ($to === 'last_6mo') {
 		$recipients = array_filter(User::all(), function(User $user) {
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;

app/Module/StoriesModule.php

Braces +3 added lines, -1 removed lines

@@ -381,7 +381,8 @@ 
 						<a href="<?= $individual->getHtmlUrl() ?>#tab-stories">
 							<?= $individual->getFullName() ?>
 						</a>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							<?= $story->xref ?>
 						<?php endif ?>
 						</td>
@@ -410,6 +411,7 @@ 
 	 */
 	private function showList() {
 		global $controller, $WT_TREE;
+}
 
 		$controller = new PageController;
 		$controller

app/Module/GoogleMapsModule.php

Switch Indentation +18 added lines, -18 removed lines

@@ -1120,24 +1120,24 @@
 										if ($latlongval[$i] == $latlongval[$k]) {
 											$dups++;
 											switch ($dups) {
-												case 1:
-													$marker_number = $curgen . 'L';
-													break;
-												case 2:
-													$marker_number = $curgen . 'R';
-													break;
-												case 3:
-													$marker_number = $curgen . 'Ls';
-													break;
-												case 4:
-													$marker_number = $curgen . 'Rs';
-													break;
-												case 5: //adjust position where markers have same coodinates
-												default:
-													$marker_number = $curgen;
-													$lon[$i] += 0.0025;
-													$lat[$i] += 0.0025;
-													break;
+											case 1:
+												$marker_number = $curgen . 'L';
+												break;
+											case 2:
+												$marker_number = $curgen . 'R';
+												break;
+											case 3:
+												$marker_number = $curgen . 'Ls';
+												break;
+											case 4:
+												$marker_number = $curgen . 'Rs';
+												break;
+											case 5: //adjust position where markers have same coodinates
+											default:
+												$marker_number = $curgen;
+												$lon[$i] += 0.0025;
+												$lat[$i] += 0.0025;
+												break;
 											}
 										}
 									}

placelist.php

Braces +3 added lines, -1 removed lines

@@ -200,7 +200,8 @@ 
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
 				<?php if (empty($myindilist)): ?>
 					<p><?= I18N::translate('No results found.') ?></p>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
 				<?php endif ?>
 			</div>
@@ -216,6 +217,7 @@ 
 		<?php
 	}
 	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
+}
 
 	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
 		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);

app/Module/FamilyNavigatorModule.php

Braces +6 added lines, -2 removed lines

@@ -140,7 +140,8 @@ 
 					<div class="font9">
 						<?= $spouse->getLifeSpan() ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<?= $spouse->getFullName() ?>
 					<?php endif ?>
 				</td>
@@ -150,6 +151,7 @@ 
 
 		foreach ($family->getChildren() as $child) {
 			$menu = new Menu(Functions::getCloseRelationshipName($controller->record, $child));
+}
 			$menu->addSubmenu(new Menu($this->getFamily($child)));
 			?>
 			<tr>
@@ -166,7 +168,8 @@ 
 					<div class="font9">
 						<?= $child->getLifeSpan() ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<?= $child->getFullName() ?>
 					<?php endif ?>
 				</td>
@@ -186,6 +189,7 @@ 
 	private function getHTML($person, $showUnknown = false) {
 		if ($person instanceof Individual) {
 			return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName());
+}
 		} elseif ($showUnknown) {
 			return sprintf(self::MSG, I18N::translate('unknown'));
 		} else {