fisharebest / webtrees

app/Mail.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -16,8 +16,8 @@
 namespace Fisharebest\Webtrees;
 
 use Exception;
-use Swift_Mailer;
 use Swift_MailTransport;
+use Swift_Mailer;
 use Swift_Message;
 use Swift_NullTransport;
 use Swift_SmtpTransport;

descendancy.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Fisharebest\Webtrees\Database;
 use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\Functions\FunctionsDate;
-use Fisharebest\Webtrees\Functions\FunctionsPrint;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Theme;
 

fanchart.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Fisharebest\Webtrees\Database;
 use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\Functions\FunctionsDate;
-use Fisharebest\Webtrees\Functions\FunctionsPrint;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Theme;
 

lifespan.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Fisharebest\Webtrees\Database;
 use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\Functions\FunctionsDate;
-use Fisharebest\Webtrees\Functions\FunctionsPrint;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Theme;
 

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_trees_config.php

Braces +3 added lines, -1 removed lines

@@ -519,7 +519,8 @@ 
 					<div class="bg-danger text-danger">
 						<?= $resn->xref ?> — <?= I18N::translate('this record does not exist') ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
 						<?= I18N::translate('All records') ?>
 					</div>
@@ -638,6 +639,7 @@ 
 				<span class="input-group-addon">
 					<?php
 					$person = Individual::getInstance($WT_TREE->getPreference('PEDIGREE_ROOT_ID'), $WT_TREE);
+}
 					if ($person) {
 						echo $person->getFullName(), ' ', $person->getLifeSpan();
 					} else {

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/StoriesModule.php

Braces +3 added lines, -1 removed lines

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

app/Module/FamilyNavigatorModule.php

Braces +6 added lines, -2 removed lines

@@ -139,7 +139,8 @@ 
 					<div class="font9">
 						<?= $spouse->getLifeSpan() ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<?= $spouse->getFullName() ?>
 					<?php endif ?>
 				</td>
@@ -149,6 +150,7 @@ 
 
 		foreach ($family->getChildren() as $child) {
 			$menu = new Menu(Functions::getCloseRelationshipName($controller->record, $child));
+}
 			$menu->addClass('', 'submenu flyout');
 			$menu->addSubmenu(new Menu($this->getFamily($child)));
 			?>
@@ -164,7 +166,8 @@ 
 					<div class="font9">
 						<?= $child->getLifeSpan() ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<?= $child->getFullName() ?>
 					<?php endif ?>
 				</td>
@@ -184,6 +187,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 {