fisharebest / webtrees

app/Theme/FabTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Theme/XeneaTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Theme/CloudsTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Module/ClippingsCartModule.php

Switch Indentation +130 added lines, -130 removed lines

@@ -75,37 +75,37 @@ 
 		}
 
 		switch ($mod_action) {
-		case 'ajax':
-			$html = $this->getSidebarAjaxContent();
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $html;
-			break;
-		case 'index':
-			global $controller, $WT_TREE;
-
-			$MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
-
-			$clip_ctrl = new ClippingsCartController;
-			$cart      = Session::get('cart');
-
-			$controller = new PageController;
-			$controller
-				->setPageTitle($this->getTitle())
-				->pageHeader()
-				->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-				->addInlineJavascript('autocomplete();');
-
-			echo '<script>';
-			echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
-			echo '</script>';
-
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
-			}
+			case 'ajax':
+				$html = $this->getSidebarAjaxContent();
+				header('Content-Type: text/html; charset=UTF-8');
+				echo $html;
+				break;
+			case 'index':
+				global $controller, $WT_TREE;
+
+				$MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
+
+				$clip_ctrl = new ClippingsCartController;
+				$cart      = Session::get('cart');
+
+				$controller = new PageController;
+				$controller
+					->setPageTitle($this->getTitle())
+					->pageHeader()
+					->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+					->addInlineJavascript('autocomplete();');
+
+				echo '<script>';
+				echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
+				echo '</script>';
+
+				if (!$cart[$WT_TREE->getTreeId()]) {
+					echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
+				}
 
-			if ($clip_ctrl->action == 'add') {
-				$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
-				if ($clip_ctrl->type === 'FAM') { ?>
+				if ($clip_ctrl->action == 'add') {
+					$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
+					if ($clip_ctrl->type === 'FAM') { ?>
 					<form action="module.php" method="get">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -131,14 +131,14 @@ 
 									<td class="optionbox">
 										<input type="radio" name="others" value="members" checked>
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their children', $record->getFullName()); ?>
+											I18N::translate('%s and their children', $record->getFullName()); ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="optionbox">
 										<input type="radio" name="others" value="descendants">
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their descendants', $record->getFullName()); ?>
+											I18N::translate('%s and their descendants', $record->getFullName()); ?>
 									</td>
 								</tr>
 							</tbody>
@@ -179,14 +179,14 @@ 
 										<label>
 											<input type="radio" name="others" value="parents">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her parents and siblings', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his parents and siblings', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her parents and siblings', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his parents and siblings', $record->getFullName());
+												}
+												?>
 										</label>
 									</td>
 								</tr>
@@ -195,14 +195,14 @@ 
 										<label>
 											<input type="radio" name="others" value="members">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and children', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and children', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her spouses and children', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his spouses and children', $record->getFullName());
+												}
+												?>
 										</label>
 									</td>
 								</tr>
@@ -211,18 +211,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestors" id="ancestors">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s and her ancestors', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s and his ancestors', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s and her ancestors', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s and his ancestors', $record->getFullName());
+												}
+												?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
+											<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
 									</td>
 								</tr>
 								<tr>
@@ -230,18 +230,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her ancestors and their families', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his ancestors and their families', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her ancestors and their families', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his ancestors and their families', $record->getFullName());
+												}
+												?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
+											<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
 									</td>
 								</tr>
 								<tr>
@@ -249,18 +249,18 @@ 
 										<label>
 											<input type="radio" name="others" value="descendants" id="descendants">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and descendants', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and descendants', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her spouses and descendants', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his spouses and descendants', $record->getFullName());
+												}
+												?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
+											<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
 									</td>
 								</tr>
 							</tbody>
@@ -302,7 +302,7 @@ 
 										<label>
 											<input type="radio" name="others" value="linked">
 											<?php echo /* I18N: %s is the name of a source */
-											I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
+												I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
 										</label>
 									</td>
 								</tr>
@@ -317,12 +317,12 @@ 
 						</table>
 					</form>
 				<?php }
-			}
+				}
 
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				if ($clip_ctrl->action != 'add') {
-					echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
-					?>
+				if (!$cart[$WT_TREE->getTreeId()]) {
+					if ($clip_ctrl->action != 'add') {
+						echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
+						?>
 					<form method="get" name="addin" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -342,25 +342,25 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+											<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+											<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
+											<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
 						</table>
 					</form>
 					<?php
-				}
+					}
 
-				// -- end new lines
-				echo I18N::translate('Your clippings cart is empty.');
-			} else {
-				// Keep track of the INDI from the parent page, otherwise it will
-				// get lost after ajax updates
-				$pid = Filter::get('pid', WT_REGEX_XREF);
+					// -- end new lines
+					echo I18N::translate('Your clippings cart is empty.');
+				} else {
+					// Keep track of the INDI from the parent page, otherwise it will
+					// get lost after ajax updates
+					$pid = Filter::get('pid', WT_REGEX_XREF);
 
-				if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
+					if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
 					<form method="get" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -468,9 +468,9 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+											<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+											<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
+											<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
@@ -500,32 +500,32 @@ 
 					</thead>
 					<tbody>
 						<?php
-						foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
-							$record = GedcomRecord::getInstance($xref, $WT_TREE);
-							if ($record) {
-								switch ($record::RECORD_TYPE) {
-								case 'INDI':
-									$icon = 'icon-indis';
-									break;
-								case 'FAM':
-									$icon = 'icon-sfamily';
-									break;
-								case 'SOUR':
-									$icon = 'icon-source';
-									break;
-								case 'REPO':
-									$icon = 'icon-repository';
-									break;
-								case 'NOTE':
-									$icon = 'icon-note';
-									break;
-								case 'OBJE':
-									$icon = 'icon-media';
-									break;
-								default:
-									$icon = 'icon-clippings';
-									break;
-								}
+							foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
+								$record = GedcomRecord::getInstance($xref, $WT_TREE);
+								if ($record) {
+									switch ($record::RECORD_TYPE) {
+										case 'INDI':
+											$icon = 'icon-indis';
+											break;
+										case 'FAM':
+											$icon = 'icon-sfamily';
+											break;
+										case 'SOUR':
+											$icon = 'icon-source';
+											break;
+										case 'REPO':
+											$icon = 'icon-repository';
+											break;
+										case 'NOTE':
+											$icon = 'icon-note';
+											break;
+										case 'OBJE':
+											$icon = 'icon-media';
+											break;
+										default:
+											$icon = 'icon-clippings';
+											break;
+									}
 								?>
 								<tr>
 									<td class="list_value">
@@ -544,9 +544,9 @@ 
 				<?php
 			}
 			break;
-		default:
-			http_response_code(404);
-			break;
+			default:
+				http_response_code(404);
+				break;
 		}
 	}
 
@@ -695,12 +695,12 @@ 
 				$record = GedcomRecord::getInstance($xref, $WT_TREE);
 				if ($record instanceof Individual || $record instanceof Family) {
 					switch ($record::RECORD_TYPE) {
-					case 'INDI':
-						$icon = 'icon-indis';
-						break;
-					case 'FAM':
-						$icon = 'icon-sfamily';
-						break;
+						case 'INDI':
+							$icon = 'icon-indis';
+							break;
+						case 'FAM':
+							$icon = 'icon-sfamily';
+							break;
 					}
 					$out .= '<li>';
 					if (!empty($icon)) {

app/Date.php

Switch Indentation +101 added lines, -101 removed lines

@@ -169,22 +169,22 @@ 
 		}
 		// Now construct an object of the correct type
 		switch ($cal) {
-		case '@#DGREGORIAN@':
-			return new GregorianDate(array($y, $m, $d));
-		case '@#DJULIAN@':
-			return new JulianDate(array($y, $m, $d));
-		case '@#DHEBREW@':
-			return new JewishDate(array($y, $m, $d));
-		case '@#DHIJRI@':
-			return new HijriDate(array($y, $m, $d));
-		case '@#DFRENCH R@':
-			return new FrenchDate(array($y, $m, $d));
-		case '@#DJALALI@':
-			return new JalaliDate(array($y, $m, $d));
-		case '@#DROMAN@':
-			return new RomanDate(array($y, $m, $d));
-		default:
-			throw new \DomainException('Invalid calendar');
+			case '@#DGREGORIAN@':
+				return new GregorianDate(array($y, $m, $d));
+			case '@#DJULIAN@':
+				return new JulianDate(array($y, $m, $d));
+			case '@#DHEBREW@':
+				return new JewishDate(array($y, $m, $d));
+			case '@#DHIJRI@':
+				return new HijriDate(array($y, $m, $d));
+			case '@#DFRENCH R@':
+				return new FrenchDate(array($y, $m, $d));
+			case '@#DJALALI@':
+				return new JalaliDate(array($y, $m, $d));
+			case '@#DROMAN@':
+				return new RomanDate(array($y, $m, $d));
+			default:
+				throw new \DomainException('Invalid calendar');
 		}
 	}
 
@@ -291,42 +291,42 @@ 
 
 		// Localise the date
 		switch ($q1 . $q2) {
-		case '':
-			$tmp = $d1 . $conv1;
-			break;
-		case 'ABT':
-			$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
-			break;
-		case 'CAL':
-			$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
-			break;
-		case 'EST':
-			$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
-			break;
-		case 'INT':
-			$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
-			break;
-		case 'BEF':
-			$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
-			break;
-		case 'AFT':
-			$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
-			break;
-		case 'FROM':
-			$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
-			break;
-		case 'TO':
-			$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
-			break;
-		case 'BETAND':
-			$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		case 'FROMTO':
-			$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		default:
-			$tmp = I18N::translate('Invalid date');
-			break; // e.g. BET without AND
+			case '':
+				$tmp = $d1 . $conv1;
+				break;
+			case 'ABT':
+				$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
+				break;
+			case 'CAL':
+				$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
+				break;
+			case 'EST':
+				$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
+				break;
+			case 'INT':
+				$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
+				break;
+			case 'BEF':
+				$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
+				break;
+			case 'AFT':
+				$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
+				break;
+			case 'FROM':
+				$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
+				break;
+			case 'TO':
+				$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
+				break;
+			case 'BETAND':
+				$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
+				break;
+			case 'FROMTO':
+				$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
+				break;
+			default:
+				$tmp = I18N::translate('Invalid date');
+				break; // e.g. BET without AND
 		}
 		if ($this->text && !$q1) {
 			$tmp = I18N::translate('%1$s (%2$s)', $tmp, $this->text);
@@ -445,33 +445,33 @@ 
 		}
 
 		switch ($format) {
-		case 0:
-			// Years - integer only (for statistics, rather than for display)
-			if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
-				return $d1->minimumDate()->getAge(false, $jd, false);
-			} else {
-				return -1;
-			}
-		case 1:
-			// Days - integer only (for sorting, rather than for display)
-			if ($jd && $d1->minimumJulianDay()) {
-				return $jd - $d1->minimumJulianDay();
-			} else {
-				return -1;
-			}
-		case 2:
-			// Just years, in local digits, with warning for negative/
-			if ($jd && $d1->minimumJulianDay()) {
-				if ($d1->minimumJulianDay() > $jd) {
-					return '<i class="icon-warning"></i>';
+			case 0:
+				// Years - integer only (for statistics, rather than for display)
+				if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
+					return $d1->minimumDate()->getAge(false, $jd, false);
 				} else {
-					return I18N::number($d1->minimumDate()->getAge(false, $jd));
+					return -1;
 				}
-			} else {
-				return '';
-			}
-		default:
-			throw new \InvalidArgumentException('format: ' . $format);
+			case 1:
+				// Days - integer only (for sorting, rather than for display)
+				if ($jd && $d1->minimumJulianDay()) {
+					return $jd - $d1->minimumJulianDay();
+				} else {
+					return -1;
+				}
+			case 2:
+				// Just years, in local digits, with warning for negative/
+				if ($jd && $d1->minimumJulianDay()) {
+					if ($d1->minimumJulianDay() > $jd) {
+						return '<i class="icon-warning"></i>';
+					} else {
+						return I18N::number($d1->minimumDate()->getAge(false, $jd));
+					}
+				} else {
+					return '';
+				}
+			default:
+				throw new \InvalidArgumentException('format: ' . $format);
 		}
 	}
 
@@ -515,32 +515,32 @@ 
 	public static function compare(Date $a, Date $b) {
 		// Get min/max JD for each date.
 		switch ($a->qual1) {
-		case 'BEF':
-			$amin = $a->minimumJulianDay() - 1;
-			$amax = $amin;
-			break;
-		case 'AFT':
-			$amax = $a->maximumJulianDay() + 1;
-			$amin = $amax;
-			break;
-		default:
-			$amin = $a->minimumJulianDay();
-			$amax = $a->maximumJulianDay();
-			break;
+			case 'BEF':
+				$amin = $a->minimumJulianDay() - 1;
+				$amax = $amin;
+				break;
+			case 'AFT':
+				$amax = $a->maximumJulianDay() + 1;
+				$amin = $amax;
+				break;
+			default:
+				$amin = $a->minimumJulianDay();
+				$amax = $a->maximumJulianDay();
+				break;
 		}
 		switch ($b->qual1) {
-		case 'BEF':
-			$bmin = $b->minimumJulianDay() - 1;
-			$bmax = $bmin;
-			break;
-		case 'AFT':
-			$bmax = $b->maximumJulianDay() + 1;
-			$bmin = $bmax;
-			break;
-		default:
-			$bmin = $b->minimumJulianDay();
-			$bmax = $b->maximumJulianDay();
-			break;
+			case 'BEF':
+				$bmin = $b->minimumJulianDay() - 1;
+				$bmax = $bmin;
+				break;
+			case 'AFT':
+				$bmax = $b->maximumJulianDay() + 1;
+				$bmin = $bmax;
+				break;
+			default:
+				$bmin = $b->minimumJulianDay();
+				$bmax = $b->maximumJulianDay();
+				break;
 		}
 		if ($amax < $bmin) {
 			return -1;

app/Stats.php

Switch Indentation +387 added lines, -387 removed lines

@@ -303,22 +303,22 @@ 
 	 */
 	private function getPercentage($total, $type) {
 		switch ($type) {
-		case 'individual':
-			$type = $this->totalIndividualsQuery();
-			break;
-		case 'family':
-			$type = $this->totalFamiliesQuery();
-			break;
-		case 'source':
-			$type = $this->totalSourcesQuery();
-			break;
-		case 'note':
-			$type = $this->totalNotesQuery();
-			break;
-		case 'all':
-		default:
-			$type = $this->totalIndividualsQuery() + $this->totalFamiliesQuery() + $this->totalSourcesQuery();
-			break;
+			case 'individual':
+				$type = $this->totalIndividualsQuery();
+				break;
+			case 'family':
+				$type = $this->totalFamiliesQuery();
+				break;
+			case 'source':
+				$type = $this->totalSourcesQuery();
+				break;
+			case 'note':
+				$type = $this->totalNotesQuery();
+				break;
+			case 'all':
+			default:
+				$type = $this->totalIndividualsQuery() + $this->totalFamiliesQuery() + $this->totalSourcesQuery();
+				break;
 		}
 		if ($type == 0) {
 			return I18N::percentage(0, 1);
@@ -1444,29 +1444,29 @@ 
 		$row    = $rows[0];
 		$record = GedcomRecord::getInstance($row['d_gid'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($record->canShow()) {
-				$result = $record->formatList('span', false, $record->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'year':
-			$date   = new Date($row['d_type'] . ' ' . $row['d_year']);
-			$result = $date->display();
-			break;
-		case 'name':
-			$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
-			break;
-		case 'place':
-			$fact = GedcomRecord::getInstance($row['d_gid'], $this->tree)->getFirstFact($row['d_fact']);
-			if ($fact) {
-				$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
-			} else {
-				$result = I18N::translate('Private');
-			}
-			break;
+			default:
+			case 'full':
+				if ($record->canShow()) {
+					$result = $record->formatList('span', false, $record->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'year':
+				$date   = new Date($row['d_type'] . ' ' . $row['d_year']);
+				$result = $date->display();
+				break;
+			case 'name':
+				$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
+				break;
+			case 'place':
+				$fact = GedcomRecord::getInstance($row['d_gid'], $this->tree)->getFirstFact($row['d_fact']);
+				if ($fact) {
+					$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
+				} else {
+					$result = I18N::translate('Private');
+				}
+				break;
 		}
 
 		return $result;
@@ -1631,96 +1631,96 @@ 
 		}
 		I18N::init(WT_LOCALE);
 		switch ($chart_type) {
-		case 'surname_distribution_chart':
-			if ($surname == "") {
-				$surname = $this->getCommonSurname();
-			}
-			$chart_title = I18N::translate('Surname distribution chart') . ': ' . $surname;
-			// Count how many people are events in each country
-			$surn_countries = array();
-			$indis          = QueryName::individuals($this->tree, I18N::strtoupper($surname), '', '', false, false);
-			foreach ($indis as $person) {
-				if (preg_match_all('/^2 PLAC (?:.*, *)*(.*)/m', $person->getGedcom(), $matches)) {
-					// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
-					foreach ($matches[1] as $country) {
-						if (array_key_exists($country, $country_to_iso3166)) {
-							if (array_key_exists($country_to_iso3166[$country], $surn_countries)) {
-								$surn_countries[$country_to_iso3166[$country]]++;
-							} else {
-								$surn_countries[$country_to_iso3166[$country]] = 1;
+			case 'surname_distribution_chart':
+				if ($surname == "") {
+					$surname = $this->getCommonSurname();
+				}
+				$chart_title = I18N::translate('Surname distribution chart') . ': ' . $surname;
+				// Count how many people are events in each country
+				$surn_countries = array();
+				$indis          = QueryName::individuals($this->tree, I18N::strtoupper($surname), '', '', false, false);
+				foreach ($indis as $person) {
+					if (preg_match_all('/^2 PLAC (?:.*, *)*(.*)/m', $person->getGedcom(), $matches)) {
+						// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
+						foreach ($matches[1] as $country) {
+							if (array_key_exists($country, $country_to_iso3166)) {
+								if (array_key_exists($country_to_iso3166[$country], $surn_countries)) {
+									$surn_countries[$country_to_iso3166[$country]]++;
+								} else {
+									$surn_countries[$country_to_iso3166[$country]] = 1;
+								}
 							}
 						}
 					}
-				}
-			};
-			break;
-		case 'birth_distribution_chart':
-			$chart_title = I18N::translate('Birth by country');
-			// Count how many people were born in each country
-			$surn_countries = array();
-			$b_countries    = $this->statsPlaces('INDI', 'BIRT', 0, true);
-			foreach ($b_countries as $place => $count) {
-				$country = $place;
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $count;
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $count;
+				};
+				break;
+			case 'birth_distribution_chart':
+				$chart_title = I18N::translate('Birth by country');
+				// Count how many people were born in each country
+				$surn_countries = array();
+				$b_countries    = $this->statsPlaces('INDI', 'BIRT', 0, true);
+				foreach ($b_countries as $place => $count) {
+					$country = $place;
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $count;
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $count;
+						}
 					}
 				}
-			}
-			break;
-		case 'death_distribution_chart':
-			$chart_title = I18N::translate('Death by country');
-			// Count how many people were death in each country
-			$surn_countries = array();
-			$d_countries    = $this->statsPlaces('INDI', 'DEAT', 0, true);
-			foreach ($d_countries as $place => $count) {
-				$country = $place;
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $count;
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $count;
+				break;
+			case 'death_distribution_chart':
+				$chart_title = I18N::translate('Death by country');
+				// Count how many people were death in each country
+				$surn_countries = array();
+				$d_countries    = $this->statsPlaces('INDI', 'DEAT', 0, true);
+				foreach ($d_countries as $place => $count) {
+					$country = $place;
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $count;
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $count;
+						}
 					}
 				}
-			}
-			break;
-		case 'marriage_distribution_chart':
-			$chart_title = I18N::translate('Marriage by country');
-			// Count how many families got marriage in each country
-			$surn_countries = array();
-			$m_countries    = $this->statsPlaces('FAM');
-			// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
-			foreach ($m_countries as $place) {
-				$country = $place['country'];
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+				break;
+			case 'marriage_distribution_chart':
+				$chart_title = I18N::translate('Marriage by country');
+				// Count how many families got marriage in each country
+				$surn_countries = array();
+				$m_countries    = $this->statsPlaces('FAM');
+				// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
+				foreach ($m_countries as $place) {
+					$country = $place['country'];
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+						}
 					}
 				}
-			}
-			break;
-		case 'indi_distribution_chart':
-		default:
-			$chart_title = I18N::translate('Individual distribution chart');
-			// Count how many people have events in each country
-			$surn_countries = array();
-			$a_countries    = $this->statsPlaces('INDI');
-			// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
-			foreach ($a_countries as $place) {
-				$country = $place['country'];
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+				break;
+			case 'indi_distribution_chart':
+			default:
+				$chart_title = I18N::translate('Individual distribution chart');
+				// Count how many people have events in each country
+				$surn_countries = array();
+				$a_countries    = $this->statsPlaces('INDI');
+				// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
+				foreach ($a_countries as $place) {
+					$country = $place['country'];
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+						}
 					}
 				}
-			}
-			break;
+				break;
 		}
 		$chart_url = "https://chart.googleapis.com/chart?cht=t&amp;chtm=" . $chart_shows;
 		$chart_url .= "&amp;chco=" . $WT_STATS_CHART_COLOR1 . "," . $WT_STATS_CHART_COLOR3 . "," . $WT_STATS_CHART_COLOR2; // country colours
@@ -2259,20 +2259,20 @@ 
 		$row    = $rows[0];
 		$person = Individual::getInstance($row['id'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($person->canShowName()) {
-				$result = $person->formatList('span', false, $person->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'age':
-			$result = I18N::number((int) ($row['age'] / 365.25));
-			break;
-		case 'name':
-			$result = "<a href=\"" . $person->getHtmlUrl() . "\">" . $person->getFullName() . "</a>";
-			break;
+			default:
+			case 'full':
+				if ($person->canShowName()) {
+					$result = $person->formatList('span', false, $person->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'age':
+				$result = I18N::number((int) ($row['age'] / 365.25));
+				break;
+			case 'name':
+				$result = "<a href=\"" . $person->getHtmlUrl() . "\">" . $person->getFullName() . "</a>";
+				break;
 		}
 
 		return $result;
@@ -2942,36 +2942,36 @@ 
 		$row    = $rows[0];
 		$record = GedcomRecord::getInstance($row['id'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($record->canShow()) {
-				$result = $record->formatList('span', false, $record->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'year':
-			$date   = new Date($row['type'] . ' ' . $row['year']);
-			$result = $date->display();
-			break;
-		case 'type':
-			if (isset($eventTypes[$row['fact']])) {
-				$result = $eventTypes[$row['fact']];
-			} else {
-				$result = GedcomTag::getLabel($row['fact']);
-			}
-			break;
-		case 'name':
-			$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
-			break;
-		case 'place':
-			$fact = $record->getFirstFact($row['fact']);
-			if ($fact) {
-				$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
-			} else {
-				$result = I18N::translate('Private');
-			}
-			break;
+			default:
+			case 'full':
+				if ($record->canShow()) {
+					$result = $record->formatList('span', false, $record->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'year':
+				$date   = new Date($row['type'] . ' ' . $row['year']);
+				$result = $date->display();
+				break;
+			case 'type':
+				if (isset($eventTypes[$row['fact']])) {
+					$result = $eventTypes[$row['fact']];
+				} else {
+					$result = GedcomTag::getLabel($row['fact']);
+				}
+				break;
+			case 'name':
+				$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
+				break;
+			case 'place':
+				$fact = $record->getFirstFact($row['fact']);
+				if ($fact) {
+					$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
+				} else {
+					$result = I18N::translate('Private');
+				}
+				break;
 		}
 
 		return $result;
@@ -3116,32 +3116,32 @@ 
 			$person = Individual::getInstance($row['i_id'], $this->tree);
 		}
 		switch ($type) {
-		default:
-		case 'full':
-			if ($family->canShow()) {
-				$result = $family->formatList('span', false, $person->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'name':
-			$result = '<a href="' . $family->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
-			break;
-		case 'age':
-			$age = $row['age'];
-			if ($show_years) {
-				if ((int) ($age / 365.25) > 0) {
-					$age = (int) ($age / 365.25) . 'y';
-				} elseif ((int) ($age / 30.4375) > 0) {
-					$age = (int) ($age / 30.4375) . 'm';
+			default:
+			case 'full':
+				if ($family->canShow()) {
+					$result = $family->formatList('span', false, $person->getFullName());
 				} else {
-					$age = $age . 'd';
+					$result = I18N::translate('This information is private and cannot be shown.');
 				}
-				$result = FunctionsDate::getAgeAtEvent($age);
-			} else {
-				$result = I18N::number((int) ($age / 365.25));
-			}
-			break;
+				break;
+			case 'name':
+				$result = '<a href="' . $family->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
+				break;
+			case 'age':
+				$age = $row['age'];
+				if ($show_years) {
+					if ((int) ($age / 365.25) > 0) {
+						$age = (int) ($age / 365.25) . 'y';
+					} elseif ((int) ($age / 30.4375) > 0) {
+						$age = (int) ($age / 30.4375) . 'm';
+					} else {
+						$age = $age . 'd';
+					}
+					$result = FunctionsDate::getAgeAtEvent($age);
+				} else {
+					$result = I18N::number((int) ($age / 365.25));
+				}
+				break;
 		}
 
 		return $result;
@@ -3414,32 +3414,32 @@ 
 			$person = Individual::getInstance($row['id'], $this->tree);
 		}
 		switch ($type) {
-		default:
-		case 'full':
-			if ($person->canShow()) {
-				$result = $person->formatList('span', false, $person->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'name':
-			$result = '<a href="' . $person->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
-			break;
-		case 'age':
-			$age = $row['age'];
-			if ($show_years) {
-				if ((int) ($age / 365.25) > 0) {
-					$age = (int) ($age / 365.25) . 'y';
-				} elseif ((int) ($age / 30.4375) > 0) {
-					$age = (int) ($age / 30.4375) . 'm';
+			default:
+			case 'full':
+				if ($person->canShow()) {
+					$result = $person->formatList('span', false, $person->getFullName());
 				} else {
-					$age = $age . 'd';
+					$result = I18N::translate('This information is private and cannot be shown.');
 				}
-				$result = FunctionsDate::getAgeAtEvent($age);
-			} else {
-				$result = (int) ($age / 365.25);
-			}
-			break;
+				break;
+			case 'name':
+				$result = '<a href="' . $person->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
+				break;
+			case 'age':
+				$age = $row['age'];
+				if ($show_years) {
+					if ((int) ($age / 365.25) > 0) {
+						$age = (int) ($age / 365.25) . 'y';
+					} elseif ((int) ($age / 30.4375) > 0) {
+						$age = (int) ($age / 30.4375) . 'm';
+					} else {
+						$age = $age . 'd';
+					}
+					$result = FunctionsDate::getAgeAtEvent($age);
+				} else {
+					$result = (int) ($age / 365.25);
+				}
+				break;
 		}
 
 		return $result;
@@ -4397,20 +4397,20 @@ 
 		$row    = $rows[0];
 		$family = Family::getInstance($row['id'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($family->canShow()) {
-				$result = $family->formatList('span', false, $family->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'size':
-			$result = I18N::number($row['tot']);
-			break;
-		case 'name':
-			$result = "<a href=\"" . $family->getHtmlUrl() . "\">" . $family->getFullName() . '</a>';
-			break;
+			default:
+			case 'full':
+				if ($family->canShow()) {
+					$result = $family->formatList('span', false, $family->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'size':
+				$result = I18N::number($row['tot']);
+				break;
+			case 'name':
+				$result = "<a href=\"" . $family->getHtmlUrl() . "\">" . $family->getFullName() . '</a>';
+				break;
 		}
 
 		return $result;
@@ -4689,43 +4689,43 @@ 
 			foreach ($rows as $values) {
 				$counts[] = round(100 * $values['total'] / $tot, 0);
 				switch ($values['d_month']) {
-				default:
-				case 'JAN':
-					$values['d_month'] = 1;
-					break;
-				case 'FEB':
-					$values['d_month'] = 2;
-					break;
-				case 'MAR':
-					$values['d_month'] = 3;
-					break;
-				case 'APR':
-					$values['d_month'] = 4;
-					break;
-				case 'MAY':
-					$values['d_month'] = 5;
-					break;
-				case 'JUN':
-					$values['d_month'] = 6;
-					break;
-				case 'JUL':
-					$values['d_month'] = 7;
-					break;
-				case 'AUG':
-					$values['d_month'] = 8;
-					break;
-				case 'SEP':
-					$values['d_month'] = 9;
-					break;
-				case 'OCT':
-					$values['d_month'] = 10;
-					break;
-				case 'NOV':
-					$values['d_month'] = 11;
-					break;
-				case 'DEC':
-					$values['d_month'] = 12;
-					break;
+					default:
+					case 'JAN':
+						$values['d_month'] = 1;
+						break;
+					case 'FEB':
+						$values['d_month'] = 2;
+						break;
+					case 'MAR':
+						$values['d_month'] = 3;
+						break;
+					case 'APR':
+						$values['d_month'] = 4;
+						break;
+					case 'MAY':
+						$values['d_month'] = 5;
+						break;
+					case 'JUN':
+						$values['d_month'] = 6;
+						break;
+					case 'JUL':
+						$values['d_month'] = 7;
+						break;
+					case 'AUG':
+						$values['d_month'] = 8;
+						break;
+					case 'SEP':
+						$values['d_month'] = 9;
+						break;
+					case 'OCT':
+						$values['d_month'] = 10;
+						break;
+					case 'NOV':
+						$values['d_month'] = 11;
+						break;
+					case 'DEC':
+						$values['d_month'] = 12;
+						break;
 				}
 				$text .= I18N::translate(ucfirst(strtolower(($values['d_month'])))) . ' - ' . $values['total'] . '|';
 			}
@@ -5316,16 +5316,16 @@ 
 		}
 
 		switch ($sorting) {
-		default:
-		case 'alpha':
-			uksort($surname_list, '\Fisharebest\Webtrees\I18N::strcasecmp');
-			break;
-		case 'count':
-			asort($surname_list);
-			break;
-		case 'rcount':
-			arsort($surname_list);
-			break;
+			default:
+			case 'alpha':
+				uksort($surname_list, '\Fisharebest\Webtrees\I18N::strcasecmp');
+				break;
+			case 'count':
+				asort($surname_list);
+				break;
+			case 'rcount':
+				arsort($surname_list);
+				break;
 		}
 
 		// Note that we count/display SPFX SURN, but sort/group under just SURN
@@ -5439,9 +5439,9 @@ 
 				}
 			}
 			switch ($SURNAME_TRADITION) {
-			case 'polish':
-				// most common surname should be in male variant (Kowalski, not Kowalska)
-				$top_name = preg_replace(array('/ska$/', '/cka$/', '/dzka$/', '/żka$/'), array('ski', 'cki', 'dzki', 'żki'), $top_name);
+				case 'polish':
+					// most common surname should be in male variant (Kowalski, not Kowalska)
+					$top_name = preg_replace(array('/ska$/', '/cka$/', '/dzka$/', '/żka$/'), array('ski', 'cki', 'dzki', 'żki'), $top_name);
 			}
 			$per = round(100 * $count_per / $tot_indi, 0);
 			$chd .= $this->arrayToExtendedEncoding(array($per));
@@ -5481,19 +5481,19 @@ 
 		}
 
 		switch ($sex) {
-		case 'M':
-			$sex_sql = "i_sex='M'";
-			break;
-		case 'F':
-			$sex_sql = "i_sex='F'";
-			break;
-		case 'U':
-			$sex_sql = "i_sex='U'";
-			break;
-		case 'B':
-		default:
-			$sex_sql = "i_sex<>'U'";
-			break;
+			case 'M':
+				$sex_sql = "i_sex='M'";
+				break;
+			case 'F':
+				$sex_sql = "i_sex='F'";
+				break;
+			case 'U':
+				$sex_sql = "i_sex='U'";
+				break;
+			case 'B':
+			default:
+				$sex_sql = "i_sex<>'U'";
+				break;
 		}
 		$ged_id = $this->tree->getTreeId();
 
@@ -5538,25 +5538,25 @@ 
 				$tot = '';
 			}
 			switch ($type) {
-			case 'table':
-				$common[] = '<tr><td>' . $given . '</td><td>' . I18N::number($total) . '</td><td>' . $total . '</td></tr>';
-				break;
-			case 'list':
-				$common[] = '<li><span dir="auto">' . $given . '</span>' . $tot . '</li>';
-				break;
-			case 'nolist':
-				$common[] = '<span dir="auto">' . $given . '</span>' . $tot;
-				break;
+				case 'table':
+					$common[] = '<tr><td>' . $given . '</td><td>' . I18N::number($total) . '</td><td>' . $total . '</td></tr>';
+					break;
+				case 'list':
+					$common[] = '<li><span dir="auto">' . $given . '</span>' . $tot . '</li>';
+					break;
+				case 'nolist':
+					$common[] = '<span dir="auto">' . $given . '</span>' . $tot;
+					break;
 			}
 		}
 		if ($common) {
 			switch ($type) {
-			case 'table':
-				global $controller;
-				$table_id = Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-				$controller
-					->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-					->addInlineJavascript('
+				case 'table':
+					global $controller;
+					$table_id = Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+					$controller
+						->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+						->addInlineJavascript('
 					jQuery("#' . $table_id . '").dataTable({
 						dom: \'t\',
 						autoWidth: false,
@@ -5574,15 +5574,15 @@ 
 					});
 					jQuery("#' . $table_id . '").css("visibility", "visible");
 				');
-				$lookup = array('M' => I18N::translate('Male'), 'F' => I18N::translate('Female'), 'U' => I18N::translateContext('unknown gender', 'Unknown'), 'B' => I18N::translate('All'));
+					$lookup = array('M' => I18N::translate('Male'), 'F' => I18N::translate('Female'), 'U' => I18N::translateContext('unknown gender', 'Unknown'), 'B' => I18N::translate('All'));
 
-				return '<table id="' . $table_id . '" class="givn-list"><thead><tr><th class="ui-state-default" colspan="3">' . $lookup[$sex] . '</th></tr><tr><th>' . I18N::translate('Name') . '</th><th>' . I18N::translate('Count') . '</th><th>COUNT</th></tr></thead><tbody>' . implode('', $common) . '</tbody></table>';
-			case 'list':
-				return '<ul>' . implode('', $common) . '</ul>';
-			case 'nolist':
-				return implode(I18N::$list_separator, $common);
-			default:
-				return '';
+					return '<table id="' . $table_id . '" class="givn-list"><thead><tr><th class="ui-state-default" colspan="3">' . $lookup[$sex] . '</th></tr><tr><th>' . I18N::translate('Name') . '</th><th>' . I18N::translate('Count') . '</th><th>COUNT</th></tr></thead><tbody>' . implode('', $common) . '</tbody></table>';
+				case 'list':
+					return '<ul>' . implode('', $common) . '</ul>';
+				case 'nolist':
+					return implode(I18N::$list_separator, $common);
+				default:
+					return '';
 			}
 		} else {
 			return '';
@@ -6069,42 +6069,42 @@ 
 		}
 
 		switch ($type) {
-		default:
-		case 'userid':
-			return $user->getUserId();
-		case 'username':
-			return Filter::escapeHtml($user->getUserName());
-		case 'fullname':
-			return $user->getRealNameHtml();
-		case 'regdate':
-			if (is_array($params) && isset($params[0]) && $params[0] != '') {
-				$datestamp = $params[0];
-			} else {
-				$datestamp = I18N::dateFormat();
-			}
+			default:
+			case 'userid':
+				return $user->getUserId();
+			case 'username':
+				return Filter::escapeHtml($user->getUserName());
+			case 'fullname':
+				return $user->getRealNameHtml();
+			case 'regdate':
+				if (is_array($params) && isset($params[0]) && $params[0] != '') {
+					$datestamp = $params[0];
+				} else {
+					$datestamp = I18N::dateFormat();
+				}
 
-			return FunctionsDate::timestampToGedcomDate($user->getPreference('reg_timestamp'))->display(false, $datestamp);
-		case 'regtime':
-			if (is_array($params) && isset($params[0]) && $params[0] != '') {
-				$datestamp = $params[0];
-			} else {
-				$datestamp = str_replace('%', '', I18N::timeFormat());
-			}
+				return FunctionsDate::timestampToGedcomDate($user->getPreference('reg_timestamp'))->display(false, $datestamp);
+			case 'regtime':
+				if (is_array($params) && isset($params[0]) && $params[0] != '') {
+					$datestamp = $params[0];
+				} else {
+					$datestamp = str_replace('%', '', I18N::timeFormat());
+				}
 
-			return date($datestamp, $user->getPreference('reg_timestamp'));
-		case 'loggedin':
-			if (is_array($params) && isset($params[0]) && $params[0] != '') {
-				$yes = $params[0];
-			} else {
-				$yes = I18N::translate('yes');
-			}
-			if (is_array($params) && isset($params[1]) && $params[1] != '') {
-				$no = $params[1];
-			} else {
-				$no = I18N::translate('no');
-			}
+				return date($datestamp, $user->getPreference('reg_timestamp'));
+			case 'loggedin':
+				if (is_array($params) && isset($params[0]) && $params[0] != '') {
+					$yes = $params[0];
+				} else {
+					$yes = I18N::translate('yes');
+				}
+				if (is_array($params) && isset($params[1]) && $params[1] != '') {
+					$no = $params[1];
+				} else {
+					$no = I18N::translate('no');
+				}
 
-			return Database::prepare("SELECT 1 FROM `##session` WHERE user_id=? LIMIT 1")->execute(array($user->getUserId()))->fetchOne() ? $yes : $no;
+				return Database::prepare("SELECT 1 FROM `##session` WHERE user_id=? LIMIT 1")->execute(array($user->getUserId()))->fetchOne() ? $yes : $no;
 		}
 	}
 
@@ -6941,50 +6941,50 @@ 
 		}
 		// The current chart engine (Google charts) can't handle <sup></sup> markup
 		switch ($century) {
-		case 21:
-			return strip_tags(I18N::translateContext('CENTURY', '21st'));
-		case 20:
-			return strip_tags(I18N::translateContext('CENTURY', '20th'));
-		case 19:
-			return strip_tags(I18N::translateContext('CENTURY', '19th'));
-		case 18:
-			return strip_tags(I18N::translateContext('CENTURY', '18th'));
-		case 17:
-			return strip_tags(I18N::translateContext('CENTURY', '17th'));
-		case 16:
-			return strip_tags(I18N::translateContext('CENTURY', '16th'));
-		case 15:
-			return strip_tags(I18N::translateContext('CENTURY', '15th'));
-		case 14:
-			return strip_tags(I18N::translateContext('CENTURY', '14th'));
-		case 13:
-			return strip_tags(I18N::translateContext('CENTURY', '13th'));
-		case 12:
-			return strip_tags(I18N::translateContext('CENTURY', '12th'));
-		case 11:
-			return strip_tags(I18N::translateContext('CENTURY', '11th'));
-		case 10:
-			return strip_tags(I18N::translateContext('CENTURY', '10th'));
-		case  9:
-			return strip_tags(I18N::translateContext('CENTURY', '9th'));
-		case  8:
-			return strip_tags(I18N::translateContext('CENTURY', '8th'));
-		case  7:
-			return strip_tags(I18N::translateContext('CENTURY', '7th'));
-		case  6:
-			return strip_tags(I18N::translateContext('CENTURY', '6th'));
-		case  5:
-			return strip_tags(I18N::translateContext('CENTURY', '5th'));
-		case  4:
-			return strip_tags(I18N::translateContext('CENTURY', '4th'));
-		case  3:
-			return strip_tags(I18N::translateContext('CENTURY', '3rd'));
-		case  2:
-			return strip_tags(I18N::translateContext('CENTURY', '2nd'));
-		case  1:
-			return strip_tags(I18N::translateContext('CENTURY', '1st'));
-		default:
-			return ($century - 1) . '01-' . $century . '00';
+			case 21:
+				return strip_tags(I18N::translateContext('CENTURY', '21st'));
+			case 20:
+				return strip_tags(I18N::translateContext('CENTURY', '20th'));
+			case 19:
+				return strip_tags(I18N::translateContext('CENTURY', '19th'));
+			case 18:
+				return strip_tags(I18N::translateContext('CENTURY', '18th'));
+			case 17:
+				return strip_tags(I18N::translateContext('CENTURY', '17th'));
+			case 16:
+				return strip_tags(I18N::translateContext('CENTURY', '16th'));
+			case 15:
+				return strip_tags(I18N::translateContext('CENTURY', '15th'));
+			case 14:
+				return strip_tags(I18N::translateContext('CENTURY', '14th'));
+			case 13:
+				return strip_tags(I18N::translateContext('CENTURY', '13th'));
+			case 12:
+				return strip_tags(I18N::translateContext('CENTURY', '12th'));
+			case 11:
+				return strip_tags(I18N::translateContext('CENTURY', '11th'));
+			case 10:
+				return strip_tags(I18N::translateContext('CENTURY', '10th'));
+			case  9:
+				return strip_tags(I18N::translateContext('CENTURY', '9th'));
+			case  8:
+				return strip_tags(I18N::translateContext('CENTURY', '8th'));
+			case  7:
+				return strip_tags(I18N::translateContext('CENTURY', '7th'));
+			case  6:
+				return strip_tags(I18N::translateContext('CENTURY', '6th'));
+			case  5:
+				return strip_tags(I18N::translateContext('CENTURY', '5th'));
+			case  4:
+				return strip_tags(I18N::translateContext('CENTURY', '4th'));
+			case  3:
+				return strip_tags(I18N::translateContext('CENTURY', '3rd'));
+			case  2:
+				return strip_tags(I18N::translateContext('CENTURY', '2nd'));
+			case  1:
+				return strip_tags(I18N::translateContext('CENTURY', '1st'));
+			default:
+				return ($century - 1) . '01-' . $century . '00';
 		}
 	}
 }

editnews.php

Switch Indentation +38 added lines, -38 removed lines

@@ -44,44 +44,44 @@
 $text      = Filter::post('text');
 
 switch ($action) {
-case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+	case 'compose':
+		if (Module::getModuleByName('ckeditor')) {
+			CkeditorModule::enableEditor($controller);
+		}
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
-case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+		echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+		echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+		if ($news_id) {
+			$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+		} else {
+			$news              = array();
+			$news['user_id']   = $user_id;
+			$news['gedcom_id'] = $gedcom_id;
+			$news['date']      = WT_TIMESTAMP;
+			$news['subject']   = '';
+			$news['body']      = '';
+		}
+		echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+		echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+		echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+		echo '<table>';
+		echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+		echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+		echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+		echo '<tr><td>';
+		echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+		echo '</td></tr>';
+		echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+		echo '</table>';
+		echo '</form>';
+		break;
+	case 'save':
+		if ($news_id) {
+			Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+		} else {
+			Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+		}
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+		$controller->addInlineJavascript('window.opener.location.reload();window.close();');
+		break;
 }

autocomplete.php

Switch Indentation +424 added lines, -424 removed lines

@@ -31,471 +31,471 @@
 $type = Filter::get('field');
 
 switch ($type) {
-case 'ASSO': // Associates of an individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collate"
-	)->execute(array(
-		'term_1'  => $term,
-		'term_2'  => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-		'collate' => I18N::collation(),
-	))->fetchAll();
-
-	// Filter for privacy and whether they could be alive at the right time
-	$event_date = Filter::get('extra');
-	$date       = new Date($event_date);
-	$event_jd   = $date->julianDay();
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShow()) {
-			if ($event_jd) {
-				// Exclude individuals who were born after the event.
-				$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
-				if ($person_birth_jd && $person_birth_jd > $event_jd) {
-					continue;
+	case 'ASSO': // Associates of an individuals, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collate"
+		)->execute(array(
+			'term_1'  => $term,
+			'term_2'  => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+			'collate' => I18N::collation(),
+		))->fetchAll();
+
+		// Filter for privacy and whether they could be alive at the right time
+		$event_date = Filter::get('extra');
+		$date       = new Date($event_date);
+		$event_jd   = $date->julianDay();
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShow()) {
+				if ($event_jd) {
+					// Exclude individuals who were born after the event.
+					$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
+					if ($person_birth_jd && $person_birth_jd > $event_jd) {
+						continue;
+					}
+					// Exclude individuals who died before the event.
+					$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
+					if ($person_death_jd && $person_death_jd < $event_jd) {
+						continue;
+					}
 				}
-				// Exclude individuals who died before the event.
-				$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
-				if ($person_death_jd && $person_death_jd < $event_jd) {
-					continue;
+				// Add the age (if we have it) or the lifespan (if we do not).
+				$label = $person->getFullName();
+				if ($event_jd && $person->getBirthDate()->isOK()) {
+					$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
+				} else {
+					$label .= ', <i>' . $person->getLifeSpan() . '</i>';
 				}
-			}
-			// Add the age (if we have it) or the lifespan (if we do not).
-			$label = $person->getFullName();
-			if ($event_jd && $person->getBirthDate()->isOK()) {
-				$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
-			} else {
-				$label .= ', <i>' . $person->getLifeSpan() . '</i>';
-			}
-			$data[$row->xref] = array('value' => $row->xref, 'label' => $label);
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'CEME': // Cemetery fields, that contain the search term
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
-		" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
-	)->execute(array(
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
-			if (!in_array($match[1], $data)) {
-				$data[] = $match[1];
+				$data[$row->xref] = array('value' => $row->xref, 'label' => $label);
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'FAM': // Families, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'GIVN': // Given names, that start with the search term
-	// Do not filter by privacy. Given names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT DISTINCT n_givn" .
-			" FROM `##name`" .
-			" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_givn COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'CEME': // Cemetery fields, that contain the search term
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
+			" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
 		)->execute(array(
-			'term'      => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'INDI': // Individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collation"
-	)->execute(array(
-		'term_1'    => $term,
-		'term_2'    => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'NOTE': // Notes which contain the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'OBJE':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC': // Place names (with hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	$data = array();
-	foreach (Place::findPlaces($term, $WT_TREE) as $place) {
-		$data[] = $place->getGedcomName();
-	}
-	if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
-		// No place found? Use an external gazetteer
-		$url =
-			"http://api.geonames.org/searchJSON" .
-			"?name_startsWith=" . urlencode($term) .
-			"&lang=" . WT_LOCALE .
-			"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
-			"&style=full" .
-			"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
-		// try to use curl when file_get_contents not allowed
-		if (ini_get('allow_url_fopen')) {
-			$json = file_get_contents($url);
-		} elseif (function_exists('curl_init')) {
-			$ch = curl_init();
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			$json = curl_exec($ch);
-			curl_close($ch);
-		} else {
-			return $data;
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
+				if (!in_array($match[1], $data)) {
+					$data[] = $match[1];
+				}
+			}
 		}
-		$places = json_decode($json, true);
-		if (isset($places['geonames']) && is_array($places['geonames'])) {
-			foreach ($places['geonames'] as $k => $place) {
-				$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+		echo json_encode($data);
+
+		return;
+
+	case 'FAM': // Families, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC2': // Place names (without hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT p_place" .
-			" FROM `##places`" .
-			" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
-			" ORDER BY p_place COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'GIVN': // Given names, that start with the search term
+		// Do not filter by privacy. Given names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT DISTINCT n_givn" .
+				" FROM `##name`" .
+				" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_givn COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'INDI': // Individuals, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collation"
 		)->execute(array(
-			'term'      => $term,
+			'term_1'    => $term,
+			'term_2'    => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'REPO': // Repositories, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('NAME') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'REPO_NAME': // Repository names, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			$data[] = strip_tags($record->getFullName());
+		echo json_encode($data);
+
+		return;
+
+	case 'NOTE': // Notes which contain the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR': // Sources, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('TITL') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+		echo json_encode($data);
+
+		return;
+
+	case 'OBJE':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'PAGE': // Citation details, for a given source, that contain the search term
-	$data = array();
-	$sid  = Filter::get('extra', WT_REGEX_XREF);
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+	case 'PLAC': // Place names (with hierarchy), that include the search term
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		$data = array();
+		foreach (Place::findPlaces($term, $WT_TREE) as $place) {
+			$data[] = $place->getGedcomName();
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+		if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
+			// No place found? Use an external gazetteer
+			$url =
+				"http://api.geonames.org/searchJSON" .
+				"?name_startsWith=" . urlencode($term) .
+				"&lang=" . WT_LOCALE .
+				"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
+				"&style=full" .
+				"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
+			// try to use curl when file_get_contents not allowed
+			if (ini_get('allow_url_fopen')) {
+				$json = file_get_contents($url);
+			} elseif (function_exists('curl_init')) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				$json = curl_exec($ch);
+				curl_close($ch);
+			} else {
+				return $data;
+			}
+			$places = json_decode($json, true);
+			if (isset($places['geonames']) && is_array($places['geonames'])) {
+				foreach ($places['geonames'] as $k => $place) {
+					$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+				}
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT f_id AS xref, f_gedcom AS gedcom" .
-		" FROM `##families`" .
-		" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'PLAC2': // Place names (without hierarchy), that include the search term
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT p_place" .
+				" FROM `##places`" .
+				" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
+				" ORDER BY p_place COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'REPO': // Repositories, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('NAME') as $fact) {
+					$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+				}
+			}
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'REPO_NAME': // Repository names, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				$data[] = strip_tags($record->getFullName());
+			}
 		}
-	}
-	// array_unique() converts the keys from integer to string, which breaks
-	// the JSON encoding - so need to call array_values() to convert them
-	// back into integers.
-	$data = array_values(array_unique($data));
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR_TITL': // Source titles, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
-		" FROM `##sources`" .
-		" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
-		" ORDER BY s_name COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = $row->s_name;
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR': // Sources, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('TITL') as $fact) {
+					$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+				}
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SURN': // Surnames, that start with the search term
-	// Do not filter by privacy. Surnames on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT DISTINCT n_surname" .
-			" FROM `##name`" .
-			" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_surname COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'PAGE': // Citation details, for a given source, that contain the search term
+		$data = array();
+		$sid  = Filter::get('extra', WT_REGEX_XREF);
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
+		)->execute(array(
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT f_id AS xref, f_gedcom AS gedcom" .
+			" FROM `##families`" .
+			" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
+		)->execute(array(
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// array_unique() converts the keys from integer to string, which breaks
+		// the JSON encoding - so need to call array_values() to convert them
+		// back into integers.
+		$data = array_values(array_unique($data));
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR_TITL': // Source titles, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
+			" FROM `##sources`" .
+			" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
+			" ORDER BY s_name COLLATE :collation"
 		)->execute(array(
 			'term'      => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'IFSRO':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = $row->s_name;
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		echo json_encode($data);
+
+		return;
+
+	case 'SURN': // Surnames, that start with the search term
+		// Do not filter by privacy. Surnames on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT DISTINCT n_surname" .
+				" FROM `##name`" .
+				" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_surname COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'IFSRO':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($repository->canShowName()) {
-			$data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($repository->canShowName()) {
+				$data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'IFS':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		echo json_encode($data);
+
+		return;
+
+	case 'IFS':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 }
 
 /**

admin_site_access.php

Switch Indentation +134 added lines, -134 removed lines

@@ -38,75 +38,75 @@ 
 
 // Form actions
 switch (Filter::post('action')) {
-case 'save':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
-		$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
-		$user_agent_pattern  = Filter::post('user_agent_pattern');
-		$rule                = Filter::post('rule', 'allow|deny|robot');
-		$comment             = Filter::post('comment');
-		$user_agent_string   = Filter::server('HTTP_USER_AGENT');
-		$ip_address          = WT_CLIENT_IP;
-
-		if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
-			// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
-			$oops = $rule !== 'allow' && Database::prepare(
-				"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
-				" AND :user_agent_string LIKE :user_agent_pattern"
-			)->execute(array(
-				'ip_address'         => $ip_address,
-				'ip_address_start'   => $ip_address_start,
-				'ip_address_end'     => $ip_address_end,
-				'user_agent_string'  => $user_agent_string,
-				'user_agent_pattern' => $user_agent_pattern,
-			))->fetchOne();
-
-			if ($oops) {
-				FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
-			} elseif ($site_access_rule_id === null) {
-				Database::prepare(
-					"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
-				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
-			} else {
-				Database::prepare(
-					"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+	case 'save':
+		if (Filter::checkCsrf()) {
+			$site_access_rule_id = Filter::postInteger('site_access_rule_id');
+			$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
+			$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
+			$user_agent_pattern  = Filter::post('user_agent_pattern');
+			$rule                = Filter::post('rule', 'allow|deny|robot');
+			$comment             = Filter::post('comment');
+			$user_agent_string   = Filter::server('HTTP_USER_AGENT');
+			$ip_address          = WT_CLIENT_IP;
+
+			if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
+				// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
+				$oops = $rule !== 'allow' && Database::prepare(
+					"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
+					" AND :user_agent_string LIKE :user_agent_pattern"
 				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-					'site_access_rule_id' => $site_access_rule_id,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+					'ip_address'         => $ip_address,
+					'ip_address_start'   => $ip_address_start,
+					'ip_address_end'     => $ip_address_end,
+					'user_agent_string'  => $user_agent_string,
+					'user_agent_pattern' => $user_agent_pattern,
+				))->fetchOne();
+
+				if ($oops) {
+					FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
+				} elseif ($site_access_rule_id === null) {
+					Database::prepare(
+						"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
+					)->execute(array(
+						'ip_address_start'    => $ip_address_start,
+						'ip_address_end'      => $ip_address_end,
+						'user_agent_pattern'  => $user_agent_pattern,
+						'rule'                => $rule,
+						'comment'             => $comment,
+					));
+					FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
+				} else {
+					Database::prepare(
+						"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+					)->execute(array(
+						'ip_address_start'    => $ip_address_start,
+						'ip_address_end'      => $ip_address_end,
+						'user_agent_pattern'  => $user_agent_pattern,
+						'rule'                => $rule,
+						'comment'             => $comment,
+						'site_access_rule_id' => $site_access_rule_id,
+					));
+					FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+				}
 			}
 		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 
-case 'delete':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		Database::prepare(
-			"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-		)->execute(array(
-			'site_access_rule_id' => $site_access_rule_id,
-		));
-		FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+	case 'delete':
+		if (Filter::checkCsrf()) {
+			$site_access_rule_id = Filter::postInteger('site_access_rule_id');
+			Database::prepare(
+				"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+			)->execute(array(
+				'site_access_rule_id' => $site_access_rule_id,
+			));
+			FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
+		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 }
 
 // Delete any "unknown" visitors that are now "known".
@@ -128,50 +128,50 @@ 
 
 $action = Filter::get('action');
 switch ($action) {
-case 'load':
-	// AJAX callback for datatables
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	$sql =
-		"SELECT SQL_CALC_FOUND_ROWS" .
-		" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
-		" FROM `##site_access_rule`";
-	$args = array();
-
-	if ($search) {
-		$sql .=
-			" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
-			" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
-			" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
-			" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
-			" OR comment LIKE CONCAT('%', :search_5, '%'))";
-		$args['search_1'] = Filter::escapeLike($search);
-		$args['search_2'] = Filter::escapeLike($search);
-		$args['search_3'] = Filter::escapeLike($search);
-		$args['search_4'] = Filter::escapeLike($search);
-		$args['search_5'] = Filter::escapeLike($search);
-	}
+	case 'load':
+		// AJAX callback for datatables
+		$search = Filter::get('search');
+		$search = $search['value'];
+		$start  = Filter::getInteger('start');
+		$length = Filter::getInteger('length');
+
+		$sql =
+			"SELECT SQL_CALC_FOUND_ROWS" .
+			" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
+			" FROM `##site_access_rule`";
+		$args = array();
+
+		if ($search) {
+			$sql .=
+				" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
+				" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
+				" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
+				" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
+				" OR comment LIKE CONCAT('%', :search_5, '%'))";
+			$args['search_1'] = Filter::escapeLike($search);
+			$args['search_2'] = Filter::escapeLike($search);
+			$args['search_3'] = Filter::escapeLike($search);
+			$args['search_4'] = Filter::escapeLike($search);
+			$args['search_5'] = Filter::escapeLike($search);
+		}
 
-	$order = Filter::getArray('order');
-	$sql .= ' ORDER BY';
-	if ($order) {
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$sql .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$sql .= " :col_" . $key . " ASC";
-				break;
-			case 'desc':
-				$sql .= " :col_" . $key . " DESC";
-				break;
-			}
+		$order = Filter::getArray('order');
+		$sql .= ' ORDER BY';
+		if ($order) {
+			foreach ($order as $key => $value) {
+				if ($key > 0) {
+					$sql .= ',';
+				}
+				// Datatables numbers columns 0, 1, 2
+				// MySQL numbers columns 1, 2, 3
+				switch ($value['dir']) {
+					case 'asc':
+						$sql .= " :col_" . $key . " ASC";
+						break;
+					case 'desc':
+						$sql .= " :col_" . $key . " DESC";
+						break;
+				}
 			$args['col_' . $key] = 1 + $value['column'];
 		}
 	} else {
@@ -210,31 +210,31 @@ 
 	));
 	break;
 
-case 'edit':
-case 'create':
-	if (Filter::get('action') === 'edit') {
-		$controller->setPageTitle(I18N::translate('Edit a website access rule'));
-	} else {
-		$controller->setPageTitle(I18N::translate('Create a website access rule'));
-	}
+	case 'edit':
+	case 'create':
+		if (Filter::get('action') === 'edit') {
+			$controller->setPageTitle(I18N::translate('Edit a website access rule'));
+		} else {
+			$controller->setPageTitle(I18N::translate('Create a website access rule'));
+		}
 
-	$controller->pageHeader();
+		$controller->pageHeader();
 
-	$site_access_rule = Database::prepare(
-		"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
-		" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-	)->execute(array(
-		'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
-	))->fetchOneRow();
+		$site_access_rule = Database::prepare(
+			"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
+			" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+		)->execute(array(
+			'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
+		))->fetchOneRow();
 
-	$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
-	$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
-	$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
-	$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
-	$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
-	$comment             = $site_access_rule ? $site_access_rule->comment : '';
+		$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
+		$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
+		$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
+		$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
+		$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
+		$comment             = $site_access_rule ? $site_access_rule->comment : '';
 
-	?>
+		?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_site_access.php"><?php echo I18N::translate('Website access rules'); ?></a></li>
@@ -311,12 +311,12 @@ 
 	</form>
 
 	<?php
-	break;
+		break;
 
-default:
-	$controller
-		->pageHeader()
-		->addInlineJavascript('
+	default:
+		$controller
+			->pageHeader()
+			->addInlineJavascript('
 			jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 			jQuery.fn.dataTableExt.oSort["unicode-desc"]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
 			jQuery(".table-site-access-rules").dataTable({
@@ -340,7 +340,7 @@ 
 			});
 		');
 
-	?>
+		?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li class="active"><?php echo $controller->getPageTitle(); ?></li>
@@ -381,5 +381,5 @@ 
 		}
 	</script>
 	<?php
-	break;
+		break;
 }