fisharebest / webtrees

admin_trees_manage.php

Braces +5 added lines, -2 removed lines

@@ -433,8 +433,11 @@
 									<i class="fa fa-li fa-star"></i>
 									<?php if ($tree->getName() == Site::getPreference('DEFAULT_GEDCOM')): ?>
 										<?php echo I18N::translate('Default family tree'); ?>
-									<?php else: ?>
-										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId(); ?>.submit();">
+									<?php else {
+	: ?>
+										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId();
+}
+?>.submit();">
 											<?php echo I18N::translate('Set as default'); ?>
 											<span class="sr-only">
 										<?php echo $tree->getTitleHtml(); ?>

Switch Indentation +139 added lines, -139 removed lines

@@ -50,116 +50,116 @@ 
 }
 // Process POST actions
 switch (Filter::post('action')) {
-case 'delete':
-	$gedcom_id = Filter::postInteger('gedcom_id');
-	if (Filter::checkCsrf() && $gedcom_id) {
-		$tree = Tree::findById($gedcom_id);
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-		$tree->delete();
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'setdefault':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'new_tree':
-	$basename   = basename(Filter::post('tree_name'));
-	$tree_title = Filter::post('tree_title');
-
-	if (Filter::checkCsrf() && $basename && $tree_title) {
-		if (Tree::findByName($basename)) {
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
-		} else {
-			Tree::create($basename, $tree_title);
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
+	case 'delete':
+		$gedcom_id = Filter::postInteger('gedcom_id');
+		if (Filter::checkCsrf() && $gedcom_id) {
+			$tree = Tree::findById($gedcom_id);
+			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+			$tree->delete();
 		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
-
-	return;
-case 'replace_upload':
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if (isset($_FILES['tree_name'])) {
-			if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
-				$tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
-			} else {
-				FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
-			}
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'replace_import':
-	$basename           = basename(Filter::post('tree_name'));
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if ($basename) {
-			$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-case 'synchronize':
-	if (Filter::checkCsrf()) {
-		$basenames = array();
+		return;
+	case 'setdefault':
+		if (Filter::checkCsrf()) {
+			Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
+			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
+		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-		foreach ($gedcom_files as $gedcom_file) {
-			$filemtime   = filemtime($gedcom_file); // Only import files that have changed
-			$basename    = basename($gedcom_file);
-			$basenames[] = $basename;
+		return;
+	case 'new_tree':
+		$basename   = basename(Filter::post('tree_name'));
+		$tree_title = Filter::post('tree_title');
 
-			$tree = Tree::findByName($basename);
-			if (!$tree) {
-				$tree = Tree::create($basename, $basename);
+		if (Filter::checkCsrf() && $basename && $tree_title) {
+			if (Tree::findByName($basename)) {
+				FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
+			} else {
+				Tree::create($basename, $tree_title);
+				FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
 			}
-			if ($tree->getPreference('filemtime') != $filemtime) {
-				$tree->importGedcomFile($gedcom_file, $basename);
-				$tree->setPreference('filemtime', $filemtime);
-				FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
+		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
+
+		return;
+	case 'replace_upload':
+		$gedcom_id          = Filter::postInteger('gedcom_id');
+		$keep_media         = Filter::post('keep_media', '1', '0');
+		$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+		$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+		$tree               = Tree::findById($gedcom_id);
+
+		if (Filter::checkCsrf() && $tree) {
+			$tree->setPreference('keep_media', $keep_media);
+			$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+			$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+			if (isset($_FILES['tree_name'])) {
+				if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
+					$tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
+				} else {
+					FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
+				}
+			} else {
+				FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
 			}
 		}
-
-		foreach (Tree::getAll() as $tree) {
-			if (!in_array($tree->getName(), $basenames)) {
-				FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-				$tree->delete();
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+		return;
+	case 'replace_import':
+		$basename           = basename(Filter::post('tree_name'));
+		$gedcom_id          = Filter::postInteger('gedcom_id');
+		$keep_media         = Filter::post('keep_media', '1', '0');
+		$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+		$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+		$tree               = Tree::findById($gedcom_id);
+
+		if (Filter::checkCsrf() && $tree) {
+			$tree->setPreference('keep_media', $keep_media);
+			$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+			$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+			if ($basename) {
+				$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
+			} else {
+				FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
 			}
 		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+		return;
+
+	case 'synchronize':
+		if (Filter::checkCsrf()) {
+			$basenames = array();
+
+			foreach ($gedcom_files as $gedcom_file) {
+				$filemtime   = filemtime($gedcom_file); // Only import files that have changed
+				$basename    = basename($gedcom_file);
+				$basenames[] = $basename;
+
+				$tree = Tree::findByName($basename);
+				if (!$tree) {
+					$tree = Tree::create($basename, $basename);
+				}
+				if ($tree->getPreference('filemtime') != $filemtime) {
+					$tree->importGedcomFile($gedcom_file, $basename);
+					$tree->setPreference('filemtime', $filemtime);
+					FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
+				}
+			}
 
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+			foreach (Tree::getAll() as $tree) {
+				if (!in_array($tree->getName(), $basenames)) {
+					FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+					$tree->delete();
+				}
+			}
+
+		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 }
 
 $default_tree_title  = /* I18N: Default name for a new tree */ I18N::translate('My family tree');
@@ -173,12 +173,12 @@ 
 
 // Process GET actions
 switch (Filter::get('action')) {
-case 'importform':
-	$controller
-		->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
-		->pageHeader();
+	case 'importform':
+		$controller
+			->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
+			->pageHeader();
 
-	?>
+		?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_trees_manage.php"><?php echo I18N::translate('Manage family trees'); ?></a></li>
@@ -188,14 +188,14 @@ 
 	<h1><?php echo $controller->getPageTitle(); ?></h1>
 	<?php
 
-	$tree = Tree::findById(Filter::getInteger('gedcom_id'));
-	// Check it exists
-	if (!$tree) {
-		break;
-	}
-	$gedcom_filename = $tree->getPreference('gedcom_filename')
-	?>
-	<p>
+		$tree = Tree::findById(Filter::getInteger('gedcom_id'));
+		// Check it exists
+		if (!$tree) {
+			break;
+		}
+		$gedcom_filename = $tree->getPreference('gedcom_filename')
+		?>
+		<p>
 		<?php echo /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', $tree->getTitleHtml()); ?>
 	</p>
 	<form class="form form-horizontal" name="gedcomimportform" method="post" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?php echo Filter::escapeHtml(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')); ?>');">
@@ -228,35 +228,35 @@ 
 						<div class="input-group">
 							<span class="input-group-addon">
 								<?php echo WT_DATA_DIR; ?>
-							</span>
+								</span>
 							<?php
-							$d     = opendir(WT_DATA_DIR);
-							$files = array();
-							while (($f = readdir($d)) !== false) {
-								if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
-									$fp     = fopen(WT_DATA_DIR . $f, 'rb');
-									$header = fread($fp, 64);
-									fclose($fp);
-									if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
-										$files[] = $f;
+								$d     = opendir(WT_DATA_DIR);
+								$files = array();
+								while (($f = readdir($d)) !== false) {
+									if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
+										$fp     = fopen(WT_DATA_DIR . $f, 'rb');
+										$header = fread($fp, 64);
+										fclose($fp);
+										if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
+											$files[] = $f;
+										}
+									}
+								}
+								echo '<select name="tree_name" class="form-control" id="import-server-file">';
+								echo '<option value=""></option>';
+								sort($files);
+								foreach ($files as $gedcom_file) {
+									echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
+									if ($gedcom_file === $gedcom_filename) {
+										echo ' selected';
 									}
+									echo'>', Filter::escapeHtml($gedcom_file), '</option>';
 								}
-							}
-							echo '<select name="tree_name" class="form-control" id="import-server-file">';
-							echo '<option value=""></option>';
-							sort($files);
-							foreach ($files as $gedcom_file) {
-								echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
-								if ($gedcom_file === $gedcom_filename) {
-									echo ' selected';
+								if (!$files) {
+									echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
 								}
-								echo'>', Filter::escapeHtml($gedcom_file), '</option>';
-							}
-							if (!$files) {
-								echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
-							}
-							echo '</select>';
-							?>
+								echo '</select>';
+								?>
 						</div>
 					</div>
 				</div>
@@ -298,7 +298,7 @@ 
 					>
 				<p class="small text-muted">
 					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\Genealogy\Photos\John_Smith.jpeg” */ I18N::translate('Some genealogy software creates GEDCOM files that contain media filenames with full paths. These paths will not exist on the web-server. To allow webtrees to find the file, the first part of the path must be removed.'); ?>
-					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>'); ?>
+						<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>'); ?>
 				</p>
 			</div>
 		</fieldset>
@@ -313,7 +313,7 @@ 
 	</form>
 	<?php
 
-	return;
+		return;
 }
 
 if (!Tree::getAll()) {

admin_users.php

Braces +5 added lines, -2 removed lines

@@ -791,8 +791,11 @@
 		<p>
 		<?php if ($ucnt): ?>
 			<input type="submit" value="<?php echo I18N::translate('delete'); ?>">
-			<?php else: ?>
-			<?php echo I18N::translate('Nothing found to cleanup'); ?>
+			<?php else {
+	: ?>
+			<?php echo I18N::translate('Nothing found to cleanup');
+}
+?>
 			<?php endif; ?>
 		</p>
 	</form>

Switch Indentation +84 added lines, -84 removed lines

@@ -45,95 +45,95 @@ 
 
 // Form actions
 switch (Filter::post('action')) {
-case 'save':
-	if (Filter::checkCsrf()) {
-		$user_id        = Filter::postInteger('user_id');
-		$user           = User::find($user_id);
-		$username       = Filter::post('username');
-		$real_name      = Filter::post('real_name');
-		$email          = Filter::postEmail('email');
-		$pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
-		$pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
-		$theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
-		$language       = Filter::post('language');
-		$timezone       = Filter::post('timezone');
-		$contact_method = Filter::post('contact_method');
-		$comment        = Filter::post('comment');
-		$auto_accept    = Filter::postBool('auto_accept');
-		$canadmin       = Filter::postBool('canadmin');
-		$visible_online = Filter::postBool('visible_online');
-		$verified       = Filter::postBool('verified');
-		$approved       = Filter::postBool('approved');
-
-		if ($user_id === 0) {
-			// Create a new user
-			if (User::findByUserName($username)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-			} elseif (User::findByEmail($email)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-			} elseif ($pass1 !== $pass2) {
-				FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
+	case 'save':
+		if (Filter::checkCsrf()) {
+			$user_id        = Filter::postInteger('user_id');
+			$user           = User::find($user_id);
+			$username       = Filter::post('username');
+			$real_name      = Filter::post('real_name');
+			$email          = Filter::postEmail('email');
+			$pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
+			$pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
+			$theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
+			$language       = Filter::post('language');
+			$timezone       = Filter::post('timezone');
+			$contact_method = Filter::post('contact_method');
+			$comment        = Filter::post('comment');
+			$auto_accept    = Filter::postBool('auto_accept');
+			$canadmin       = Filter::postBool('canadmin');
+			$visible_online = Filter::postBool('visible_online');
+			$verified       = Filter::postBool('verified');
+			$approved       = Filter::postBool('approved');
+
+			if ($user_id === 0) {
+				// Create a new user
+				if (User::findByUserName($username)) {
+					FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+				} elseif (User::findByEmail($email)) {
+					FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+				} elseif ($pass1 !== $pass2) {
+					FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
+				} else {
+					$user = User::create($username, $real_name, $email, $pass1);
+					$user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
+					Log::addAuthenticationLog('User ->' . $username . '<- created');
+				}
 			} else {
-				$user = User::create($username, $real_name, $email, $pass1);
-				$user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
-				Log::addAuthenticationLog('User ->' . $username . '<- created');
-			}
-		} else {
-			$user = User::find($user_id);
-			if ($user && $username && $real_name) {
-				$user->setEmail($email);
-				$user->setUserName($username);
-				$user->setRealName($real_name);
-				if ($pass1 !== null && $pass1 === $pass2) {
-					$user->setPassword($pass1);
+				$user = User::find($user_id);
+				if ($user && $username && $real_name) {
+					$user->setEmail($email);
+					$user->setUserName($username);
+					$user->setRealName($real_name);
+					if ($pass1 !== null && $pass1 === $pass2) {
+						$user->setPassword($pass1);
+					}
 				}
 			}
-		}
 
-		if ($user) {
-			// Approving for the first time? Send a confirmation email
-			if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
-				I18N::init($user->getPreference('language'));
-				Mail::systemMessage(
-					$WT_TREE,
-					$user,
-					I18N::translate('Approval of account at %s', WT_BASE_URL),
-					I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
-				);
-			}
+			if ($user) {
+				// Approving for the first time? Send a confirmation email
+				if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
+					I18N::init($user->getPreference('language'));
+					Mail::systemMessage(
+						$WT_TREE,
+						$user,
+						I18N::translate('Approval of account at %s', WT_BASE_URL),
+						I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
+					);
+				}
 
-			$user
-				->setPreference('theme', $theme)
-				->setPreference('language', $language)
-				->setPreference('TIMEZONE', $timezone)
-				->setPreference('contactmethod', $contact_method)
-				->setPreference('comment', $comment)
-				->setPreference('auto_accept', $auto_accept ? '1' : '0')
-				->setPreference('visibleonline', $visible_online ? '1' : '0')
-				->setPreference('verified', $verified ? '1' : '0')
-				->setPreference('verified_by_admin', $approved ? '1' : '0');
-
-			// We cannot change our own admin status. Another admin will need to do it.
-			if ($user->getUserId() !== Auth::id()) {
-				$user->setPreference('canadmin', $canadmin ? '1' : '0');
-			}
+				$user
+					->setPreference('theme', $theme)
+					->setPreference('language', $language)
+					->setPreference('TIMEZONE', $timezone)
+					->setPreference('contactmethod', $contact_method)
+					->setPreference('comment', $comment)
+					->setPreference('auto_accept', $auto_accept ? '1' : '0')
+					->setPreference('visibleonline', $visible_online ? '1' : '0')
+					->setPreference('verified', $verified ? '1' : '0')
+					->setPreference('verified_by_admin', $approved ? '1' : '0');
+
+				// We cannot change our own admin status. Another admin will need to do it.
+				if ($user->getUserId() !== Auth::id()) {
+					$user->setPreference('canadmin', $canadmin ? '1' : '0');
+				}
 
-			foreach (Tree::getAll() as $tree) {
-				$tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
-				$tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
-				if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
-				} else {
-					// Do not allow a path length to be set if the individual ID is not
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
+				foreach (Tree::getAll() as $tree) {
+					$tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
+					$tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
+					if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
+						$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
+					} else {
+						// Do not allow a path length to be set if the individual ID is not
+						$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
+					}
 				}
 			}
 		}
-	}
 
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 }
 
 switch (Filter::get('action')) {
@@ -173,12 +173,12 @@ 
 			// Datatables numbers columns 0, 1, 2
 			// MySQL numbers columns 1, 2, 3
 			switch ($value['dir']) {
-			case 'asc':
-				$sql_select .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$sql_select .= (1 + $value['column']) . " DESC ";
-				break;
+				case 'asc':
+					$sql_select .= (1 + $value['column']) . " ASC ";
+					break;
+				case 'desc':
+					$sql_select .= (1 + $value['column']) . " DESC ";
+					break;
 			}
 		}
 	} else {

app/Database.php

Spacing +1 added lines, -2 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,
 			array(

app/File.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		try {
 			$fp = fsockopen($scheme . $host, $port, $errno, $errstr, 5);
 
-			fputs($fp, "GET $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n");
+			fputs($fp, "get $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n");
 
 			// The first part of the response include the HTTP headers
 			$response = fread($fp, 65536);

app/Module/StoriesModule.php

Braces +5 added lines, -2 removed lines

@@ -389,8 +389,11 @@
 						<a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
 							<?php echo $individual->getFullName(); ?>
 						</a>
-						<?php else: ?>
-							<?php echo $story->xref; ?>
+						<?php else {
+	: ?>
+							<?php echo $story->xref;
+}
+?>
 						<?php endif; ?>
 						</td>
 						<td>

Switch Indentation +15 added lines, -15 removed lines

@@ -50,21 +50,21 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_edit':
-			$this->edit();
-			break;
-		case 'admin_delete':
-			$this->delete();
-			$this->config();
-			break;
-		case 'admin_config':
-			$this->config();
-			break;
-		case 'show_list':
-			$this->showList();
-			break;
-		default:
-			http_response_code(404);
+			case 'admin_edit':
+				$this->edit();
+				break;
+			case 'admin_delete':
+				$this->delete();
+				$this->config();
+				break;
+			case 'admin_config':
+				$this->config();
+				break;
+			case 'show_list':
+				$this->showList();
+				break;
+			default:
+				http_response_code(404);
 		}
 	}
 

calendar.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -67,14 +67,14 @@
 	if (strlen($match[1]) > strlen($match[2])) {
 		$match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
 	}
-	$ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+	$ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
 	$view     = 'year';
 } else {
 	// advanced-year "decade/century wildcard"
 	if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
 		$y1       = $match[1] . str_replace('?', '0', $match[2]);
 		$y2       = $match[1] . str_replace('?', '9', $match[2]);
-		$ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+		$ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
 		$view     = 'year';
 	} else {
 		if ($year < 0) {

Switch Indentation +99 added lines, -99 removed lines

@@ -118,15 +118,15 @@ 
 $controller->setPageTitle(I18N::translate('Anniversary calendar'));
 
 switch ($view) {
-case 'day':
-	$controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
-	break;
-case 'month':
-	$controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
-	break;
-case 'year':
-	$controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
-	break;
+	case 'day':
+		$controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
+		break;
+	case 'month':
+		$controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
+		break;
+	case 'year':
+		$controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
+		break;
 }
 
 $controller->pageHeader();
@@ -329,38 +329,38 @@ 
 $found_facts = array();
 
 switch ($view) {
-case 'day':
-	$found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
-	break;
-case 'month':
-	$cal_date->d = 0;
-	$cal_date->setJdFromYmd();
-	// Make a separate list for each day. Unspecified/invalid days go in day 0.
-	for ($d = 0; $d <= $days_in_month; ++$d) {
-		$found_facts[$d] = array();
-	}
-	// Fetch events for each day
-	for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
-		foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
-			$tmp = $fact->getDate()->minimumDate();
-			if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
-				// If the day is valid (for its own calendar), display it in the
-				// anniversary day (for the display calendar).
-				$found_facts[$jd - $cal_date->minJD + 1][] = $fact;
-			} else {
-				// Otherwise, display it in the "Day not set" box.
-				$found_facts[0][] = $fact;
+	case 'day':
+		$found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
+		break;
+	case 'month':
+		$cal_date->d = 0;
+		$cal_date->setJdFromYmd();
+		// Make a separate list for each day. Unspecified/invalid days go in day 0.
+		for ($d = 0; $d <= $days_in_month; ++$d) {
+			$found_facts[$d] = array();
+		}
+		// Fetch events for each day
+		for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
+			foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
+				$tmp = $fact->getDate()->minimumDate();
+				if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
+					// If the day is valid (for its own calendar), display it in the
+					// anniversary day (for the display calendar).
+					$found_facts[$jd - $cal_date->minJD + 1][] = $fact;
+				} else {
+					// Otherwise, display it in the "Day not set" box.
+					$found_facts[0][] = $fact;
+				}
 			}
 		}
-	}
-	break;
-case 'year':
-	$cal_date->m = 0;
-	$cal_date->setJdFromYmd();
-	$found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
-	// Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
-	$found_facts = array_unique($found_facts);
-	break;
+		break;
+	case 'year':
+		$cal_date->m = 0;
+		$cal_date->setJdFromYmd();
+		$found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
+		// Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
+		$found_facts = array_unique($found_facts);
+		break;
 }
 
 // Group the facts by family/individual
@@ -369,39 +369,39 @@ 
 $cal_facts = array();
 
 switch ($view) {
-case 'year':
-case 'day':
-	foreach ($found_facts as $fact) {
-		$record = $fact->getParent();
-		$xref   = $record->getXref();
-		if ($record instanceof Individual) {
-			if (empty($indis[$xref])) {
-				$indis[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
-			}
-		} elseif ($record instanceof Family) {
-			if (empty($indis[$xref])) {
-				$fams[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
+	case 'year':
+	case 'day':
+		foreach ($found_facts as $fact) {
+			$record = $fact->getParent();
+			$xref   = $record->getXref();
+			if ($record instanceof Individual) {
+				if (empty($indis[$xref])) {
+					$indis[$xref] = calendar_fact_text($fact, true);
+				} else {
+					$indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
+				}
+			} elseif ($record instanceof Family) {
+				if (empty($indis[$xref])) {
+					$fams[$xref] = calendar_fact_text($fact, true);
+				} else {
+					$fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
+				}
 			}
 		}
-	}
-	break;
-case 'month':
-	foreach ($found_facts as $d => $facts) {
-		$cal_facts[$d] = array();
-		foreach ($facts as $fact) {
-			$xref = $fact->getParent()->getXref();
-			if (empty($cal_facts[$d][$xref])) {
-				$cal_facts[$d][$xref] = calendar_fact_text($fact, false);
-			} else {
-				$cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
+		break;
+	case 'month':
+		foreach ($found_facts as $d => $facts) {
+			$cal_facts[$d] = array();
+			foreach ($facts as $fact) {
+				$xref = $fact->getParent()->getXref();
+				if (empty($cal_facts[$d][$xref])) {
+					$cal_facts[$d][$xref] = calendar_fact_text($fact, false);
+				} else {
+					$cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
+				}
 			}
 		}
-	}
-	break;
+		break;
 }
 
 switch ($view) {
@@ -498,26 +498,26 @@ 
 			// Show a converted date
 			foreach (explode('_and_', $CALENDAR_FORMAT) as $convcal) {
 				switch ($convcal) {
-				case 'french':
-					$alt_date = new FrenchDate($cal_date->minJD + $d - 1);
-					break;
-				case 'gregorian':
-					$alt_date = new GregorianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jewish':
-					$alt_date = new JewishDate($cal_date->minJD + $d - 1);
-					break;
-				case 'julian':
-					$alt_date = new JulianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'hijri':
-					$alt_date = new HijriDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jalali':
-					$alt_date = new JalaliDate($cal_date->minJD + $d - 1);
-					break;
-				default:
-					break 2;
+					case 'french':
+						$alt_date = new FrenchDate($cal_date->minJD + $d - 1);
+						break;
+					case 'gregorian':
+						$alt_date = new GregorianDate($cal_date->minJD + $d - 1);
+						break;
+					case 'jewish':
+						$alt_date = new JewishDate($cal_date->minJD + $d - 1);
+						break;
+					case 'julian':
+						$alt_date = new JulianDate($cal_date->minJD + $d - 1);
+						break;
+					case 'hijri':
+						$alt_date = new HijriDate($cal_date->minJD + $d - 1);
+						break;
+					case 'jalali':
+						$alt_date = new JalaliDate($cal_date->minJD + $d - 1);
+						break;
+					default:
+						break 2;
 				}
 				if (get_class($alt_date) !== get_class($cal_date) && $alt_date->inValidRange()) {
 					echo '<span class="rtl_cal_day">' . $alt_date->format("%j %M") . '</span>';
@@ -627,17 +627,17 @@ 
 		$html .= $tag1 . '<a href="' . $tmp->getHtmlUrl() . '">' . $tmp->getFullName() . '</a> ';
 		if ($show_sex_symbols && $tmp instanceof Individual) {
 			switch ($tmp->getSex()) {
-			case 'M':
-				$html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
-				++$males;
-				break;
-			case 'F':
-				$html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
-				++$females;
-				break;
-			default:
-				$html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
-				break;
+				case 'M':
+					$html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
+					++$males;
+					break;
+				case 'F':
+					$html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
+					++$females;
+					break;
+				default:
+					$html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
+					break;
 			}
 		}
 		$html .= '<div class="indent">' . $facts . '</div>' . $tag2;

medialist.php

Braces +5 added lines, -2 removed lines

@@ -110,10 +110,13 @@
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</tr>
 			<tr>
 				<td class="descriptionbox wrap">

search_advanced.php

Braces +92 added lines, -23 removed lines

@@ -154,10 +154,22 @@ 
 				<input type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo Filter::escapeHtml($controller->getValue($i)); ?>"<?php echo substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : ''; ?>>
 			<?php if (preg_match("/^NAME:/", $currentFieldSearch) > 0) { ?>
 				<select name="fields[<?php echo $i; ?>]">
-					<option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-					<option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-					<option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-					<option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+					<option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+					<option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+					<option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+					<option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 				</select>
 			<?php } else { ?>
 			<input type="hidden" name="fields[<?php echo $i; ?>]" value="<?php echo $controller->getField($i); ?>">
@@ -166,9 +178,18 @@ 
 				?>
 				<select name="plusminus[<?php echo $i; ?>]">
 					<option value=""><?php echo I18N::translate('Exact date'); ?></option>
-					<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected'; ?>><?php echo 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'; ?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
-					<option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
+					<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
+	echo 'selected';
+}
+?>><?php echo 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';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
+					<option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) {
+	echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
 				</select>
 			<?php } ?>
 		</td>
@@ -216,10 +237,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:GIVN:' . $fatherGivnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -231,10 +264,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:SURN:' . $fatherSurnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -252,10 +297,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:GIVN:' . $motherGivnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 		<?php $j++; ?>
@@ -267,10 +324,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:SURN:' . $motherSurnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') {
+	'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 		<?php $j++; ?>

Switch Indentation +12 added lines, -12 removed lines

@@ -185,18 +185,18 @@
 				$searchField  = $controller->getField($k);
 				$searchOption = substr($searchField, 20); // Assume we have something like "FAMC:HUSB:NAME:GIVN:foo"
 				switch (substr($searchField, 0, 20)) {
-				case 'FAMC:HUSB:NAME:GIVN:':
-					$fatherGivnOption = $searchOption;
-					break;
-				case 'FAMC:HUSB:NAME:SURN:':
-					$fatherSurnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:GIVN:':
-					$motherGivnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:SURN:':
-					$motherSurnOption = $searchOption;
-					break;
+					case 'FAMC:HUSB:NAME:GIVN:':
+						$fatherGivnOption = $searchOption;
+						break;
+					case 'FAMC:HUSB:NAME:SURN:':
+						$fatherSurnOption = $searchOption;
+						break;
+					case 'FAMC:WIFE:NAME:GIVN:':
+						$motherGivnOption = $searchOption;
+						break;
+					case 'FAMC:WIFE:NAME:SURN:':
+						$motherSurnOption = $searchOption;
+						break;
 				}
 			}
 			?>

admin.php

Braces +35 added lines, -14 removed lines

@@ -611,8 +611,11 @@ 
 					<a href="admin_site_upgrade.php" class="error">
 						<?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
 					</a>
-					<?php else: ?>
-						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.'); ?>
+					<?php else {
+	: ?>
+						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.');
+}
+?>
 					<?php endif; ?>
 				</p>
 				<?php endif; ?>
@@ -774,9 +777,12 @@ 
 									<?php echo I18N::number($changes[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($individuals[$tree->getTreeId()]): ?>
@@ -784,9 +790,12 @@ 
 									<?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($families[$tree->getTreeId()]): ?>
@@ -794,9 +803,12 @@ 
 									<?php echo I18N::number($families[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($sources[$tree->getTreeId()]): ?>
@@ -804,9 +816,12 @@ 
 									<?php echo I18N::number($sources[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($repositories[$tree->getTreeId()]): ?>
@@ -814,9 +829,12 @@ 
 									<?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($media[$tree->getTreeId()]): ?>
@@ -824,9 +842,12 @@ 
 									<?php echo I18N::number($media[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 						</tr>
 						<?php endforeach; ?>