fisharebest / webtrees

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

famlist.php

Switch Indentation +41 added lines, -41 removed lines

@@ -46,12 +46,12 @@ 
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
-case 'no':
-case 'yes':
-	Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
-	break;
-default:
-	$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
+	case 'no':
+	case 'yes':
+		Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
+		break;
+	default:
+		$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
 }
 
 // Make sure selections are consistent.
@@ -91,16 +91,16 @@ 
 	}
 	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
 	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
+		case '':
+			break;
+		case '@':
+			$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+			$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+			break;
+		default:
+			$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
+			$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+			break;
 	}
 	$show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
@@ -136,15 +136,15 @@ 
 $list = array();
 foreach (QueryName::surnameAlpha($WT_TREE, $show_marnm === 'yes', true) as $letter => $count) {
 	switch ($letter) {
-	case '@':
-		$html = I18N::translateContext('Unknown surname', '…');
-		break;
-	case ',':
-		$html = I18N::translate('None');
-		break;
-	default:
-		$html = Filter::escapeHtml($letter);
-		break;
+		case '@':
+			$html = I18N::translateContext('Unknown surname', '…');
+			break;
+		case ',':
+			$html = I18N::translate('None');
+			break;
+		default:
+			$html = Filter::escapeHtml($letter);
+			break;
 	}
 	if ($count) {
 		if ($letter == $alpha) {
@@ -194,16 +194,16 @@ 
 	if ($show === 'surn') {
 		// Show the surname list
 		switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
-			break;
+			case 'style1':
+				echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
+				break;
+			case 'style3':
+				echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
+				break;
+			case 'style2':
+			default:
+				echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
+				break;
 		}
 	} else {
 		// Show the list
@@ -226,12 +226,12 @@ 
 				$list = array();
 				foreach ($givn_initials as $givn_initial => $count) {
 					switch ($givn_initial) {
-					case '@':
-						$html = I18N::translateContext('Unknown given name', '…');
-						break;
-					default:
-						$html = Filter::escapeHtml($givn_initial);
-						break;
+						case '@':
+							$html = I18N::translateContext('Unknown given name', '…');
+							break;
+						default:
+							$html = Filter::escapeHtml($givn_initial);
+							break;
 					}
 					if ($count) {
 						if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {

admin_trees_manage.php

Switch Indentation +139 added lines, -139 removed lines

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

app/Fact.php

Switch Indentation +26 added lines, -26 removed lines

@@ -92,23 +92,23 @@ 
 	public function getTarget() {
 		$xref = trim($this->getValue(), '@');
 		switch ($this->tag) {
-		case 'FAMC':
-		case 'FAMS':
-			return Family::getInstance($xref, $this->getParent()->getTree());
-		case 'HUSB':
-		case 'WIFE':
-		case 'CHIL':
-			return Individual::getInstance($xref, $this->getParent()->getTree());
-		case 'SOUR':
-			return Source::getInstance($xref, $this->getParent()->getTree());
-		case 'OBJE':
-			return Media::getInstance($xref, $this->getParent()->getTree());
-		case 'REPO':
-			return Repository::getInstance($xref, $this->getParent()->getTree());
-		case 'NOTE':
-			return Note::getInstance($xref, $this->getParent()->getTree());
-		default:
-			return GedcomRecord::getInstance($xref, $this->getParent()->getTree());
+			case 'FAMC':
+			case 'FAMS':
+				return Family::getInstance($xref, $this->getParent()->getTree());
+			case 'HUSB':
+			case 'WIFE':
+			case 'CHIL':
+				return Individual::getInstance($xref, $this->getParent()->getTree());
+			case 'SOUR':
+				return Source::getInstance($xref, $this->getParent()->getTree());
+			case 'OBJE':
+				return Media::getInstance($xref, $this->getParent()->getTree());
+			case 'REPO':
+				return Repository::getInstance($xref, $this->getParent()->getTree());
+			case 'NOTE':
+				return Note::getInstance($xref, $this->getParent()->getTree());
+			default:
+				return GedcomRecord::getInstance($xref, $this->getParent()->getTree());
 		}
 	}
 
@@ -262,15 +262,15 @@ 
 	 */
 	public function getLabel() {
 		switch ($this->tag) {
-		case 'EVEN':
-		case 'FACT':
-			if ($this->getAttribute('TYPE')) {
-				// Custom FACT/EVEN - with a TYPE
-				return I18N::translate(Filter::escapeHtml($this->getAttribute('TYPE')));
-			}
-			// no break - drop into next case
-		default:
-			return GedcomTag::getLabel($this->tag, $this->parent);
+			case 'EVEN':
+			case 'FACT':
+				if ($this->getAttribute('TYPE')) {
+					// Custom FACT/EVEN - with a TYPE
+					return I18N::translate(Filter::escapeHtml($this->getAttribute('TYPE')));
+				}
+				// no break - drop into next case
+			default:
+				return GedcomTag::getLabel($this->tag, $this->parent);
 		}
 	}
 

app/Query/QueryName.php

Switch Indentation +145 added lines, -145 removed lines

@@ -34,85 +34,85 @@ 
 	 */
 	private static function getAlphabetForLocale($locale) {
 		switch ($locale) {
-		case 'ar':
-			return array(
-				'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
-			);
-		case 'cs':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'da':
-		case 'nb':
-		case 'nn':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
-			);
-		case 'el':
-			return array(
-				'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
-			);
-		case 'es':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'et':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
-			);
-		case 'fi':
-		case 'sv':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
-			);
-		case 'he':
-			return array(
-				'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
-			);
-		case 'hu':
-			return array(
-				'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
-			);
-		case 'lt':
-			return array(
-				'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
-			);
-		case 'nl':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
-			);
-		case 'pl':
-			return array(
-				'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
-			);
-		case 'ro':
-			return array(
-				'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'ru':
-			return array(
-				'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
-			);
-		case 'sk':
-			return array(
-				'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
-			);
-		case 'sl':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'sr':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'tr':
-			return array(
-				'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
-			);
-		default:
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
+			case 'ar':
+				return array(
+					'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
+				);
+			case 'cs':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
+			case 'da':
+			case 'nb':
+			case 'nn':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
+				);
+			case 'el':
+				return array(
+					'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
+				);
+			case 'es':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
+			case 'et':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
+				);
+			case 'fi':
+			case 'sv':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
+				);
+			case 'he':
+				return array(
+					'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
+				);
+			case 'hu':
+				return array(
+					'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
+				);
+			case 'lt':
+				return array(
+					'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
+				);
+			case 'nl':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
+				);
+			case 'pl':
+				return array(
+					'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
+				);
+			case 'ro':
+				return array(
+					'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
+			case 'ru':
+				return array(
+					'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
+				);
+			case 'sk':
+				return array(
+					'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
+				);
+			case 'sl':
+				return array(
+					'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+				);
+			case 'sr':
+				return array(
+					'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+				);
+			case 'tr':
+				return array(
+					'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
+				);
+			default:
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
 		}
 	}
 
@@ -126,44 +126,44 @@ 
 	public static function initialLetter($name) {
 		$name = I18N::strtoupper($name);
 		switch (WT_LOCALE) {
-		case 'cs':
-			if (substr($name, 0, 2) == 'CH') {
-				return 'CH';
-			}
-			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			if (substr($name, 0, 2) == 'AA') {
-				return 'Å';
-			}
-			break;
-		case 'hu':
-			if (substr($name, 0, 2) == 'CS') {
-				return 'CS';
-			} elseif (substr($name, 0, 3) == 'DZS') {
-				return 'DZS';
-			} elseif (substr($name, 0, 2) == 'DZ') {
-				return 'DZ';
-			} elseif (substr($name, 0, 2) == 'GY') {
-				return 'GY';
-			} elseif (substr($name, 0, 2) == 'LY') {
-				return 'LY';
-			} elseif (substr($name, 0, 2) == 'NY') {
-				return 'NY';
-			} elseif (substr($name, 0, 2) == 'SZ') {
-				return 'SZ';
-			} elseif (substr($name, 0, 2) == 'TY') {
-				return 'TY';
-			} elseif (substr($name, 0, 2) == 'ZS') {
-				return 'ZS';
-			}
-			break;
-		case 'nl':
-			if (substr($name, 0, 2) == 'IJ') {
-				return 'IJ';
-			}
-			break;
+			case 'cs':
+				if (substr($name, 0, 2) == 'CH') {
+					return 'CH';
+				}
+				break;
+			case 'da':
+			case 'nb':
+			case 'nn':
+				if (substr($name, 0, 2) == 'AA') {
+					return 'Å';
+				}
+				break;
+			case 'hu':
+				if (substr($name, 0, 2) == 'CS') {
+					return 'CS';
+				} elseif (substr($name, 0, 3) == 'DZS') {
+					return 'DZS';
+				} elseif (substr($name, 0, 2) == 'DZ') {
+					return 'DZ';
+				} elseif (substr($name, 0, 2) == 'GY') {
+					return 'GY';
+				} elseif (substr($name, 0, 2) == 'LY') {
+					return 'LY';
+				} elseif (substr($name, 0, 2) == 'NY') {
+					return 'NY';
+				} elseif (substr($name, 0, 2) == 'SZ') {
+					return 'SZ';
+				} elseif (substr($name, 0, 2) == 'TY') {
+					return 'TY';
+				} elseif (substr($name, 0, 2) == 'ZS') {
+					return 'ZS';
+				}
+				break;
+			case 'nl':
+				if (substr($name, 0, 2) == 'IJ') {
+					return 'IJ';
+				}
+				break;
 		}
 		// No special rules - just take the first character
 		return mb_substr($name, 0, 1);
@@ -191,37 +191,37 @@ 
 	 */
 	private static function getInitialSql($field, $letter) {
 		switch (WT_LOCALE) {
-		case 'cs':
-			switch ($letter) {
-			case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
-			}
+			case 'cs':
+				switch ($letter) {
+					case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
+				}
 			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			switch ($letter) {
-			// AA gets listed under Å
-			case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
-			case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
-			}
+			case 'da':
+			case 'nb':
+			case 'nn':
+				switch ($letter) {
+				// AA gets listed under Å
+					case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
+					case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
+				}
 			break;
-		case 'hu':
-			switch ($letter) {
-			case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
-			case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
-			case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
-			case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
-			case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
-			case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
-			case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
-			case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
-			case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
-			}
+			case 'hu':
+				switch ($letter) {
+					case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
+					case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
+					case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
+					case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
+					case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
+					case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
+					case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
+					case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
+					case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
+				}
 			break;
-		case 'nl':
-			switch ($letter) {
-			case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
-			}
+			case 'nl':
+				switch ($letter) {
+					case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
+				}
 			break;
 		}
 

app/Query/QueryMedia.php

Switch Indentation +19 added lines, -19 removed lines

@@ -104,17 +104,17 @@ 
 
 		// Include / exclude subfolders (but always include external)
 		switch ($subfolders) {
-		case 'include':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			break;
-		case 'exclude':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			$args[] = Filter::escapeLike($folder);
-			break;
-		default:
-			throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
+			case 'include':
+				$sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
+				$args[] = Filter::escapeLike($folder);
+				break;
+			case 'exclude':
+				$sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
+				$args[] = Filter::escapeLike($folder);
+				$args[] = Filter::escapeLike($folder);
+				break;
+			default:
+				throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
 		}
 
 		// Apply search terms
@@ -130,14 +130,14 @@ 
 		}
 
 		switch ($sort) {
-		case 'file':
-			$sql .= " ORDER BY m_filename";
-			break;
-		case 'title':
-			$sql .= " ORDER BY m_titl";
-			break;
-		default:
-			throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
+			case 'file':
+				$sql .= " ORDER BY m_filename";
+				break;
+			case 'title':
+				$sql .= " ORDER BY m_titl";
+				break;
+			default:
+				throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
 		}
 
 		$rows = Database::prepare($sql)->execute($args)->fetchAll();

app/SurnameTradition/PaternalSurnameTradition.php

Switch Indentation +11 added lines, -11 removed lines

@@ -39,17 +39,17 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SPFX_SURN, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return array_filter(array(
-					'NAME' => $match['NAME'],
-					'SPFX' => $match['SPFX'],
-					'SURN' => $match['SURN'],
-				));
-			case 'F':
-				return array(
-					'NAME'   => '//',
-					'_MARNM' => '/' . trim($match['SPFX'] . ' ' . $match['SURN']) . '/',
-				);
+				case 'M':
+					return array_filter(array(
+						'NAME' => $match['NAME'],
+						'SPFX' => $match['SPFX'],
+						'SURN' => $match['SURN'],
+					));
+				case 'F':
+					return array(
+						'NAME'   => '//',
+						'_MARNM' => '/' . trim($match['SPFX'] . ' ' . $match['SURN']) . '/',
+					);
 			}
 		}
 

app/SurnameTradition/PortugueseSurnameTradition.php

Switch Indentation +10 added lines, -10 removed lines

@@ -62,16 +62,16 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return array(
-					'NAME' => '// /' . $match['SURN1'] . '/',
-					'SURN' => $match['SURN1'],
-				);
-			case 'F':
-				return array(
-					'NAME' => '// /' . $match['SURN2'] . '/',
-					'SURN' => $match['SURN2'],
-				);
+				case 'M':
+					return array(
+						'NAME' => '// /' . $match['SURN1'] . '/',
+						'SURN' => $match['SURN1'],
+					);
+				case 'F':
+					return array(
+						'NAME' => '// /' . $match['SURN2'] . '/',
+						'SURN' => $match['SURN2'],
+					);
 			}
 		}