fisharebest / webtrees

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

Switch Indentation +32 added lines, -32 removed lines

@@ -146,39 +146,39 @@
 		foreach ($path as $n => $xref) {
 			if ($n % 2 === 1) {
 				switch ($relationships[$n]) {
-				case 'hus':
-				case 'wif':
-				case 'spo':
-				case 'bro':
-				case 'sis':
-				case 'sib':
-					$table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="height: 32px;">' . FontAwesome::decorativeIcon('arrow-end') . '</div></div>';
-					$x += 2;
-					break;
-				case 'son':
-				case 'dau':
-				case 'chi':
-					if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
-						$table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="height: 32px; text-align: start;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
+					case 'hus':
+					case 'wif':
+					case 'spo':
+					case 'bro':
+					case 'sis':
+					case 'sib':
+						$table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="height: 32px;">' . FontAwesome::decorativeIcon('arrow-end') . '</div></div>';
 						$x += 2;
-					} else {
-						$table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
-								->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-					}
-					$y -= 2;
-					break;
-				case 'fat':
-				case 'mot':
-				case 'par':
-					if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
-						$table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="height: 32px; text-align: end;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-						$x += 2;
-					} else {
-						$table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
-								->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . FontAwesome::decorativeIcon('arrow-up') . '</div></div>';
-					}
-					$y += 2;
-					break;
+						break;
+					case 'son':
+					case 'dau':
+					case 'chi':
+						if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
+							$table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="height: 32px; text-align: start;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
+							$x += 2;
+						} else {
+							$table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
+									->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
+						}
+						$y -= 2;
+						break;
+					case 'fat':
+					case 'mot':
+					case 'par':
+						if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
+							$table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="height: 32px; text-align: end;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
+							$x += 2;
+						} else {
+							$table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
+									->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $controller->tree()), Individual::getInstance($path[$n + 1], $controller->tree())) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . FontAwesome::decorativeIcon('arrow-up') . '</div></div>';
+						}
+						$y += 2;
+						break;
 				}
 				$max_x = max($max_x, $x);
 				$min_y = min($min_y, $y);

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

app/Theme/AbstractTheme.php

Indentation +3 added lines, -3 removed lines

@@ -101,9 +101,9 @@
 		'info'    => 'fa fa-info-circle',
 		'warning' => 'fa fa-exclamation-circle',
 
-	  // Icons for file types
-	  'mime-application-pdf' => '',
-	  'mime-text-html'       => '',
+		// Icons for file types
+		'mime-application-pdf' => '',
+		'mime-text-html'       => '',
 
 		// Other icons
 		'mail'   => 'fa fa-envelope-o',

Switch Indentation +20 added lines, -20 removed lines

@@ -329,12 +329,12 @@ 
 		$method = $user->getPreference('contactmethod');
 
 		switch ($method) {
-		case 'none':
-			return '';
-		case 'mailto':
-			return '<a href="mailto:' . Html::escape($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
-		default:
-			return '<a href="message.php?to=' . rawurlencode($user->getUserName()) . '&amp;ged=' . $this->tree->getNameUrl() . '&amp;url=' . Html::escape(Functions::getQueryUrl()) . '">' . $user->getRealNameHtml() . '</a>';
+			case 'none':
+				return '';
+			case 'mailto':
+				return '<a href="mailto:' . Html::escape($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
+			default:
+				return '<a href="message.php?to=' . rawurlencode($user->getUserName()) . '&amp;ged=' . $this->tree->getNameUrl() . '&amp;url=' . Html::escape(Functions::getQueryUrl()) . '">' . $user->getRealNameHtml() . '</a>';
 		}
 	}
 
@@ -1413,20 +1413,20 @@ 
 		$records  = [];
 		foreach ($favorites as $favorite) {
 			switch ($favorite['type']) {
-			case 'URL':
-				$submenus[] = new Menu($favorite['title'], $favorite['url']);
-				break;
-			case 'INDI':
-			case 'FAM':
-			case 'SOUR':
-			case 'OBJE':
-			case 'NOTE':
-				$record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
-				if ($record && $record->canShowName()) {
-					$submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
-					$records[]  = $record;
-				}
-				break;
+				case 'URL':
+					$submenus[] = new Menu($favorite['title'], $favorite['url']);
+					break;
+				case 'INDI':
+				case 'FAM':
+				case 'SOUR':
+				case 'OBJE':
+				case 'NOTE':
+					$record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
+					if ($record && $record->canShowName()) {
+						$submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
+						$records[]  = $record;
+					}
+					break;
 			}
 		}
 

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;

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,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) {
+$to_names = implode(I18N::$list_separator, array_map(function (User $user) {
 	return $user->getRealName();
 }, recipients($to)));
 
@@ -184,11 +184,11 @@ 
 	if ($to === '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 {

mediafirewall.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	// Caution - $media_dir may contain relative paths: ../../
 	$source_dir = new Filesystem(new Local(WT_DATA_DIR . $media_dir));
 	$cache_dir  = new Filesystem(new Local(WT_DATA_DIR . 'thumbnail-cache/' . md5($media_dir)));
-	$assets_dir = new Filesystem(new Local( 'assets'));
+	$assets_dir = new Filesystem(new Local('assets'));
 
 	$server = ServerFactory::create([
 		'driver'     => $driver,

app/Controller/IndividualController.php

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	public function getTabs() {
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
 
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) {
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) {
 			return $tab->hasTabContent();
 		});
 	}
@@ -247,7 +247,7 @@ 
 		}
 
 		if ($individual->canEdit() && !$fact->isPendingDeletion()) {
-			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml() ]);
+			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml()]);
 		} else {
 			$edit_links = '';
 		}

Switch Indentation +35 added lines, -35 removed lines

@@ -166,23 +166,23 @@ 
 					$name = str_replace('/', '', $name);
 					$name = preg_replace('/(\S*)\*/', '<span class="starredname">\\1</span>', $name);
 					switch ($tag) {
-					case 'TYPE':
-						echo GedcomCodeName::getValue($name, $this->record);
-						break;
-					case 'SURN':
-						// The SURN field is not necessarily the surname.
-						// Where it is not a substring of the real surname, show it after the real surname.
-						$surname = Html::escape($dummy->getAllNames()[0]['surname']);
-						$surns   = preg_replace('/, */', ' ', $nmatch[$i][2]);
-						if (strpos($dummy->getAllNames()[0]['surname'], $surns) !== false) {
-							echo '<span dir="auto">' . $surname . '</span>';
-						} else {
-							echo I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $surname . '</span>', '<span dir="auto">' . $name . '</span>');
-						}
-						break;
-					default:
-						echo '<span dir="auto">' . $name . '</span>';
-						break;
+						case 'TYPE':
+							echo GedcomCodeName::getValue($name, $this->record);
+							break;
+						case 'SURN':
+							// The SURN field is not necessarily the surname.
+							// Where it is not a substring of the real surname, show it after the real surname.
+							$surname = Html::escape($dummy->getAllNames()[0]['surname']);
+							$surns   = preg_replace('/, */', ' ', $nmatch[$i][2]);
+							if (strpos($dummy->getAllNames()[0]['surname'], $surns) !== false) {
+								echo '<span dir="auto">' . $surname . '</span>';
+							} else {
+								echo I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $surname . '</span>', '<span dir="auto">' . $name . '</span>');
+							}
+							break;
+						default:
+							echo '<span dir="auto">' . $name . '</span>';
+							break;
 					}
 				}
 				echo '</dd>';
@@ -228,15 +228,15 @@ 
 		$individual = $fact->getParent();
 
 		switch ($fact->getValue()) {
-		case 'M':
-			$sex = I18N::translate('Male');
-			break;
-		case 'F':
-			$sex = I18N::translate('Female');
-			break;
-		default:
-			$sex = I18N::translateContext('unknown gender', 'Unknown');
-			break;
+			case 'M':
+				$sex = I18N::translate('Male');
+				break;
+			case 'F':
+				$sex = I18N::translate('Female');
+				break;
+			default:
+				$sex = I18N::translateContext('unknown gender', 'Unknown');
+				break;
 		}
 
 		$container_class = 'card';
@@ -296,15 +296,15 @@ 
 	 */
 	public function getPersonStyle($person) {
 		switch ($person->getSex()) {
-		case 'M':
-			$class = 'person_box';
-			break;
-		case 'F':
-			$class = 'person_boxF';
-			break;
-		default:
-			$class = 'person_boxNN';
-			break;
+			case 'M':
+				$class = 'person_box';
+				break;
+			case 'F':
+				$class = 'person_boxF';
+				break;
+			default:
+				$class = 'person_boxNN';
+				break;
 		}
 		if ($person->isPendingDeletion()) {
 			$class .= ' old';

app/View.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * @return string
 	 */
 	public static function getFilenameForView($view_name) {
-		$view_file  = $view_name . '.php';
+		$view_file = $view_name . '.php';
 		//$theme_view = WT_THEMES_DIR . Theme::theme()->themeId() . '/resources/views/' . $view_file;
 
 		//if (file_exists($theme_view)) {

index.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Fisharebest\Webtrees;
 

routes/web.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Fisharebest\Webtrees;