fisharebest / webtrees

app/Functions/FunctionsDb.php

Switch Indentation +100 added lines, -100 removed lines

@@ -255,18 +255,18 @@ 
 	 */
 	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
 		switch ($soundex) {
-		case 'Russell':
-			$givn_sdx = Soundex::russell($firstname);
-			$surn_sdx = Soundex::russell($lastname);
-			$plac_sdx = Soundex::russell($place);
-			break;
-		case 'DaitchM':
-			$givn_sdx = Soundex::daitchMokotoff($firstname);
-			$surn_sdx = Soundex::daitchMokotoff($lastname);
-			$plac_sdx = Soundex::daitchMokotoff($place);
-			break;
-		default:
-			throw new \DomainException('soundex: ' . $soundex);
+			case 'Russell':
+				$givn_sdx = Soundex::russell($firstname);
+				$surn_sdx = Soundex::russell($lastname);
+				$plac_sdx = Soundex::russell($place);
+				break;
+			case 'DaitchM':
+				$givn_sdx = Soundex::daitchMokotoff($firstname);
+				$surn_sdx = Soundex::daitchMokotoff($lastname);
+				$plac_sdx = Soundex::daitchMokotoff($place);
+				break;
+			default:
+				throw new \DomainException('soundex: ' . $soundex);
 		}
 
 		// Nothing to search for? Return nothing.
@@ -298,12 +298,12 @@ 
 			foreach ($givn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
+					case 'Russell':
+						$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+						break;
+					case 'DaitchM':
+						$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+						break;
 				}
 				$args['given_name_' . $n] = $sdx;
 			}
@@ -316,12 +316,12 @@ 
 			foreach ($surn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
+					case 'Russell':
+						$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
+						break;
+					case 'DaitchM':
+						$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
+						break;
 				}
 				$args['surname_' . $n] = $sdx;
 			}
@@ -334,12 +334,12 @@ 
 			foreach ($plac_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
+					case 'Russell':
+						$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+						break;
+					case 'DaitchM':
+						$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+						break;
 				}
 				$args['place_' . $n] = $sdx;
 			}
@@ -774,82 +774,82 @@ 
 			} else {
 				// SPECIAL CASES:
 				switch ($anniv->m) {
-				case 2:
-					// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1 AND d_mon = 2";
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 2";
-					} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 2";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 3:
-					// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
-					// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate([$anniv->y, 'CSH', 1]);
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
+					case 2:
+						// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
+						if ($anniv->d === 1) {
+							$where .= " AND d_day <= 1 AND d_mon = 2";
+						} elseif ($anniv->d === 30) {
+							$where .= " AND d_day >= 30 AND d_mon = 2";
+						} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
+							$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
 						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 3";
+							$where .= " AND d_day = :day AND d_mon = 2";
+							$args['day'] = $anniv->d;
 						}
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 3";
-					} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 3";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 4:
-					// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate([$anniv->y, 'KSL', 1]);
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
+						break;
+					case 3:
+						// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
+						// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
+						if ($anniv->d === 1) {
+							$tmp = new JewishDate([$anniv->y, 'CSH', 1]);
+							if ($tmp->daysInMonth() === 29) {
+								$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
+							} else {
+								$where .= " AND d_day <= 1 AND d_mon = 3";
+							}
+						} elseif ($anniv->d === 30) {
+							$where .= " AND d_day >= 30 AND d_mon = 3";
+						} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
+							$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
 						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 4";
+							$where .= " AND d_day = :day AND d_mon = 3";
+							$args['day'] = $anniv->d;
 						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 7: // ADS includes ADR (non-leap)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1";
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day";
-						$args['day'] = $anniv->d;
-					}
-					$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
-					break;
-				case 8: // 1 NSN includes 30 ADR, if this year is non-leap
-					if ($anniv->d === 1) {
-						if ($anniv->isLeapYear()) {
-							$where .= " AND d_day <= 1 AND d_mon = 8";
+						break;
+					case 4:
+						// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
+						if ($anniv->d === 1) {
+							$tmp = new JewishDate([$anniv->y, 'KSL', 1]);
+							if ($tmp->daysInMonth() === 29) {
+								$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
+							} else {
+								$where .= " AND d_day <= 1 AND d_mon = 4";
+							}
+						} elseif ($anniv->d === $anniv->daysInMonth()) {
+							$where .= " AND d_day >= :day AND d_mon=4";
+							$args['day'] = $anniv->d;
 						} else {
-							$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
+							$where .= " AND d_day = :day AND d_mon=4";
+							$args['day'] = $anniv->d;
 						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					}
-					break;
+						break;
+					case 7: // ADS includes ADR (non-leap)
+						if ($anniv->d === 1) {
+							$where .= " AND d_day <= 1";
+						} elseif ($anniv->d === $anniv->daysInMonth()) {
+							$where .= " AND d_day >= :day";
+							$args['day'] = $anniv->d;
+						} else {
+							$where .= " AND d_day = :day";
+							$args['day'] = $anniv->d;
+						}
+						$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
+						break;
+					case 8: // 1 NSN includes 30 ADR, if this year is non-leap
+						if ($anniv->d === 1) {
+							if ($anniv->isLeapYear()) {
+								$where .= " AND d_day <= 1 AND d_mon = 8";
+							} else {
+								$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
+							}
+						} elseif ($anniv->d === $anniv->daysInMonth()) {
+							$where .= " AND d_day >= :day AND d_mon = 8";
+							$args['day'] = $anniv->d;
+						} else {
+							$where .= " AND d_day = :day AND d_mon = 8";
+							$args['day'] = $anniv->d;
+						}
+						break;
 				}
 			}
 			// Only events in the past (includes dates without a year)

app/I18N.php

Switch Indentation +32 added lines, -32 removed lines

@@ -144,13 +144,13 @@ 
 	public static function collation() {
 		$collation = self::$locale->collation();
 		switch ($collation) {
-		case 'croatian_ci':
-		case 'german2_ci':
-		case 'vietnamese_ci':
-			// Only available in MySQL 5.6
-			return 'utf8_unicode_ci';
-		default:
-			return 'utf8_' . $collation;
+			case 'croatian_ci':
+			case 'german2_ci':
+			case 'vietnamese_ci':
+				// Only available in MySQL 5.6
+				return 'utf8_unicode_ci';
+			default:
+				return 'utf8_' . $collation;
 		}
 	}
 
@@ -238,15 +238,15 @@ 
 	 */
 	public static function gedcomAge($string) {
 		switch ($string) {
-		case 'STILLBORN':
-			// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (stillborn)
-			return self::translate('(stillborn)');
-		case 'INFANT':
-			// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in infancy)
-			return self::translate('(in infancy)');
-		case 'CHILD':
-			// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in childhood)
-			return self::translate('(in childhood)');
+			case 'STILLBORN':
+				// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (stillborn)
+				return self::translate('(stillborn)');
+			case 'INFANT':
+				// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in infancy)
+				return self::translate('(in infancy)');
+			case 'CHILD':
+				// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in childhood)
+				return self::translate('(in childhood)');
 		}
 		$age = [];
 		if (preg_match('/(\d+)y/', $string, $match)) {
@@ -562,13 +562,13 @@ 
 	 */
 	public static function scriptDirection($script) {
 		switch ($script) {
-		case 'Arab':
-		case 'Hebr':
-		case 'Mong':
-		case 'Thaa':
-			return 'rtl';
-		default:
-			return 'ltr';
+			case 'Arab':
+			case 'Hebr':
+			case 'Mong':
+			case 'Thaa':
+				return 'rtl';
+			default:
+				return 'ltr';
 		}
 	}
 
@@ -787,15 +787,15 @@ 
 	 */
 	public static function defaultCalendar() {
 		switch (self::$locale->languageTag()) {
-		case 'ar':
-			return new ArabicCalendar;
-		case 'fa':
-			return new PersianCalendar;
-		case 'he':
-		case 'yi':
-			return new JewishCalendar;
-		default:
-			return new GregorianCalendar;
+			case 'ar':
+				return new ArabicCalendar;
+			case 'fa':
+				return new PersianCalendar;
+			case 'he':
+			case 'yi':
+				return new JewishCalendar;
+			default:
+				return new GregorianCalendar;
 		}
 	}
 }

app/Controller/IndividualListController.php

Switch Indentation +160 added lines, -160 removed lines

@@ -35,85 +35,85 @@ 
 	 */
 	private function getAlphabetForLocale($locale) {
 		switch ($locale) {
-		case 'ar':
-			return [
-				'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
-			];
-		case 'cs':
-			return [
-				'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 [
-				'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 [
-				'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
-			];
-		case 'es':
-			return [
-				'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 [
-				'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 [
-				'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 [
-				'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
-			];
-		case 'hu':
-			return [
-				'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 [
-				'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 [
-				'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 [
-				'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 [
-				'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 [
-				'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
-			];
-		case 'sk':
-			return [
-				'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 [
-				'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 [
-				'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 [
-				'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 [
-				'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 [
+					'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
+				];
+			case 'cs':
+				return [
+					'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 [
+					'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 [
+					'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
+				];
+			case 'es':
+				return [
+					'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 [
+					'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 [
+					'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 [
+					'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
+				];
+			case 'hu':
+				return [
+					'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 [
+					'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 [
+					'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 [
+					'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 [
+					'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 [
+					'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
+				];
+			case 'sk':
+				return [
+					'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 [
+					'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 [
+					'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 [
+					'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 [
+					'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',
+				];
 		}
 	}
 
@@ -127,44 +127,44 @@ 
 	public 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);
@@ -192,37 +192,37 @@ 
 	 */
 	private 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;
 		}
 
@@ -538,12 +538,12 @@ 
 	 */
 	public function givenNameInitial($initial) {
 		switch ($initial) {
-		case '@':
-			return I18N::translateContext('Unknown given name', '…');
-			break;
-		default:
-			return Html::escape($initial);
-			break;
+			case '@':
+				return I18N::translateContext('Unknown given name', '…');
+				break;
+			default:
+				return Html::escape($initial);
+				break;
 		}
 	}
 
@@ -556,15 +556,15 @@ 
 	 */
 	public function surnameInitial($initial) {
 		switch ($initial) {
-		case '@':
-			return I18N::translateContext('Unknown surname', '…');
-			break;
-		case ',':
-			return I18N::translate('None');
-			break;
-		default:
-			return Html::escape($initial);
-			break;
+			case '@':
+				return I18N::translateContext('Unknown surname', '…');
+				break;
+			case ',':
+				return I18N::translate('None');
+				break;
+			default:
+				return Html::escape($initial);
+				break;
 		}
 	}
 }

app/Controller/SearchController.php

Switch Indentation +38 added lines, -38 removed lines

@@ -169,46 +169,46 @@
 
 		// If we want to show associated persons, build the list
 		switch ($this->action) {
-		case 'header':
-			// We can type in an XREF into the header search, and jump straight to it.
-			// Otherwise, the header search is the same as the general search
-			if (preg_match('/' . WT_REGEX_XREF . '/', $this->query)) {
-				$record = GedcomRecord::getInstance($this->query, $this->tree());
-				if ($record && $record->canShowName()) {
-					header('Location: ' . $record->getRawUrl());
+			case 'header':
+				// We can type in an XREF into the header search, and jump straight to it.
+				// Otherwise, the header search is the same as the general search
+				if (preg_match('/' . WT_REGEX_XREF . '/', $this->query)) {
+					$record = GedcomRecord::getInstance($this->query, $this->tree());
+					if ($record && $record->canShowName()) {
+						header('Location: ' . $record->getRawUrl());
+						exit;
+					}
+				}
+				$this->action = 'general';
+				$this->srindi = 'checked';
+				$this->srfams = 'checked';
+				$this->srsour = 'checked';
+				$this->srnote = 'checked';
+				$this->setPageTitle(I18N::translate('General search'));
+				$this->generalSearch();
+				break;
+			case 'general':
+				$this->setPageTitle(I18N::translate('General search'));
+				$this->generalSearch();
+				break;
+			case 'soundex':
+				// Create a dummy search query to use as a title to the results list
+				$this->query = trim($this->firstname . ' ' . $this->lastname . ' ' . $this->place);
+				$this->setPageTitle(I18N::translate('Phonetic search'));
+				$this->soundexSearch();
+				break;
+			case 'replace':
+				$this->setPageTitle(I18N::translate('Search and replace'));
+				$this->search_trees = [$this->tree()];
+				$this->srindi       = 'checked';
+				$this->srfams       = 'checked';
+				$this->srsour       = 'checked';
+				$this->srnote       = 'checked';
+				if (Filter::post('query')) {
+					$this->searchAndReplace($this->tree());
+					header('Location: search.php?action=replace&query=' . rawurlencode($this->query) . '&replace=' . rawurlencode($this->replace) . '&replaceAll=' . $this->replaceAll . '&replaceNames=' . $this->replaceNames . '&replacePlaces=' . $this->replacePlaces . '&replacePlacesWord=' . $this->replacePlacesWord);
 					exit;
 				}
-			}
-			$this->action = 'general';
-			$this->srindi = 'checked';
-			$this->srfams = 'checked';
-			$this->srsour = 'checked';
-			$this->srnote = 'checked';
-			$this->setPageTitle(I18N::translate('General search'));
-			$this->generalSearch();
-			break;
-		case 'general':
-			$this->setPageTitle(I18N::translate('General search'));
-			$this->generalSearch();
-			break;
-		case 'soundex':
-			// Create a dummy search query to use as a title to the results list
-			$this->query = trim($this->firstname . ' ' . $this->lastname . ' ' . $this->place);
-			$this->setPageTitle(I18N::translate('Phonetic search'));
-			$this->soundexSearch();
-			break;
-		case 'replace':
-			$this->setPageTitle(I18N::translate('Search and replace'));
-			$this->search_trees = [$this->tree()];
-			$this->srindi       = 'checked';
-			$this->srfams       = 'checked';
-			$this->srsour       = 'checked';
-			$this->srnote       = 'checked';
-			if (Filter::post('query')) {
-				$this->searchAndReplace($this->tree());
-				header('Location: search.php?action=replace&query=' . rawurlencode($this->query) . '&replace=' . rawurlencode($this->replace) . '&replaceAll=' . $this->replaceAll . '&replaceNames=' . $this->replaceNames . '&replacePlaces=' . $this->replacePlaces . '&replacePlacesWord=' . $this->replacePlacesWord);
-				exit;
-			}
 		}
 	}
 

app/Controller/AdvancedSearchController.php

Switch Indentation +187 added lines, -187 removed lines

@@ -373,108 +373,108 @@ 
 			if ($parts[0] == 'NAME') {
 				// NAME:*
 				switch ($parts[1]) {
-				case 'GIVN':
-					switch ($parts[2]) {
-					case 'EXACT':
-						$sql .= " AND i_n.n_givn=?";
-						$bind[] = $value;
-						break;
-					case 'BEGINS':
-						$sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
-						$bind[] = $value;
-						break;
-					case 'CONTAINS':
-						$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
-						$bind[] = $value;
-						break;
-					case 'SDX_STD':
-						$sdx = Soundex::russell($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "i_n.n_soundex_givn_std LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
+					case 'GIVN':
+						switch ($parts[2]) {
+							case 'EXACT':
+								$sql .= " AND i_n.n_givn=?";
+								$bind[] = $value;
+								break;
+							case 'BEGINS':
+								$sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
+								$bind[] = $value;
+								break;
+							case 'CONTAINS':
+								$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+								$bind[] = $value;
+								break;
+							case 'SDX_STD':
+								$sdx = Soundex::russell($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "i_n.n_soundex_givn_std LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
+								break;
+							case 'SDX': // SDX uses DM by default.
+							case 'SDX_DM':
+								$sdx = Soundex::daitchMokotoff($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "i_n.n_soundex_givn_dm LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
+								break;
 						}
-						break;
-					case 'SDX': // SDX uses DM by default.
-					case 'SDX_DM':
-						$sdx = Soundex::daitchMokotoff($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "i_n.n_soundex_givn_dm LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
+					break;
+					case 'SURN':
+						switch ($parts[2]) {
+							case 'EXACT':
+								$sql .= " AND i_n.n_surname=?";
+								$bind[] = $value;
+								break;
+							case 'BEGINS':
+								$sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
+								$bind[] = $value;
+								break;
+							case 'CONTAINS':
+								$sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
+								$bind[] = $value;
+								break;
+							case 'SDX_STD':
+								$sdx = Soundex::russell($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "i_n.n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= " AND (" . implode(' OR ', $sdx) . ")";
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
+								break;
+							case 'SDX': // SDX uses DM by default.
+							case 'SDX_DM':
+								$sdx = Soundex::daitchMokotoff($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "i_n.n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= " AND (" . implode(' OR ', $sdx) . ")";
+									break;
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
 						}
-						break;
-					}
 					break;
-				case 'SURN':
-					switch ($parts[2]) {
-					case 'EXACT':
-						$sql .= " AND i_n.n_surname=?";
+					case 'NICK':
+					case '_MARNM':
+					case '_HEB':
+					case '_AKA':
+						$sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
+						$bind[] = $parts[1];
 						$bind[] = $value;
 						break;
-					case 'BEGINS':
-						$sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
-						$bind[] = $value;
-						break;
-					case 'CONTAINS':
-						$sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
-						$bind[] = $value;
-						break;
-					case 'SDX_STD':
-						$sdx = Soundex::russell($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "i_n.n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= " AND (" . implode(' OR ', $sdx) . ")";
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
-						}
-						break;
-					case 'SDX': // SDX uses DM by default.
-					case 'SDX_DM':
-						$sdx = Soundex::daitchMokotoff($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "i_n.n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= " AND (" . implode(' OR ', $sdx) . ")";
-							break;
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
-						}
-					}
-					break;
-				case 'NICK':
-				case '_MARNM':
-				case '_HEB':
-				case '_AKA':
-					$sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
-					$bind[] = $parts[1];
-					$bind[] = $value;
-					break;
 				}
 			} elseif ($parts[1] == 'DATE') {
 				// *:DATE
@@ -522,99 +522,99 @@ 
 				$table = $parts[1] == 'HUSB' ? 'f_n' : 'm_n';
 				// NAME:*
 				switch ($parts[3]) {
-				case 'GIVN':
-					switch ($parts[4]) {
-					case 'EXACT':
-						$sql .= " AND {$table}.n_givn=?";
-						$bind[] = $value;
-						break;
-					case 'BEGINS':
-						$sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
-						$bind[] = $value;
-						break;
-					case 'CONTAINS':
-						$sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
-						$bind[] = $value;
-						break;
-					case 'SDX_STD':
-						$sdx = Soundex::russell($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "{$table}.n_soundex_givn_std LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
+					case 'GIVN':
+						switch ($parts[4]) {
+							case 'EXACT':
+								$sql .= " AND {$table}.n_givn=?";
+								$bind[] = $value;
+								break;
+							case 'BEGINS':
+								$sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
+								$bind[] = $value;
+								break;
+							case 'CONTAINS':
+								$sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+								$bind[] = $value;
+								break;
+							case 'SDX_STD':
+								$sdx = Soundex::russell($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "{$table}.n_soundex_givn_std LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
+								break;
+							case 'SDX': // SDX uses DM by default.
+							case 'SDX_DM':
+								$sdx = Soundex::daitchMokotoff($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "{$table}.n_soundex_givn_dm LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
+									break;
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
 						}
-						break;
-					case 'SDX': // SDX uses DM by default.
-					case 'SDX_DM':
-						$sdx = Soundex::daitchMokotoff($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "{$table}.n_soundex_givn_dm LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
-							break;
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
-						}
-					}
 					break;
-				case 'SURN':
-					switch ($parts[4]) {
-					case 'EXACT':
-						$sql .= " AND {$table}.n_surname=?";
-						$bind[] = $value;
-						break;
-					case 'BEGINS':
-						$sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
-						$bind[] = $value;
-						break;
-					case 'CONTAINS':
-						$sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
-						$bind[] = $value;
-						break;
-					case 'SDX_STD':
-						$sdx = Soundex::russell($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "{$table}.n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
-						}
-						break;
-					case 'SDX': // SDX uses DM by default.
-					case 'SDX_DM':
-						$sdx = Soundex::daitchMokotoff($value);
-						if ($sdx !== null) {
-							$sdx = explode(':', $sdx);
-							foreach ($sdx as $k => $v) {
-								$sdx[$k] = "{$table}.n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
-								$bind[]  = $v;
-							}
-							$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
-						} else {
-							// No phonetic content? Use a substring match
-							$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
-							$bind[] = $value;
+					case 'SURN':
+						switch ($parts[4]) {
+							case 'EXACT':
+								$sql .= " AND {$table}.n_surname=?";
+								$bind[] = $value;
+								break;
+							case 'BEGINS':
+								$sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
+								$bind[] = $value;
+								break;
+							case 'CONTAINS':
+								$sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
+								$bind[] = $value;
+								break;
+							case 'SDX_STD':
+								$sdx = Soundex::russell($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "{$table}.n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
+								break;
+							case 'SDX': // SDX uses DM by default.
+							case 'SDX_DM':
+								$sdx = Soundex::daitchMokotoff($value);
+								if ($sdx !== null) {
+									$sdx = explode(':', $sdx);
+									foreach ($sdx as $k => $v) {
+										$sdx[$k] = "{$table}.n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
+										$bind[]  = $v;
+									}
+									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
+								} else {
+									// No phonetic content? Use a substring match
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$bind[] = $value;
+								}
+								break;
 						}
-						break;
-					}
 					break;
 				}
 			} elseif ($parts[0] === 'FAMS') {

app/Controller/LifespanController.php

Switch Indentation +17 added lines, -17 removed lines

@@ -497,23 +497,23 @@
 	 */
 	private function getCalendarDate($date) {
 		switch ($this->calendar) {
-		case 'julian':
-			$caldate = new JulianDate($date);
-			break;
-		case 'french':
-			$caldate = new FrenchDate($date);
-			break;
-		case 'jewish':
-			$caldate = new JewishDate($date);
-			break;
-		case 'hijri':
-			$caldate = new HijriDate($date);
-			break;
-		case 'jalali':
-			$caldate = new JalaliDate($date);
-			break;
-		default:
-			$caldate = new GregorianDate($date);
+			case 'julian':
+				$caldate = new JulianDate($date);
+				break;
+			case 'french':
+				$caldate = new FrenchDate($date);
+				break;
+			case 'jewish':
+				$caldate = new JewishDate($date);
+				break;
+			case 'hijri':
+				$caldate = new HijriDate($date);
+				break;
+			case 'jalali':
+				$caldate = new JalaliDate($date);
+				break;
+			default:
+				$caldate = new GregorianDate($date);
 		}
 
 		return $caldate;

app/Controller/AncestryController.php

Switch Indentation +38 added lines, -38 removed lines

@@ -124,47 +124,47 @@
 		}
 
 		switch ($this->chart_style) {
-		case 0:
-			// List
-			return
-				'<ul class="chart_common">' .
-				$this->printChildAscendancy($this->root, 1, $this->generations - 1) .
-				'</ul>';
-
-		case 1:
-			// Booklet
-			// first page : show indi facts
-			FunctionsPrint::printPedigreePerson($this->root);
-			// process the tree
-			$ancestors = $this->sosaAncestors($this->generations - 1);
-			$ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
-
-			foreach ($ancestors as $sosa => $individual) {
-				foreach ($individual->getChildFamilies() as $family) {
-					FunctionsCharts::printSosaFamily($family->getXref(), $individual->getXref(), $sosa, '', '', '', $this->show_cousins);
+			case 0:
+				// List
+				return
+					'<ul class="chart_common">' .
+					$this->printChildAscendancy($this->root, 1, $this->generations - 1) .
+					'</ul>';
+
+			case 1:
+				// Booklet
+				// first page : show indi facts
+				FunctionsPrint::printPedigreePerson($this->root);
+				// process the tree
+				$ancestors = $this->sosaAncestors($this->generations - 1);
+				$ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+
+				foreach ($ancestors as $sosa => $individual) {
+					foreach ($individual->getChildFamilies() as $family) {
+						FunctionsCharts::printSosaFamily($family->getXref(), $individual->getXref(), $sosa, '', '', '', $this->show_cousins);
+					}
 				}
-			}
-			break;
-
-		case 2:
-			// Individual list
-			$ancestors = $this->sosaAncestors($this->generations);
-			$ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
-
-			return FunctionsPrintLists::individualTable($ancestors, 'sosa');
-
-		case 3:
-			// Family list
-			$ancestors = $this->sosaAncestors($this->generations - 1);
-			$ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
-			$families  = [];
-			foreach ($ancestors as $individual) {
-				foreach ($individual->getChildFamilies() as $family) {
-					$families[$family->getXref()] = $family;
+				break;
+
+			case 2:
+				// Individual list
+				$ancestors = $this->sosaAncestors($this->generations);
+				$ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+
+				return FunctionsPrintLists::individualTable($ancestors, 'sosa');
+
+			case 3:
+				// Family list
+				$ancestors = $this->sosaAncestors($this->generations - 1);
+				$ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+				$families  = [];
+				foreach ($ancestors as $individual) {
+					foreach ($individual->getChildFamilies() as $family) {
+						$families[$family->getXref()] = $family;
+					}
 				}
-			}
 
-			return FunctionsPrintLists::familyTable($families);
+				return FunctionsPrintLists::familyTable($families);
 		}
 
 		return '';

app/Controller/PedigreeController.php

Switch Indentation +74 added lines, -74 removed lines

@@ -99,26 +99,26 @@ 
 
 		$this->arrows = new \stdClass();
 		switch ($this->orientation) {
-		case self::PORTRAIT:
-			//drop through
-		case self::LANDSCAPE:
-			$this->arrows->prevGen = 'fa fa-arrow-end wt-icon-arrow-end';
-			$this->arrows->menu    = 'fa fa-arrow-start wt-icon-arrow-start';
-			$addoffset['x']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
-			$addoffset['y']        = 0;
-			break;
-		case self::OLDEST_AT_TOP:
-			$this->arrows->prevGen = 'fa fa-arrow-up wt-icon-arrow-up';
-			$this->arrows->menu    = 'fa fa-arrow-down wt-icon-arrow-down';
-			$addoffset['x']        = 0;
-			$addoffset['y']        = $this->root->getSpouseFamilies() ? self::ARROW_SIZE : 0;
-			break;
-		case self::OLDEST_AT_BOTTOM:
-			$this->arrows->prevGen = 'fa fa-arrow-down wt-icon-arrow-down';
-			$this->arrows->menu    = 'fa fa-arrow-up wt-icon-arrow-up';
-			$addoffset['x']        = 0;
-			$addoffset['y']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
-			break;
+			case self::PORTRAIT:
+				//drop through
+			case self::LANDSCAPE:
+				$this->arrows->prevGen = 'fa fa-arrow-end wt-icon-arrow-end';
+				$this->arrows->menu    = 'fa fa-arrow-start wt-icon-arrow-start';
+				$addoffset['x']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
+				$addoffset['y']        = 0;
+				break;
+			case self::OLDEST_AT_TOP:
+				$this->arrows->prevGen = 'fa fa-arrow-up wt-icon-arrow-up';
+				$this->arrows->menu    = 'fa fa-arrow-down wt-icon-arrow-down';
+				$addoffset['x']        = 0;
+				$addoffset['y']        = $this->root->getSpouseFamilies() ? self::ARROW_SIZE : 0;
+				break;
+			case self::OLDEST_AT_BOTTOM:
+				$this->arrows->prevGen = 'fa fa-arrow-down wt-icon-arrow-down';
+				$this->arrows->menu    = 'fa fa-arrow-up wt-icon-arrow-up';
+				$addoffset['x']        = 0;
+				$addoffset['y']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
+				break;
 		}
 
 		// -- this next section will create and position the DIV layers for the pedigree tree
@@ -147,73 +147,73 @@ 
 
 			// -- calculate the xoffset
 			switch ($this->orientation) {
-			case self::PORTRAIT:
-				$xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8);
-				if (!$i && $this->root->getSpouseFamilies()) {
-					$xoffset -= self::ARROW_SIZE;
-				}
-				// -- compact the tree
-				if ($curgen < $this->generations) {
-					if ($i % 2 == 0) {
-						$yoffset = $yoffset - (($boxspacing / 2) * ($curgen - 1));
-					} else {
-						$yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
+				case self::PORTRAIT:
+					$xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8);
+					if (!$i && $this->root->getSpouseFamilies()) {
+						$xoffset -= self::ARROW_SIZE;
 					}
-					$parent = (int) (($i - 1) / 2);
-					$pgen   = $curgen;
-					while ($parent > 0) {
-						if ($parent % 2 == 0) {
-							$yoffset = $yoffset - (($boxspacing / 2) * $pgen);
+					// -- compact the tree
+					if ($curgen < $this->generations) {
+						if ($i % 2 == 0) {
+							$yoffset = $yoffset - (($boxspacing / 2) * ($curgen - 1));
 						} else {
-							$yoffset = $yoffset + (($boxspacing / 2) * $pgen);
+							$yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
+						}
+						$parent = (int) (($i - 1) / 2);
+						$pgen   = $curgen;
+						while ($parent > 0) {
+							if ($parent % 2 == 0) {
+								$yoffset = $yoffset - (($boxspacing / 2) * $pgen);
+							} else {
+								$yoffset = $yoffset + (($boxspacing / 2) * $pgen);
+							}
+							$pgen++;
+							if ($pgen > 3) {
+								$temp = 0;
+								for ($j = 1; $j < ($pgen - 2); $j++) {
+									$temp += (pow(2, $j) - 1);
+								}
+								if ($parent % 2 == 0) {
+									$yoffset = $yoffset - (($boxspacing / 2) * $temp);
+								} else {
+									$yoffset = $yoffset + (($boxspacing / 2) * $temp);
+								}
+							}
+							$parent = (int) (($parent - 1) / 2);
 						}
-						$pgen++;
-						if ($pgen > 3) {
+						if ($curgen > 3) {
 							$temp = 0;
-							for ($j = 1; $j < ($pgen - 2); $j++) {
+							for ($j = 1; $j < ($curgen - 2); $j++) {
 								$temp += (pow(2, $j) - 1);
 							}
-							if ($parent % 2 == 0) {
+							if ($i % 2 == 0) {
 								$yoffset = $yoffset - (($boxspacing / 2) * $temp);
 							} else {
 								$yoffset = $yoffset + (($boxspacing / 2) * $temp);
 							}
 						}
-						$parent = (int) (($parent - 1) / 2);
 					}
-					if ($curgen > 3) {
-						$temp = 0;
-						for ($j = 1; $j < ($curgen - 2); $j++) {
-							$temp += (pow(2, $j) - 1);
-						}
-						if ($i % 2 == 0) {
-							$yoffset = $yoffset - (($boxspacing / 2) * $temp);
-						} else {
-							$yoffset = $yoffset + (($boxspacing / 2) * $temp);
-						}
+					$yoffset -= (($boxspacing / 2) * pow(2, ($this->generations - 2)) - ($boxspacing / 2));
+					break;
+				case self::LANDSCAPE:
+					$xoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->width + $bxspacing);
+					if ($curgen == 1) {
+						$xoffset += 10;
 					}
-				}
-				$yoffset -= (($boxspacing / 2) * pow(2, ($this->generations - 2)) - ($boxspacing / 2));
-				break;
-			case self::LANDSCAPE:
-				$xoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->width + $bxspacing);
-				if ($curgen == 1) {
-					$xoffset += 10;
-				}
-				break;
-			case self::OLDEST_AT_TOP:
-				//swap x & y offsets as chart is rotated
-				$xoffset = $yoffset;
-				$yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4));
-				break;
-			case self::OLDEST_AT_BOTTOM:
-				//swap x & y offsets as chart is rotated
-				$xoffset = $yoffset;
-				$yoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->height + ($byspacing * 2));
-				if ($i && $this->root->getSpouseFamilies()) {
-					$yoffset += self::ARROW_SIZE;
-				}
-				break;
+					break;
+				case self::OLDEST_AT_TOP:
+					//swap x & y offsets as chart is rotated
+					$xoffset = $yoffset;
+					$yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4));
+					break;
+				case self::OLDEST_AT_BOTTOM:
+					//swap x & y offsets as chart is rotated
+					$xoffset = $yoffset;
+					$yoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->height + ($byspacing * 2));
+					if ($i && $this->root->getSpouseFamilies()) {
+						$yoffset += self::ARROW_SIZE;
+					}
+					break;
 			}
 			$this->nodes[$i]['x'] = (int) $xoffset;
 			$this->nodes[$i]['y'] = (int) $yoffset;

app/Controller/FanchartController.php

Switch Indentation +19 added lines, -19 removed lines

@@ -245,15 +245,15 @@ 
 					$text .= "\n" . I18N::reverseText($person->getLifeSpan());
 
 					switch ($person->getSex()) {
-					case 'M':
-						$bg = $bgcolorM;
-						break;
-					case 'F':
-						$bg = $bgcolorF;
-						break;
-					default:
-						$bg = $bgcolor;
-						break;
+						case 'M':
+							$bg = $bgcolorM;
+							break;
+						case 'F':
+							$bg = $bgcolorF;
+							break;
+						default:
+							$bg = $bgcolor;
+							break;
 					}
 
 					imagefilledarc($image, $cx, $cy, $rx, $rx, $deg1, $deg2, $bg, IMG_ARC_PIE);
@@ -364,19 +364,19 @@ 
 		$imagemap .= '</map>';
 
 		switch ($what) {
-		case 'html':
-			return $html . $imagemap . '<div id="fan_chart_img"><img src="fanchart.php?rootid=' . $this->root->getXref() . '&amp;fan_style=' . $this->fan_style . '&amp;generations=' . $this->generations . '&amp;fan_width=' . $this->fan_width . '&amp;img=1" width="' . $fanw . '" height="' . $fanh . '" alt="' . strip_tags($this->getPageTitle()) . '" usemap="#fanmap"></div>';
+			case 'html':
+				return $html . $imagemap . '<div id="fan_chart_img"><img src="fanchart.php?rootid=' . $this->root->getXref() . '&amp;fan_style=' . $this->fan_style . '&amp;generations=' . $this->generations . '&amp;fan_width=' . $this->fan_width . '&amp;img=1" width="' . $fanw . '" height="' . $fanh . '" alt="' . strip_tags($this->getPageTitle()) . '" usemap="#fanmap"></div>';
 
-		case 'png':
-			imagestringup($image, 1, $fanw - 10, $fanh / 3, WT_BASE_URL, $color);
-			ob_start();
-			imagepng($image);
-			imagedestroy($image);
+			case 'png':
+				imagestringup($image, 1, $fanw - 10, $fanh / 3, WT_BASE_URL, $color);
+				ob_start();
+				imagepng($image);
+				imagedestroy($image);
 
-			return ob_get_clean();
+				return ob_get_clean();
 
-		default:
-			throw new \InvalidArgumentException(__METHOD__ . ' ' . $what);
+			default:
+				throw new \InvalidArgumentException(__METHOD__ . ' ' . $what);
 		}
 	}
 }