fisharebest / webtrees

admin_site_merge.php

Braces +20 added lines, -8 removed lines

@@ -232,9 +232,12 @@ 
 				<?php endforeach; ?>
 				</tbody>
 			</table>
-			<?php else: ?>
+			<?php else {
+	: ?>
 			<p>
-				<?php echo I18N::translate('No matching facts found'); ?>
+				<?php echo I18N::translate('No matching facts found');
+}
+?>
 			</p>
 			<?php endif; ?>
 		</div>
@@ -279,9 +282,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -325,9 +331,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -341,10 +350,13 @@ 
 	</button>
 </form>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
 <form class="form form-horizontal">
-	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
+	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml();
+}
+?>">
 	<p><?php echo /* I18N: Records are indviduals, sources, etc. */ I18N::translate('Select two records to merge.'); ?></p>
 
 	<div class="form-group">

admin_trees_config.php

Braces +10 added lines, -4 removed lines

@@ -554,18 +554,24 @@
 					<div class="bg-danger text-danger">
 						<?php echo $resn->xref, ' — ', I18N::translate('this record does not exist'); ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
-						<?php echo I18N::translate('All records'); ?>
+						<?php echo I18N::translate('All records');
+}
+?>
 					</div>
 					<?php endif; ?>
 				</td>
 				<td>
 					<?php if ($resn->tag_label): ?>
 					<?php echo $resn->tag_label; ?>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
-						<?php echo I18N::translate('All facts and events'); ?>
+						<?php echo I18N::translate('All facts and events');
+}
+?>
 					</div>
 					<?php endif; ?>
 				</td>

admin_trees_duplicates.php

Braces +5 added lines, -2 removed lines

@@ -177,8 +177,11 @@
 	</li>
 <?php endforeach; ?>
 </ul>
-<?php else: ?>
-<p><?php echo I18N::translate('No duplicates have been found.'); ?></p>
+<?php else {
+	: ?>
+<p><?php echo I18N::translate('No duplicates have been found.');
+}
+?></p>
 <?php endif; ?>
 
 <?php endforeach; ?>

admin_trees_manage.php

Braces +5 added lines, -2 removed lines

@@ -433,8 +433,11 @@
 									<i class="fa fa-li fa-star"></i>
 									<?php if ($tree->getName() == Site::getPreference('DEFAULT_GEDCOM')): ?>
 										<?php echo I18N::translate('Default family tree'); ?>
-									<?php else: ?>
-										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId(); ?>.submit();">
+									<?php else {
+	: ?>
+										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId();
+}
+?>.submit();">
 											<?php echo I18N::translate('Set as default'); ?>
 											<span class="sr-only">
 										<?php echo $tree->getTitleHtml(); ?>

admin_users.php

Braces +5 added lines, -2 removed lines

@@ -791,8 +791,11 @@
 		<p>
 		<?php if ($ucnt): ?>
 			<input type="submit" value="<?php echo I18N::translate('delete'); ?>">
-			<?php else: ?>
-			<?php echo I18N::translate('Nothing found to cleanup'); ?>
+			<?php else {
+	: ?>
+			<?php echo I18N::translate('Nothing found to cleanup');
+}
+?>
 			<?php endif; ?>
 		</p>
 	</form>

app/Module/StoriesModule.php

Braces +5 added lines, -2 removed lines

@@ -389,8 +389,11 @@
 						<a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
 							<?php echo $individual->getFullName(); ?>
 						</a>
-						<?php else: ?>
-							<?php echo $story->xref; ?>
+						<?php else {
+	: ?>
+							<?php echo $story->xref;
+}
+?>
 						<?php endif; ?>
 						</td>
 						<td>

medialist.php

Braces +5 added lines, -2 removed lines

@@ -110,10 +110,13 @@
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</tr>
 			<tr>
 				<td class="descriptionbox wrap">

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;
 				}