fisharebest / webtrees

medialist.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else : ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
 				<?php endif ?>

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/BatchUpdate/BatchUpdateBasePlugin.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	public static function createEditLinks($gedrec, GedcomRecord $record) {
 		return preg_replace(
 			"/@([^#@\n]+)@/m",
-			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() .'">@\\1@</a>',
+			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() . '">@\\1@</a>',
 			$gedrec
 		);
 	}

app/Datatables.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 		return [
 			'data-language'    => json_encode($language),
-		  'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)])
+			'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)])
 		];
 	}
 

individual.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 if (Auth::isAdmin()) {
 	$user = User::findByGenealogyRecord($controller->record);
 	if ($user) {
-		$user_link =  ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
+		$user_link = ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
 	};
 }
 

app/Module/FamilyNavigatorModule.php

Doc Comments +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 	/**
 	 * Format an individual.
 	 *
-	 * @param      $person
+	 * @param      Individual|null $person
 	 * @param bool $showUnknown
 	 *
 	 * @return string

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 {

app/Functions/FunctionsPrint.php

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
 			    <div class="modal-content">
 			      <div class="modal-header">
 			        <h3 class="modal-title" id="wt-modal-title">' . $title . '</h3>
-			        <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') .'">
+			        <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') . '">
 			          <span aria-hidden="true">&times;</span>
 			        </button>
 			      </div>

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
  */
 namespace Fisharebest\Webtrees\Functions;
 
-use Fisharebest\Webtrees\Bootstrap4;
 use Fisharebest\Webtrees\Config;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Fact;

app/Module/UserMessagesModule.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 					$message->subject = I18N::translate('RE: ') . $message->subject;
 				}
 				if ($user) {
-					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() .'" title="' . I18N::translate('Reply') .'">' . I18N::translate('Reply') . '</a> ';
+					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
 				}
 				$content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
 			}