fisharebest / webtrees

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) {

Switch Indentation +97 added lines, -97 removed lines

@@ -41,108 +41,108 @@ 
 
 // 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::post('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::post('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'));
-
-				// Create a dummy user, so we can send messages from the tree.
-				$sender = new User(
-					(object) [
-						'user_id'   => null,
-						'user_name' => '',
-						'real_name' => $WT_TREE->getTitle(),
-						'email'     => $WT_TREE->getPreference('WEBTREES_EMAIL'),
-					]
-				);
-
-				Mail::send(
-					$sender,
-					$user,
-					$sender,
-					I18N::translate('Approval of account at %s', WT_BASE_URL),
-					View::make('emails/approve-user-text', ['user' => $user]),
-					View::make('emails/approve-user-html', ['user' => $user])
-				);
-			}
+			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'));
+
+					// Create a dummy user, so we can send messages from the tree.
+					$sender = new User(
+						(object) [
+							'user_id'   => null,
+							'user_name' => '',
+							'real_name' => $WT_TREE->getTitle(),
+							'email'     => $WT_TREE->getPreference('WEBTREES_EMAIL'),
+						]
+					);
+
+					Mail::send(
+						$sender,
+						$user,
+						$sender,
+						I18N::translate('Approval of account at %s', WT_BASE_URL),
+						View::make('emails/approve-user-text', ['user' => $user]),
+						View::make('emails/approve-user-html', ['user' => $user])
+					);
+				}
 
-			$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: admin_users.php');
+		header('Location: admin_users.php');
 
-	return;
+		return;
 }
 
 switch (Filter::get('action')) {
@@ -182,12 +182,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/Module/BatchUpdateModule.php

Braces +3 added lines, -1 removed lines

@@ -235,7 +235,8 @@ 
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
 					<?php // page, which makes them all again!  ?>
 					<script>reset_reload();</script>
-			<?php else: ?>
+			<?php else {
+	: ?>
 					<hr>
 					<div id="batch_update2" class="col-sm-12">
 						<?php if ($this->curr_xref): ?>
@@ -273,6 +274,7 @@ 
 		foreach (array_keys($this->all_xrefs) as $key) {
 			if ($key > $xref) {
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
+}
 				if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
 					return $key;
 				}

Switch Indentation +66 added lines, -66 removed lines

@@ -95,13 +95,13 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_batch_update':
-			echo $this->main();
-			break;
+			case 'admin_batch_update':
+				echo $this->main();
+				break;
 
-		default:
-			http_response_code(404);
-			break;
+			default:
+				http_response_code(404);
+				break;
 		}
 	}
 
@@ -126,36 +126,36 @@ 
 			$this->getAllXrefs();
 
 			switch ($this->action) {
-			case 'update':
-				$record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
-				if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
-					$newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
-					if ($newrecord != $record) {
-						if ($newrecord) {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
-						} else {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
-						}
-					}
-				}
-				$this->xref = $this->findNextXref($this->xref);
-				break;
-			case 'update_all':
-				foreach ($this->all_xrefs as $xref => $type) {
-					$record = self::getLatestRecord($xref, $type);
-					if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
-						$newrecord = $this->PLUGIN->updateRecord($xref, $record);
+				case 'update':
+					$record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
+					if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
+						$newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
 						if ($newrecord != $record) {
 							if ($newrecord) {
-								GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+								GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
 							} else {
-								GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
+								GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
 							}
 						}
 					}
-				}
-				$this->xref = '';
-				break;
+					$this->xref = $this->findNextXref($this->xref);
+					break;
+				case 'update_all':
+					foreach ($this->all_xrefs as $xref => $type) {
+						$record = self::getLatestRecord($xref, $type);
+						if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
+							$newrecord = $this->PLUGIN->updateRecord($xref, $record);
+							if ($newrecord != $record) {
+								if ($newrecord) {
+									GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+								} else {
+									GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
+								}
+							}
+						}
+					}
+					$this->xref = '';
+					break;
 			}
 
 			// Make sure that our requested record really does need updating.
@@ -313,28 +313,28 @@ 
 		$vars = [];
 		foreach ($this->PLUGIN->getRecordTypesToUpdate() as $type) {
 			switch ($type) {
-			case 'INDI':
-				$sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'FAM':
-				$sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'SOUR':
-				$sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'OBJE':
-				$sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			default:
-				$sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
-				$vars[] = $type;
-				$vars[] = $type;
-				$vars[] = $WT_TREE->getTreeId();
-				break;
+				case 'INDI':
+					$sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				case 'FAM':
+					$sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				case 'SOUR':
+					$sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				case 'OBJE':
+					$sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				default:
+					$sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
+					$vars[] = $type;
+					$vars[] = $type;
+					$vars[] = $WT_TREE->getTreeId();
+					break;
 			}
 		}
 		$this->all_xrefs = Database::prepare(implode(' UNION ', $sql) . ' ORDER BY 1 ASC')
@@ -410,20 +410,20 @@ 
 		global $WT_TREE;
 
 		switch ($type) {
-		case 'INDI':
-			return Individual::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'FAM':
-			return Family::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'SOUR':
-			return Source::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'REPO':
-			return Repository::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'OBJE':
-			return Media::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'NOTE':
-			return Note::getInstance($xref, $WT_TREE)->getGedcom();
-		default:
-			return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'INDI':
+				return Individual::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'FAM':
+				return Family::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'SOUR':
+				return Source::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'REPO':
+				return Repository::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'OBJE':
+				return Media::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'NOTE':
+				return Note::getInstance($xref, $WT_TREE)->getGedcom();
+			default:
+				return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
 		}
 	}
 

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

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

placelist.php

Braces +3 added lines, -1 removed lines

@@ -200,7 +200,8 @@ 
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
 				<?php if (empty($myindilist)): ?>
 					<p><?= I18N::translate('No results found.') ?></p>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
 				<?php endif ?>
 			</div>
@@ -216,6 +217,7 @@ 
 		<?php
 	}
 	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
+}
 
 	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
 		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);

Switch Indentation +129 added lines, -129 removed lines

@@ -46,181 +46,181 @@
 echo '<div id="place-hierarchy">';
 
 switch ($display) {
-case 'list':
-	echo '<h2>', $controller->getPageTitle(), '</h2>';
-	$list_places = Place::allPlaces($WT_TREE);
-	$numfound    = count($list_places);
+	case 'list':
+		echo '<h2>', $controller->getPageTitle(), '</h2>';
+		$list_places = Place::allPlaces($WT_TREE);
+		$numfound    = count($list_places);
 
-	$divisor = $numfound > 20 ? 3 : 2;
+		$divisor = $numfound > 20 ? 3 : 2;
 
-	if ($numfound === 0) {
-		echo '<b>', I18N::translate('No results found.'), '</b><br>';
-	} else {
-		$columns = array_chunk($list_places, ceil($numfound / $divisor));
-
-		$html = '<table class="list_table"><thead>';
-		$html .= '<tr><th class="list_label" colspan="' . $divisor . '">';
-		$html .= '<i class="icon-place"></i> ' . I18N::translate('Place list');
-		$html .= '</th></tr></thead>';
-		$html .= '<tbody><tr>';
-		foreach ($columns as $column) {
-			$html .= '<td class="list_value_wrap"><ul>';
-			foreach ($column as $item) {
-				$html .= '<li><a href="' . $item->getURL() . '">' . $item->getReverseName() . '</a></li>';
+		if ($numfound === 0) {
+			echo '<b>', I18N::translate('No results found.'), '</b><br>';
+		} else {
+			$columns = array_chunk($list_places, ceil($numfound / $divisor));
+
+			$html = '<table class="list_table"><thead>';
+			$html .= '<tr><th class="list_label" colspan="' . $divisor . '">';
+			$html .= '<i class="icon-place"></i> ' . I18N::translate('Place list');
+			$html .= '</th></tr></thead>';
+			$html .= '<tbody><tr>';
+			foreach ($columns as $column) {
+				$html .= '<td class="list_value_wrap"><ul>';
+				foreach ($column as $item) {
+					$html .= '<li><a href="' . $item->getURL() . '">' . $item->getReverseName() . '</a></li>';
+				}
+				$html .= '</ul></td>';
 			}
-			$html .= '</ul></td>';
+			$html .= '</tr></tbody></table>';
+			echo $html;
 		}
-		$html .= '</tr></tbody></table>';
-		echo $html;
-	}
-	echo '<h4><a href="placelist.php?display=hierarchy">', I18N::translate('Show places in hierarchy'), '</a></h4>';
-	break;
-case 'hierarchy':
-	$gm_module = Module::getModuleByName('googlemap');
+		echo '<h4><a href="placelist.php?display=hierarchy">', I18N::translate('Show places in hierarchy'), '</a></h4>';
+		break;
+	case 'hierarchy':
+		$gm_module = Module::getModuleByName('googlemap');
 
-	// Find this place and its ID
-	$place    = new Place(implode(', ', array_reverse($parent)), $WT_TREE);
-	$place_id = $place->getPlaceId();
+		// Find this place and its ID
+		$place    = new Place(implode(', ', array_reverse($parent)), $WT_TREE);
+		$place_id = $place->getPlaceId();
 
-	$child_places = $place->getChildPlaces();
+		$child_places = $place->getChildPlaces();
 
-	$numfound = count($child_places);
+		$numfound = count($child_places);
 
-	//-- if the number of places found is 0 then automatically redirect to search page
-	if ($numfound === 0) {
-		$action = 'show';
-	}
-
-	echo '<h2>', $controller->getPageTitle();
-	// Breadcrumbs
-	if ($place_id) {
-		$parent_place = $place->getParentPlace();
-		while ($parent_place->getPlaceId()) {
-			echo ', <a href="', $parent_place->getURL(), '" dir="auto">', $parent_place->getPlaceName(), '</a>';
-			$parent_place = $parent_place->getParentPlace();
+		//-- if the number of places found is 0 then automatically redirect to search page
+		if ($numfound === 0) {
+			$action = 'show';
 		}
-		echo ', <a href="placelist.php">', I18N::translate('Top level'), '</a>';
-	}
-	echo '</h2>';
 
-	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
-		$linklevels  = '';
-		$place_names = [];
-		for ($j = 0; $j < $level; $j++) {
-			$linklevels .= '&amp;parent[' . $j . ']=' . rawurlencode($parent[$j]);
+		echo '<h2>', $controller->getPageTitle();
+		// Breadcrumbs
+		if ($place_id) {
+			$parent_place = $place->getParentPlace();
+			while ($parent_place->getPlaceId()) {
+				echo ', <a href="', $parent_place->getURL(), '" dir="auto">', $parent_place->getPlaceName(), '</a>';
+				$parent_place = $parent_place->getParentPlace();
+			}
+			echo ', <a href="placelist.php">', I18N::translate('Top level'), '</a>';
 		}
+		echo '</h2>';
 
-		$gm_module->createMap();
-	} elseif (Module::getModuleByName('places_assistant')) {
-		// Places Assistant is a custom/add-on module that was once part of the core code.
-		\PlacesAssistantModule::display_map($level, $parent);
-	}
+		if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
+			$linklevels  = '';
+			$place_names = [];
+			for ($j = 0; $j < $level; $j++) {
+				$linklevels .= '&amp;parent[' . $j . ']=' . rawurlencode($parent[$j]);
+			}
 
-	if ($numfound > 0) {
-		if ($numfound > 20) {
-			$divisor = 3;
-		} elseif ($numfound > 4) {
-			$divisor = 2;
-		} else {
-			$divisor = 1;
+			$gm_module->createMap();
+		} elseif (Module::getModuleByName('places_assistant')) {
+			// Places Assistant is a custom/add-on module that was once part of the core code.
+			\PlacesAssistantModule::display_map($level, $parent);
 		}
 
-		$columns = array_chunk($child_places, ceil($numfound / $divisor));
-		$html    = '<table id="place_hierarchy" class="list_table"><thead><tr><th class="list_label" colspan="' . $divisor . '">';
-		$html .= '<i class="icon-place"></i> ';
-		if ($place_id) {
-			$html .= I18N::translate('Places in %s', $place->getPlaceName());
-		} else {
-			$html .= I18N::translate('Place hierarchy');
-		}
-		$html .= '</th></tr></thead>';
-		$html .= '<tbody><tr>';
-		foreach ($columns as $column) {
-			$html .= '<td class="list_value"><ul>';
-			foreach ($column as $item) {
-				$html .= '<li><a href="' . $item->getURL() . '" class="list_item">' . $item->getPlaceName() . '</a></li>';
-				if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
-					list($tmp)     = explode(', ', $item->getGedcomName(), 2);
-					$place_names[] = $tmp;
+		if ($numfound > 0) {
+			if ($numfound > 20) {
+				$divisor = 3;
+			} elseif ($numfound > 4) {
+				$divisor = 2;
+			} else {
+				$divisor = 1;
+			}
+
+			$columns = array_chunk($child_places, ceil($numfound / $divisor));
+			$html    = '<table id="place_hierarchy" class="list_table"><thead><tr><th class="list_label" colspan="' . $divisor . '">';
+			$html .= '<i class="icon-place"></i> ';
+			if ($place_id) {
+				$html .= I18N::translate('Places in %s', $place->getPlaceName());
+			} else {
+				$html .= I18N::translate('Place hierarchy');
+			}
+			$html .= '</th></tr></thead>';
+			$html .= '<tbody><tr>';
+			foreach ($columns as $column) {
+				$html .= '<td class="list_value"><ul>';
+				foreach ($column as $item) {
+					$html .= '<li><a href="' . $item->getURL() . '" class="list_item">' . $item->getPlaceName() . '</a></li>';
+					if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
+						list($tmp)     = explode(', ', $item->getGedcomName(), 2);
+						$place_names[] = $tmp;
+					}
 				}
+				$html .= '</ul></td>';
 			}
-			$html .= '</ul></td>';
-		}
-		$html .= '</tr></tbody>';
-		if ($numfound > 0 && $action == 'find' && $place_id) {
-			$html .= '<tfoot><tr><td class="list_label" colspan="' . $divisor . '">';
-			$html .= I18N::translate('View all records found in this place');
-			$html .= '</td></tr><tr><td class="list_value" colspan="' . $divisor . '" style="text-align: center;">';
-			$html .= '<a href="' . $place->getURL() . '&amp;action=show" class="formField">' . $place->getPlaceName() . '</a>';
-			$html .= '</td></tr></tfoot>';
+			$html .= '</tr></tbody>';
+			if ($numfound > 0 && $action == 'find' && $place_id) {
+				$html .= '<tfoot><tr><td class="list_label" colspan="' . $divisor . '">';
+				$html .= I18N::translate('View all records found in this place');
+				$html .= '</td></tr><tr><td class="list_value" colspan="' . $divisor . '" style="text-align: center;">';
+				$html .= '<a href="' . $place->getURL() . '&amp;action=show" class="formField">' . $place->getPlaceName() . '</a>';
+				$html .= '</td></tr></tfoot>';
+			}
+			$html .= '</table>';
+			// -- echo the array
+			echo $html;
 		}
-		$html .= '</table>';
-		// -- echo the array
-		echo $html;
-	}
-	if ($place_id && $action == 'show') {
-		// -- array of names
-		$myindilist = [];
-		$myfamlist  = [];
-
-		$positions =
-			Database::prepare("SELECT DISTINCT pl_gid FROM `##placelinks` WHERE pl_p_id=? AND pl_file=?")
-			->execute([$place_id, $WT_TREE->getTreeId()])
-			->fetchOneColumn();
-
-		foreach ($positions as $position) {
-			$record = GedcomRecord::getInstance($position, $WT_TREE);
-			if ($record && $record->canShow()) {
-				if ($record instanceof Individual) {
-					$myindilist[] = $record;
-				}
-				if ($record instanceof Family) {
-					$myfamlist[] = $record;
+		if ($place_id && $action == 'show') {
+			// -- array of names
+			$myindilist = [];
+			$myfamlist  = [];
+
+			$positions =
+				Database::prepare("SELECT DISTINCT pl_gid FROM `##placelinks` WHERE pl_p_id=? AND pl_file=?")
+				->execute([$place_id, $WT_TREE->getTreeId()])
+				->fetchOneColumn();
+
+			foreach ($positions as $position) {
+				$record = GedcomRecord::getInstance($position, $WT_TREE);
+				if ($record && $record->canShow()) {
+					if ($record instanceof Individual) {
+						$myindilist[] = $record;
+					}
+					if ($record instanceof Family) {
+						$myfamlist[] = $record;
+					}
 				}
 			}
-		}
-		echo '<br>';
+			echo '<br>';
 
-		?>
+			?>
 		<ul class="nav nav-tabs" role="tablist">
 			<li class="nav-item">
 				<a class="nav-link active<?= empty($myindilist) ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals">
 					<?= I18N::translate('Individuals') ?>
-					<?= Bootstrap4::badgeCount($myindilist) ?>
+						<?= Bootstrap4::badgeCount($myindilist) ?>
 				</a>
 			</li>
 			<li class="nav-item">
 				<a class="nav-link<?= empty($myfamlist) ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families">
 					<?= I18N::translate('Families') ?>
-					<?= Bootstrap4::badgeCount($myfamlist) ?>
+						<?= Bootstrap4::badgeCount($myfamlist) ?>
 				</a>
 			</li>
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
 				<?php if (empty($myindilist)): ?>
-					<p><?= I18N::translate('No results found.') ?></p>
+						<p><?= I18N::translate('No results found.') ?></p>
 				<?php else: ?>
-					<?= FunctionsPrintLists::individualTable($myindilist) ?>
-				<?php endif ?>
+						<?= FunctionsPrintLists::individualTable($myindilist) ?>
+					<?php endif ?>
 			</div>
 
 			<div class="tab-pane fade" role="tabpanel" id="families">
 				<?php if (empty($myfamlist)): ?>
-					<p><?= I18N::translate('No results found.') ?></p>
+						<p><?= I18N::translate('No results found.') ?></p>
 				<?php else: ?>
-					<?= FunctionsPrintLists::familyTable($myfamlist) ?>
-				<?php endif ?>
+						<?= FunctionsPrintLists::familyTable($myfamlist) ?>
+					<?php endif ?>
 			</div>
 		</div>
 		<?php
-	}
-	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
+		}
+		echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
 
-	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
-		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
-	}
-	break;
+		if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
+			$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
+		}
+		break;
 }
 
 echo '</div>'; // <div id="place-hierarchy">

search_advanced.php

Braces +6 added lines, -2 removed lines

@@ -146,7 +146,8 @@ 
 					value="<?= Html::escape($controller->getValue($i)) ?>">
 						<?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0): ?>
 							<select class="form-control form-control-sm col-3" name="fields[<?= $i ?>]">
-								<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>>
+								<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' ?>>
@@ -161,13 +162,15 @@ 
 						<?php else: ?>
 							<input type="hidden" name="fields[<?= $i ?>]" value="<?= $controller->getField($i) ?>">
 						<?php endif;
+}
 						if (preg_match('/:DATE$/', $currentFieldSearch) > 0) {
 							?>
 							<select class="form-control form-control-sm col-3" name="plusminus[<?= $i ?>]">
 								<option value="">
 									<?= I18N::translate('Exact date') ?>
 								</option>
-								<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected' ?>>
+								<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
+	echo 'selected' ?>>
 									<?= 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' ?>>
@@ -183,6 +186,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';

Switch Indentation +12 added lines, -12 removed lines

@@ -192,18 +192,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;
 							}
 						}
 					}

app/Module/FamilyNavigatorModule.php

Braces +6 added lines, -2 removed lines

@@ -141,7 +141,8 @@ 
 							<div class="small">
 								<?= $spouse->getLifeSpan() ?>
 							</div>
-							<?php else: ?>
+							<?php else {
+	: ?>
 								<?= $spouse->getFullName() ?>
 							<?php endif ?>
 						</td>
@@ -151,6 +152,7 @@ 
 
 				foreach ($family->getChildren() as $child) {
           $icon = $controller->record === $child ? '<i class="icon-selected"></i>' : '';
+}
           $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child));
 					$menu->addSubmenu(new Menu($this->getFamily($child)));
 					?>
@@ -168,7 +170,8 @@ 
 							<div class="small">
 								<?= $child->getLifeSpan() ?>
 							</div>
-							<?php else: ?>
+							<?php else {
+	: ?>
 								<?= $child->getFullName() ?>
 							<?php endif ?>
 						</td>
@@ -192,6 +195,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 {

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

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;

edit_changes.php

Switch Indentation +85 added lines, -85 removed lines

@@ -35,72 +35,72 @@ 
 $url       = Filter::get('url', null, 'index.php');
 
 switch ($action) {
-case 'reject':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	// Reject a change, and subsequent changes to the same record
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET   status     = 'rejected'" .
-		" WHERE status     = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id >= ?"
-	)->execute([$gedcom_id, $xref, $change_id]);
-	break;
-case 'accept':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	// Accept a change, and all previous changes to the same record
-	$all_changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM  `##change` c" .
-		" JOIN  `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status   = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id <= ?" .
-		" ORDER BY change_id"
-	)->execute([$gedcom_id, $xref, $change_id])->fetchAll();
-	foreach ($all_changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+	case 'reject':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		// Reject a change, and subsequent changes to the same record
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET   status     = 'rejected'" .
+			" WHERE status     = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id >= ?"
+		)->execute([$gedcom_id, $xref, $change_id]);
+		break;
+	case 'accept':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		// Accept a change, and all previous changes to the same record
+		$all_changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM  `##change` c" .
+			" JOIN  `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status   = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id <= ?" .
+			" ORDER BY change_id"
+		)->execute([$gedcom_id, $xref, $change_id])->fetchAll();
+		foreach ($all_changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute([$change->change_id]);
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute([$change->change_id]);
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
-case 'rejectall':
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET status='rejected'" .
-		" WHERE status='pending' AND gedcom_id=?"
-	)->execute([$WT_TREE->getTreeId()]);
-	break;
-case 'acceptall':
-	$all_changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM `##change` c" .
-		" JOIN `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status='pending' AND gedcom_id=?" .
-		" ORDER BY change_id"
-	)->execute([$WT_TREE->getTreeId()])->fetchAll();
-	foreach ($all_changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+		break;
+	case 'rejectall':
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET status='rejected'" .
+			" WHERE status='pending' AND gedcom_id=?"
+		)->execute([$WT_TREE->getTreeId()]);
+		break;
+	case 'acceptall':
+		$all_changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM `##change` c" .
+			" JOIN `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status='pending' AND gedcom_id=?" .
+			" ORDER BY change_id"
+		)->execute([$WT_TREE->getTreeId()])->fetchAll();
+		foreach ($all_changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute([$change->change_id]);
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute([$change->change_id]);
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
+		break;
 }
 
 $rows = Database::prepare(
@@ -120,27 +120,27 @@ 
 	preg_match('/^0 (?:@' . WT_REGEX_XREF . '@ )?(' . WT_REGEX_TAG . ')/', $row->old_gedcom . $row->new_gedcom, $match);
 
 	switch ($match[1]) {
-	case 'INDI':
-		$row->record = new Individual($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'FAM':
-		$row->record = new Family($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'SOUR':
-		$row->record = new Source($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'REPO':
-		$row->record = new Repository($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'OBJE':
-		$row->record = new Media($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'NOTE':
-		$row->record = new Note($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	default:
-		$row->record = new GedcomRecord($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
+		case 'INDI':
+			$row->record = new Individual($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'FAM':
+			$row->record = new Family($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'SOUR':
+			$row->record = new Source($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'REPO':
+			$row->record = new Repository($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'OBJE':
+			$row->record = new Media($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'NOTE':
+			$row->record = new Note($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		default:
+			$row->record = new GedcomRecord($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
 	}
 
 	$row->accept_url = Html::url('edit_changes.php', [