fisharebest / webtrees

message.php

Spacing +4 added lines, -4 removed lines

@@ -100,7 +100,7 @@ 
 $controller->restrictAccess(!in_array($to, ['all', 'never_logged', 'last_6mo']) || Auth::isAdmin());
 $controller->pageHeader();
 
-$to_names = implode(I18N::$list_separator, array_map(function(User $user) { return $user->getRealName(); }, recipients($to)));
+$to_names = implode(I18N::$list_separator, array_map(function (User $user) { return $user->getRealName(); }, recipients($to)));
 
 ?>
 <h2><?= I18N::translate('Send a message') ?></h2>
@@ -185,13 +185,13 @@ 
  */
 function recipients($to) {
 	if ($to === 'all') {
-		$recipients =	User::all();
+		$recipients = User::all();
 	} elseif ($to === 'last_6mo') {
-		$recipients = array_filter(User::all(), function(User $user) {
+		$recipients = array_filter(User::all(), function (User $user) {
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
 		});
 	} elseif ($to === 'never_logged') {
-		$recipients = array_filter(User::all(), function(User $user) {
+		$recipients = array_filter(User::all(), function (User $user) {
 			return $user->getPreference('verified_by_admin') && $user->getPreference('reg_timestamp') > $user->getPreference('sessiontime');
 		});
 	} else {

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/Date/JewishDate.php

Doc Comments +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
 	/**
 	 * Which months follows this one? Calendars with leap-months should provide their own implementation.
 	 *
-	 * @return int[]
+	 * @return integer[]
 	 */
 	protected function nextMonth() {
 		if ($this->m == 6 && !$this->isLeapYear()) {

app/Date/CalendarDate.php

Doc Comments +1 added lines, -1 removed lines

@@ -842,7 +842,7 @@
 	/**
 	 * Which months follows this one? Calendars with leap-months should provide their own implementation.
 	 *
-	 * @return int[]
+	 * @return integer[]
 	 */
 	protected function nextMonth() {
 		return [$this->m === $this->calendar->monthsInYear() ? $this->nextYear($this->y) : $this->y, ($this->m % $this->calendar->monthsInYear()) + 1];

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/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_Preferences;

app/Theme/CloudsTheme.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 			if (!empty($menu->getSubmenus())) {
 				// Insert a dummy menu / label into the submenu
 				$submenus = $menu->getSubmenus();
-				array_unshift($submenus, new Menu($menu->getLabel(), null, null, [ 'onclick' => 'return false;']));
+				array_unshift($submenus, new Menu($menu->getLabel(), null, null, ['onclick' => 'return false;']));
 				$menu->setSubmenus($submenus);
 			}
 

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

Spacing +5 added lines, -5 removed lines

@@ -2235,7 +2235,7 @@ 
 				'place_id' => $place_id,
 			]);
 		} catch (\Exception $ex) {
-			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'),'danger');
+			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'), 'danger');
 		}
 
 		header('Location: ' . WT_BASE_URL . 'module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $parent_id . '&inactive=' . $inactive);
@@ -2582,7 +2582,7 @@ 
 			[0 => I18N::translate('Geographic data')] +
 			$this->placeIdToHierarchy($place_id === 0 ? $parent_id : $place_id);
 		foreach ($hierarchy as $id => $name) {
-				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id .'&inactive=' . $inactive => Filter::escapeHtml($name)];
+				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id . '&inactive=' . $inactive => Filter::escapeHtml($name)];
 		}
 		echo Bootstrap4::breadcrumbs($breadcrumbs, $place_id === 0 ? I18N::translate('Add') : I18N::translate('Edit'));
 
@@ -3088,7 +3088,7 @@ 
 			[0 => I18N::translate('Geographic data')] +
 			$this->placeIdToHierarchy($parent_id);
 		foreach (array_slice($hierarchy, 0, -1, true) as $id => $name) {
-				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id .'&inactive=' . $inactive => Filter::escapeHtml($name)];
+				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id . '&inactive=' . $inactive => Filter::escapeHtml($name)];
 		}
 		echo Bootstrap4::breadcrumbs($breadcrumbs, end($hierarchy));
 
@@ -3280,7 +3280,7 @@ 
 								<?php endif ?>
 						</td>
 						<td>
-							<?= FontAwesome::linkIcon('edit',  I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?>
+							<?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?>
 						</td>
 						<td>
 							<?php if ($noRows == 0): ?>
@@ -3289,7 +3289,7 @@ 
 									<input type="hidden" name="place_id" value="<?= $place['place_id'] ?>">
 									<input type="hidden" name="inactive" value="<?= $inactive ?>">
 									<button type="submit" class="btn btn-danger">
-										<?= FontAwesome::semanticIcon('delete',  I18N::translate('Delete')) ?>
+										<?= FontAwesome::semanticIcon('delete', I18N::translate('Delete')) ?>
 									</button>
 								</form>
 							<?php else: ?>

app/Database.php

Spacing +2 added lines, -3 removed lines

@@ -85,8 +85,7 @@ 
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
 			),
 			$DBUSER, $DBPASS,
 			[
@@ -161,7 +160,7 @@ 
 			}
 		}
 		$milliseconds = sprintf('%.3f', $microseconds * 1000);
-		self::$log[] = '<tr><td>' .$stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>';
+		self::$log[] = '<tr><td>' . $stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>';
 	}
 
 	/**

app/Functions/FunctionsCharts.php

Spacing +3 added lines, -3 removed lines

@@ -297,9 +297,9 @@
 
 		if ($sosa == 0 && Auth::isEditor($family->getTree())) {
 			echo '<br>';
-			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
-			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
-			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
+			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
+			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
+			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
 			echo '<br><br>';
 		}
 		echo '</td>';