fisharebest / webtrees

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) {

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

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

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

search_advanced.php

Braces +6 added lines, -2 removed lines

@@ -146,7 +146,8 @@ 
 					value="<?= Html::escape($controller->getValue($i)) ?>">
 						<?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0): ?>
 							<select class="form-control form-control-sm col-3" name="fields[<?= $i ?>]">
-								<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>>
+								<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' ?>>
@@ -161,13 +162,15 @@ 
 						<?php else: ?>
 							<input type="hidden" name="fields[<?= $i ?>]" value="<?= $controller->getField($i) ?>">
 						<?php endif;
+}
 						if (preg_match('/:DATE$/', $currentFieldSearch) > 0) {
 							?>
 							<select class="form-control form-control-sm col-3" name="plusminus[<?= $i ?>]">
 								<option value="">
 									<?= I18N::translate('Exact date') ?>
 								</option>
-								<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected' ?>>
+								<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
+	echo 'selected' ?>>
 									<?= I18N::plural('±%s year', '±%s years', 2, I18N::number(2)) ?>
 								</option>
 								<option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) echo 'selected' ?>>
@@ -183,6 +186,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/Functions/FunctionsPrintFacts.php

Braces +3 added lines, -1 removed lines

@@ -191,7 +191,8 @@ 
 			<div class="editfacts">
 				<?php if ($fact->getTag() === 'FILE' && $fact->getParent() instanceof Media): ?>
 					<?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=media-edit&xref=' . $parent->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $parent->getTree()->getNameHtml()]) ?>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $parent->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $parent->getTree()->getNameHtml()]) ?>
 					<?= FontAwesome::linkIcon('copy', I18N::translate('Copy'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return copy_fact("' . $parent->getXref() . '", "' . $fact->getFactId() . '");']) ?>
 					<?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . $parent->getXref() . '", "' . $fact->getFactId() . '");']) ?>
@@ -200,6 +201,7 @@ 
 		<?php
 		} else {
 			echo $label;
+}
 		}
 
 		echo '</th>';

app/Module/FamilyNavigatorModule.php

Braces +6 added lines, -2 removed lines

@@ -141,7 +141,8 @@ 
 							<div class="small">
 								<?= $spouse->getLifeSpan() ?>
 							</div>
-							<?php else: ?>
+							<?php else {
+	: ?>
 								<?= $spouse->getFullName() ?>
 							<?php endif ?>
 						</td>
@@ -151,6 +152,7 @@ 
 
 				foreach ($family->getChildren() as $child) {
           $icon = $controller->record === $child ? '<i class="icon-selected"></i>' : '';
+}
           $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child));
 					$menu->addSubmenu(new Menu($this->getFamily($child)));
 					?>
@@ -168,7 +170,8 @@ 
 							<div class="small">
 								<?= $child->getLifeSpan() ?>
 							</div>
-							<?php else: ?>
+							<?php else {
+	: ?>
 								<?= $child->getFullName() ?>
 							<?php endif ?>
 						</td>
@@ -192,6 +195,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 {

relationship.php

Braces +3 added lines, -1 removed lines

@@ -82,7 +82,8 @@ 
 				<?php if ($ancestors_only === '1'): ?>
 					<input type="hidden" name="ancestors" value="1">
 					<?= I18N::translate('Find relationships via ancestors') ?>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= Bootstrap4::radioButtons('ancestors', ['0' => I18N::translate('Find any relationship'), '1' => I18N::translate('Find relationships via ancestors')], $ancestors, false) ?>
 			<?php endif ?>
 			</div>
@@ -116,6 +117,7 @@ 
 if ($person1 && $person2) {
 	if (I18N::direction() === 'ltr') {
 		$diagonal1 = Theme::theme()->parameter('image-dline');
+}
 		$diagonal2 = Theme::theme()->parameter('image-dline2');
 	} else {
 		$diagonal1 = Theme::theme()->parameter('image-dline2');

message.php

Braces +3 added lines, -1 removed lines

@@ -123,7 +123,8 @@ 
 				<div class="form-control"><?= Html::escape(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') ?>
@@ -181,6 +182,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;