fisharebest / webtrees

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 [
-				'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
-			];
-		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',
+				];
 		}
 	}
 
@@ -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/Report/ReportHtmlImage.php

Switch Indentation +14 added lines, -14 removed lines

@@ -43,20 +43,20 @@
 
 		// Image alignment
 		switch ($this->align) {
-		case 'L':
-			echo '<div style="position:absolute;top:', $this->y, 'pt;left:0pt;width:', $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
-			echo '<img src="', $this->file, '" style="width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case 'C':
-			echo '<div style="position:absolute;top:', $this->y, 'pt;left:0pt;width:', $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
-			echo '<img src="', $this->file, '" style="width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case 'R':
-			echo '<div style="position:absolute;top:', $this->y, 'pt;left:0pt;width:', $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
-			echo '<img src="', $this->file, '" style="width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		default:
-			echo '<img src="', $this->file, '" style="position:absolute;', $renderer->alignRTL, ':', $this->x, 'pt;top:', $this->y, 'pt;width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n";
+			case 'L':
+				echo '<div style="position:absolute;top:', $this->y, 'pt;left:0pt;width:', $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
+				echo '<img src="', $this->file, '" style="width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n</div>\n";
+				break;
+			case 'C':
+				echo '<div style="position:absolute;top:', $this->y, 'pt;left:0pt;width:', $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
+				echo '<img src="', $this->file, '" style="width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n</div>\n";
+				break;
+			case 'R':
+				echo '<div style="position:absolute;top:', $this->y, 'pt;left:0pt;width:', $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
+				echo '<img src="', $this->file, '" style="width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n</div>\n";
+				break;
+			default:
+				echo '<img src="', $this->file, '" style="position:absolute;', $renderer->alignRTL, ':', $this->x, 'pt;top:', $this->y, 'pt;width:', $this->width, 'pt;height:', $this->height, "pt;\" alt=\"\">\n";
 		}
 
 		$lastpicpage   = $renderer->pageNo();

app/Report/ReportParserGenerate.php

Switch Indentation +310 added lines, -310 removed lines

@@ -933,14 +933,14 @@ 
 				$tags  = preg_split('/[: ]/', $tag);
 				$value = $this->getGedcomValue($tag, $level, $this->gedrec);
 				switch (end($tags)) {
-				case 'DATE':
-					$tmp   = new Date($value);
-					$value = $tmp->display();
-					break;
-				case 'PLAC':
-					$tmp   = new Place($value, $WT_TREE);
-					$value = $tmp->getShortName();
-					break;
+					case 'DATE':
+						$tmp   = new Date($value);
+						$value = $tmp->display();
+						break;
+					case 'PLAC':
+						$tmp   = new Place($value, $WT_TREE);
+						$value = $tmp->getShortName();
+						break;
 				}
 				if ($useBreak == '1') {
 					// Insert <br> when multiple dates exist.
@@ -1333,22 +1333,22 @@ 
 		// Arithmetic functions
 		if (preg_match("/(\d+)\s*([\-\+\*\/])\s*(\d+)/", $value, $match)) {
 			switch ($match[2]) {
-			case '+':
-				$t     = $match[1] + $match[3];
-				$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
-				break;
-			case '-':
-				$t     = $match[1] - $match[3];
-				$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
-				break;
-			case '*':
-				$t     = $match[1] * $match[3];
-				$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
-				break;
-			case '/':
-				$t     = $match[1] / $match[3];
-				$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
-				break;
+				case '+':
+					$t     = $match[1] + $match[3];
+					$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
+					break;
+				case '-':
+					$t     = $match[1] - $match[3];
+					$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
+					break;
+				case '*':
+					$t     = $match[1] * $match[3];
+					$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
+					break;
+				case '/':
+					$t     = $match[1] / $match[3];
+					$value = preg_replace('/' . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . '/', $t, $value);
+					break;
 			}
 		}
 		if (strpos($value, '@') !== false) {
@@ -1816,179 +1816,179 @@ 
 		}
 		// Some filters/sorts can be applied using SQL, while others require PHP
 		switch ($listname) {
-		case 'pending':
-			$rows = Database::prepare(
-				"SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
-				" FROM `##change`" . " WHERE (xref, change_id) IN (" .
-				"  SELECT xref, MAX(change_id)" .
-				"  FROM `##change`" .
-				"  WHERE status = 'pending' AND gedcom_id = :tree_id" .
-				"  GROUP BY xref" .
-				" )"
-			)->execute([
-				'tree_id' => $WT_TREE->getTreeId(),
-			])->fetchAll();
-			$this->list = [];
-			foreach ($rows as $row) {
-				$this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
-		case 'individual':
-			$sql_select   = "SELECT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
-			$sql_join     = "";
-			$sql_where    = " WHERE i_file = :tree_id";
-			$sql_order_by = "";
-			$sql_params   = ['tree_id' => $WT_TREE->getTreeId()];
-			foreach ($attrs as $attr => $value) {
-				if (strpos($attr, 'filter') === 0 && $value) {
-					$value = $this->substituteVars($value, false);
-					// Convert the various filters into SQL
-					if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=i_file AND {$attr}.d_gid=i_id)";
-						$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
-						$sql_params[$attr . 'fact'] = $match[1];
-						$date                       = new Date($match[3]);
-						if ($match[2] == 'LTE') {
-							$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->maximumJulianDay();
-						} else {
-							$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->minimumJulianDay();
-						}
-						if ($sortby == $match[1]) {
-							$sortby = "";
-							$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^NAME CONTAINS (.*)$/', $value, $match)) {
-						// Do nothing, unless you have to
-						if ($match[1] != '' || $sortby == 'NAME') {
-							$sql_join .= " JOIN `##name` AS {$attr} ON (n_file=i_file AND n_id=i_id)";
-							// Search the DB only if there is any name supplied
-							if ($match[1] != '') {
-								$names = explode(' ', $match[1]);
-								foreach ($names as $n => $name) {
-									$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
-									$sql_params[$attr . 'name' . $n] = $name;
-								}
+			case 'pending':
+				$rows = Database::prepare(
+					"SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
+					" FROM `##change`" . " WHERE (xref, change_id) IN (" .
+					"  SELECT xref, MAX(change_id)" .
+					"  FROM `##change`" .
+					"  WHERE status = 'pending' AND gedcom_id = :tree_id" .
+					"  GROUP BY xref" .
+					" )"
+				)->execute([
+					'tree_id' => $WT_TREE->getTreeId(),
+				])->fetchAll();
+				$this->list = [];
+				foreach ($rows as $row) {
+					$this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
+				}
+				break;
+			case 'individual':
+				$sql_select   = "SELECT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
+				$sql_join     = "";
+				$sql_where    = " WHERE i_file = :tree_id";
+				$sql_order_by = "";
+				$sql_params   = ['tree_id' => $WT_TREE->getTreeId()];
+				foreach ($attrs as $attr => $value) {
+					if (strpos($attr, 'filter') === 0 && $value) {
+						$value = $this->substituteVars($value, false);
+						// Convert the various filters into SQL
+						if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=i_file AND {$attr}.d_gid=i_id)";
+							$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
+							$sql_params[$attr . 'fact'] = $match[1];
+							$date                       = new Date($match[3]);
+							if ($match[2] == 'LTE') {
+								$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->maximumJulianDay();
+							} else {
+								$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->minimumJulianDay();
 							}
-							// Let the DB do the name sorting even when no name was entered
-							if ($sortby == 'NAME') {
-								$sortby = '';
-								$sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
+							if ($sortby == $match[1]) {
+								$sortby = "";
+								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
 							}
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^NAME CONTAINS (.*)$/', $value, $match)) {
+							// Do nothing, unless you have to
+							if ($match[1] != '' || $sortby == 'NAME') {
+								$sql_join .= " JOIN `##name` AS {$attr} ON (n_file=i_file AND n_id=i_id)";
+								// Search the DB only if there is any name supplied
+								if ($match[1] != '') {
+									$names = explode(' ', $match[1]);
+									foreach ($names as $n => $name) {
+										$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+										$sql_params[$attr . 'name' . $n] = $name;
+									}
+								}
+								// Let the DB do the name sorting even when no name was entered
+								if ($sortby == 'NAME') {
+									$sortby = '';
+									$sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
+								}
+							}
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
+							$sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
+							// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
+							$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
+							$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
+							$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+							$sql_params[$attr . 'place'] = $match[1];
+							// Don't unset this filter. This is just initial filtering
+						} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+							$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+							$sql_params[$attr . 'contains1'] = $match[1];
+							$sql_params[$attr . 'contains2'] = $match[2];
+							$sql_params[$attr . 'contains3'] = $match[3];
+							// Don't unset this filter. This is just initial filtering
 						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
-						$sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
-						// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
-						$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
-						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
-						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-						$sql_params[$attr . 'place'] = $match[1];
-						// Don't unset this filter. This is just initial filtering
-					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-						$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-						$sql_params[$attr . 'contains1'] = $match[1];
-						$sql_params[$attr . 'contains2'] = $match[2];
-						$sql_params[$attr . 'contains3'] = $match[3];
-						// Don't unset this filter. This is just initial filtering
 					}
 				}
-			}
 
-			$this->list = [];
-			$rows       = Database::prepare(
-				$sql_select . $sql_join . $sql_where . $sql_order_by
-			)->execute($sql_params)->fetchAll();
-
-			foreach ($rows as $row) {
-				$this->list[$row->xref] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
-
-		case 'family':
-			$sql_select   = "SELECT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
-			$sql_join     = "";
-			$sql_where    = " WHERE f_file = :tree_id";
-			$sql_order_by = "";
-			$sql_params   = ['tree_id' => $WT_TREE->getTreeId()];
-			foreach ($attrs as $attr => $value) {
-				if (strpos($attr, 'filter') === 0 && $value) {
-					$value = $this->substituteVars($value, false);
-					// Convert the various filters into SQL
-					if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=f_file AND {$attr}.d_gid=f_id)";
-						$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
-						$sql_params[$attr . 'fact'] = $match[1];
-						$date                       = new Date($match[3]);
-						if ($match[2] == 'LTE') {
-							$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->maximumJulianDay();
-						} else {
-							$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->minimumJulianDay();
-						}
-						if ($sortby == $match[1]) {
-							$sortby = '';
-							$sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.d_julianday1";
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
-						$sql_where .= " AND f_gedcom REGEXP :{$attr}gedcom";
-						// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
-						$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^NAME CONTAINS (.+)$/', $value, $match)) {
-						// Do nothing, unless you have to
-						if ($match[1] != '' || $sortby == 'NAME') {
-							$sql_join .= " JOIN `##name` AS {$attr} ON n_file = f_file AND n_id IN (f_husb, f_wife)";
-							// Search the DB only if there is any name supplied
-							if ($match[1] != '') {
-								$names = explode(' ', $match[1]);
-								foreach ($names as $n => $name) {
-									$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
-									$sql_params[$attr . 'name' . $n] = $name;
-								}
+				$this->list = [];
+				$rows       = Database::prepare(
+					$sql_select . $sql_join . $sql_where . $sql_order_by
+				)->execute($sql_params)->fetchAll();
+
+				foreach ($rows as $row) {
+					$this->list[$row->xref] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+				}
+				break;
+
+			case 'family':
+				$sql_select   = "SELECT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
+				$sql_join     = "";
+				$sql_where    = " WHERE f_file = :tree_id";
+				$sql_order_by = "";
+				$sql_params   = ['tree_id' => $WT_TREE->getTreeId()];
+				foreach ($attrs as $attr => $value) {
+					if (strpos($attr, 'filter') === 0 && $value) {
+						$value = $this->substituteVars($value, false);
+						// Convert the various filters into SQL
+						if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=f_file AND {$attr}.d_gid=f_id)";
+							$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
+							$sql_params[$attr . 'fact'] = $match[1];
+							$date                       = new Date($match[3]);
+							if ($match[2] == 'LTE') {
+								$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->maximumJulianDay();
+							} else {
+								$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->minimumJulianDay();
 							}
-							// Let the DB do the name sorting even when no name was entered
-							if ($sortby == 'NAME') {
+							if ($sortby == $match[1]) {
 								$sortby = '';
-								$sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
+								$sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.d_julianday1";
+							}
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
+							$sql_where .= " AND f_gedcom REGEXP :{$attr}gedcom";
+							// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
+							$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^NAME CONTAINS (.+)$/', $value, $match)) {
+							// Do nothing, unless you have to
+							if ($match[1] != '' || $sortby == 'NAME') {
+								$sql_join .= " JOIN `##name` AS {$attr} ON n_file = f_file AND n_id IN (f_husb, f_wife)";
+								// Search the DB only if there is any name supplied
+								if ($match[1] != '') {
+									$names = explode(' ', $match[1]);
+									foreach ($names as $n => $name) {
+										$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+										$sql_params[$attr . 'name' . $n] = $name;
+									}
+								}
+								// Let the DB do the name sorting even when no name was entered
+								if ($sortby == 'NAME') {
+									$sortby = '';
+									$sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
+								}
 							}
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
+							$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
+							$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+							$sql_params[$attr . 'place'] = $match[1];
+							// Don't unset this filter. This is just initial filtering
+						} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+							$sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+							$sql_params[$attr . 'contains1'] = $match[1];
+							$sql_params[$attr . 'contains2'] = $match[2];
+							$sql_params[$attr . 'contains3'] = $match[3];
+							// Don't unset this filter. This is just initial filtering
 						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
-						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
-						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-						$sql_params[$attr . 'place'] = $match[1];
-						// Don't unset this filter. This is just initial filtering
-					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-						$sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-						$sql_params[$attr . 'contains1'] = $match[1];
-						$sql_params[$attr . 'contains2'] = $match[2];
-						$sql_params[$attr . 'contains3'] = $match[3];
-						// Don't unset this filter. This is just initial filtering
 					}
 				}
-			}
 
-			$this->list = [];
-			$rows       = Database::prepare(
-				$sql_select . $sql_join . $sql_where . $sql_order_by
-			)->execute($sql_params)->fetchAll();
+				$this->list = [];
+				$rows       = Database::prepare(
+					$sql_select . $sql_join . $sql_where . $sql_order_by
+				)->execute($sql_params)->fetchAll();
 
-			foreach ($rows as $row) {
-				$this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
+				foreach ($rows as $row) {
+					$this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+				}
+				break;
 
-		default:
-			throw new \DomainException('Invalid list name: ' . $listname);
+			default:
+				throw new \DomainException('Invalid list name: ' . $listname);
 		}
 
 		$filters  = [];
@@ -2049,17 +2049,17 @@ 
 								$searchstr = '1 ' . $tag;
 							}
 							switch ($expr) {
-							case 'CONTAINS':
-								if ($t == 'PLAC') {
-									$searchstr .= "[^\n]*[, ]*" . $val;
-								} else {
-									$searchstr .= "[^\n]*" . $val;
-								}
-								$filters[] = $searchstr;
-								break;
-							default:
-								$filters2[] = ['tag' => $tag, 'expr' => $expr, 'val' => $val];
-								break;
+								case 'CONTAINS':
+									if ($t == 'PLAC') {
+										$searchstr .= "[^\n]*[, ]*" . $val;
+									} else {
+										$searchstr .= "[^\n]*" . $val;
+									}
+									$filters[] = $searchstr;
+									break;
+								default:
+									$filters2[] = ['tag' => $tag, 'expr' => $expr, 'val' => $val];
+									break;
 							}
 						}
 					}
@@ -2103,31 +2103,31 @@ 
 						}
 
 						switch ($expr) {
-						case 'GTE':
-							if ($t == 'DATE') {
-								$date1 = new Date($v);
-								$date2 = new Date($val);
-								$keep  = (Date::compare($date1, $date2) >= 0);
-							} elseif ($val >= $v) {
-								$keep = true;
-							}
-							break;
-						case 'LTE':
-							if ($t == 'DATE') {
-								$date1 = new Date($v);
-								$date2 = new Date($val);
-								$keep  = (Date::compare($date1, $date2) <= 0);
-							} elseif ($val >= $v) {
-								$keep = true;
-							}
-							break;
-						default:
-							if ($v == $val) {
-								$keep = true;
-							} else {
-								$keep = false;
-							}
-							break;
+							case 'GTE':
+								if ($t == 'DATE') {
+									$date1 = new Date($v);
+									$date2 = new Date($val);
+									$keep  = (Date::compare($date1, $date2) >= 0);
+								} elseif ($val >= $v) {
+									$keep = true;
+								}
+								break;
+							case 'LTE':
+								if ($t == 'DATE') {
+									$date1 = new Date($v);
+									$date2 = new Date($val);
+									$keep  = (Date::compare($date1, $date2) <= 0);
+								} elseif ($val >= $v) {
+									$keep = true;
+								}
+								break;
+							default:
+								if ($v == $val) {
+									$keep = true;
+								} else {
+									$keep = false;
+								}
+								break;
 						}
 					}
 				}
@@ -2139,26 +2139,26 @@ 
 		}
 
 		switch ($sortby) {
-		case 'NAME':
-			uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			break;
-		case 'CHAN':
-			uasort($this->list, function (GedcomRecord $x, GedcomRecord $y) {
-				return $y->lastChangeTimestamp(true) - $x->lastChangeTimestamp(true);
-			});
-			break;
-		case 'BIRT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
-			break;
-		case 'DEAT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
-			break;
-		case 'MARR:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Family::compareMarrDate');
-			break;
-		default:
-			// unsorted or already sorted by SQL
-			break;
+			case 'NAME':
+				uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+				break;
+			case 'CHAN':
+				uasort($this->list, function (GedcomRecord $x, GedcomRecord $y) {
+					return $y->lastChangeTimestamp(true) - $x->lastChangeTimestamp(true);
+				});
+				break;
+			case 'BIRT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
+				break;
+			case 'DEAT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
+				break;
+			case 'MARR:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Family::compareMarrDate');
+				break;
+			default:
+				// unsorted or already sorted by SQL
+				break;
 		}
 
 		array_push($this->repeats_stack, [$this->repeats, $this->repeat_bytes]);
@@ -2309,88 +2309,88 @@ 
 		if (!empty($person)) {
 			$this->list[$id] = $person;
 			switch ($group) {
-			case 'child-family':
-				foreach ($person->getChildFamilies() as $family) {
-					$husband = $family->getHusband();
-					$wife    = $family->getWife();
-					if (!empty($husband)) {
-						$this->list[$husband->getXref()] = $husband;
-					}
-					if (!empty($wife)) {
-						$this->list[$wife->getXref()] = $wife;
-					}
-					$children = $family->getChildren();
-					foreach ($children as $child) {
-						if (!empty($child)) {
-							$this->list[$child->getXref()] = $child;
+				case 'child-family':
+					foreach ($person->getChildFamilies() as $family) {
+						$husband = $family->getHusband();
+						$wife    = $family->getWife();
+						if (!empty($husband)) {
+							$this->list[$husband->getXref()] = $husband;
+						}
+						if (!empty($wife)) {
+							$this->list[$wife->getXref()] = $wife;
+						}
+						$children = $family->getChildren();
+						foreach ($children as $child) {
+							if (!empty($child)) {
+								$this->list[$child->getXref()] = $child;
+							}
 						}
 					}
-				}
-				break;
-			case 'spouse-family':
-				foreach ($person->getSpouseFamilies() as $family) {
-					$husband = $family->getHusband();
-					$wife    = $family->getWife();
-					if (!empty($husband)) {
-						$this->list[$husband->getXref()] = $husband;
-					}
-					if (!empty($wife)) {
-						$this->list[$wife->getXref()] = $wife;
-					}
-					$children = $family->getChildren();
-					foreach ($children as $child) {
-						if (!empty($child)) {
-							$this->list[$child->getXref()] = $child;
+					break;
+				case 'spouse-family':
+					foreach ($person->getSpouseFamilies() as $family) {
+						$husband = $family->getHusband();
+						$wife    = $family->getWife();
+						if (!empty($husband)) {
+							$this->list[$husband->getXref()] = $husband;
+						}
+						if (!empty($wife)) {
+							$this->list[$wife->getXref()] = $wife;
+						}
+						$children = $family->getChildren();
+						foreach ($children as $child) {
+							if (!empty($child)) {
+								$this->list[$child->getXref()] = $child;
+							}
 						}
 					}
-				}
-				break;
-			case 'direct-ancestors':
-				$this->addAncestors($this->list, $id, false, $maxgen);
-				break;
-			case 'ancestors':
-				$this->addAncestors($this->list, $id, true, $maxgen);
-				break;
-			case 'descendants':
-				$this->list[$id]->generation = 1;
-				$this->addDescendancy($this->list, $id, false, $maxgen);
-				break;
-			case 'all':
-				$this->addAncestors($this->list, $id, true, $maxgen);
-				$this->addDescendancy($this->list, $id, true, $maxgen);
-				break;
+					break;
+				case 'direct-ancestors':
+					$this->addAncestors($this->list, $id, false, $maxgen);
+					break;
+				case 'ancestors':
+					$this->addAncestors($this->list, $id, true, $maxgen);
+					break;
+				case 'descendants':
+					$this->list[$id]->generation = 1;
+					$this->addDescendancy($this->list, $id, false, $maxgen);
+					break;
+				case 'all':
+					$this->addAncestors($this->list, $id, true, $maxgen);
+					$this->addDescendancy($this->list, $id, true, $maxgen);
+					break;
 			}
 		}
 
 		switch ($sortby) {
-		case 'NAME':
-			uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			break;
-		case 'BIRT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
-			break;
-		case 'DEAT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
-			break;
-		case 'generation':
-			$newarray = [];
-			reset($this->list);
-			$genCounter = 1;
-			while (count($newarray) < count($this->list)) {
-				foreach ($this->list as $key => $value) {
-					$this->generation = $value->generation;
-					if ($this->generation == $genCounter) {
-						$newarray[$key]             = new \stdClass;
-						$newarray[$key]->generation = $this->generation;
+			case 'NAME':
+				uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+				break;
+			case 'BIRT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
+				break;
+			case 'DEAT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
+				break;
+			case 'generation':
+				$newarray = [];
+				reset($this->list);
+				$genCounter = 1;
+				while (count($newarray) < count($this->list)) {
+					foreach ($this->list as $key => $value) {
+						$this->generation = $value->generation;
+						if ($this->generation == $genCounter) {
+							$newarray[$key]             = new \stdClass;
+							$newarray[$key]->generation = $this->generation;
+						}
 					}
+					$genCounter++;
 				}
-				$genCounter++;
-			}
-			$this->list = $newarray;
-			break;
-		default:
-			// unsorted
-			break;
+				$this->list = $newarray;
+				break;
+			default:
+				// unsorted
+				break;
 		}
 		array_push($this->repeats_stack, [$this->repeats, $this->repeat_bytes]);
 		$this->repeat_bytes = xml_get_current_line_number($this->parser) + 1;

app/Report/ReportBase.php

Switch Indentation +252 added lines, -252 removed lines

@@ -139,258 +139,258 @@
 			 */
 			switch ($this->pageFormat) {
 				// ISO A series
-			case '4A0': // ISO 216, 1682 mm x 2378 mm
-				$sizes = [4767.86, 6740.79];
-				break;
-			case '2A0': // ISO 216, 1189 mm x 1682 mm
-				$sizes = [3370.39, 4767.86];
-				break;
-			case 'A0': // ISO 216, 841 mm x 1189mm
-				$sizes = [2383.94, 3370.39];
-				break;
-			case 'A1': // ISO 216, 594 mm x 841 mm
-				$sizes = [1683.78, 2383.94];
-				break;
-			case 'A2': // ISO 216, 420 mm x 594 mm
-				$sizes = [1190.55, 1683.78];
-				break;
-			case 'A3': // ISO 216, 297 mm x 420 mm
-				$sizes = [841.89, 1190.55];
-				break;
-			case 'A4': // ISO 216, 210 mm 297 mm
-				$sizes = [595.28, 841.89];
-				break;
-			case 'A5': // ISO 216, 148 mm x 210 mm
-				$sizes = [419.53, 595.28];
-				break;
-			case 'A6': // ISO 216, 105 mm x 148 mm
-				$sizes = [297.64, 419.53];
-				break;
-			case 'A7': // ISO 216, 74 mm x 105 mm
-				$sizes = [209.76, 297.64];
-				break;
-			case 'A8': // ISO 216, 52 mm x 74 mm
-				$sizes = [147.40, 209.76];
-				break;
-			case 'A9': // ISO 216, 37 mm x 52 mm
-				$sizes = [104.88, 147.40];
-				break;
-			case 'A10': // ISO 216, 26 mm x 37 mm
-				$sizes = [73.70, 104.88];
-				break;
-
-			// ISO B series
-			case 'B0': // ISO 216, 1000 mm x 1414 mm
-				$sizes = [2834.65, 4008.19];
-				break;
-			case 'B1': // ISO 216, 707 mm x 1000 mm
-				$sizes = [2004.09, 2834.65];
-				break;
-			case 'B2': // ISO 216, 500 mm x 707 mm
-				$sizes = [1417.32, 2004.09];
-				break;
-			case 'B3': // ISO 216, 353 mm x 500 mm
-				$sizes = [1000.63, 1417.32];
-				break;
-			case 'B4': // ISO 216, 250 mm x 353 mm
-				$sizes = [708.66, 1000.63];
-				break;
-			case 'B5': // ISO 216, 176 mm x 250 mm
-				$sizes = [498.90, 708.66];
-				break;
-			case 'B6': // ISO 216, 125 mm x 176 mm
-				$sizes = [354.33, 498.90];
-				break;
-			case 'B7': // ISO 216, 88 mm x 125 mm
-				$sizes = [249.45, 354.33];
-				break;
-			case 'B8': // ISO 216, 62 mm x 88 mm
-				$sizes = [175.75, 249.45];
-				break;
-			case 'B9': // ISO 216, 44 mm x 62 mm
-				$sizes = [124.72, 175.75];
-				break;
-			case 'B10': // ISO 216, 31 mm x 44 mm
-				$sizes = [87.87, 124.72];
-				break;
-
-			// ISO C series, Envelope
-			case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
-				$sizes = [2599.37, 3676.54];
-				break;
-			case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
-				$sizes = [1836.85, 2599.37];
-				break;
-			case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
-				$sizes = [1298.27, 1836.85];
-				break;
-			case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
-				$sizes = [918.43, 1298.27];
-				break;
-			case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
-				$sizes = [649.13, 918.43];
-				break;
-			case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
-				$sizes = [459.21, 649.13];
-				break;
-			case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
-				$sizes = [323.15, 649.13];
-				break;
-			case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
-				$sizes = [323.15, 459.21];
-				break;
-			case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
-				$sizes = [229.61, 459.21];
-				break;
-			case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
-				$sizes = [229.61, 323.15];
-				break;
-			case 'C8': // ISO 269, 57 mm x 81 mm
-				$sizes = [161.57, 229.61];
-				break;
-			case 'C9': // ISO 269, 40 mm x 57 mm
-				$sizes = [113.39, 161.57];
-				break;
-			case 'C10': // ISO 269, 28 mm x 40 mm
-				$sizes = [79.37, 113.39];
-				break;
-			case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
-				$sizes = [311.81, 623.62];
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO primary range
-			case 'RA0': // ISO 478, 860 mm x 1220 mm
-				$sizes = [2437.80, 3458.27];
-				break;
-			case 'RA1': // ISO 478, 610 mm x 860 mm
-				$sizes = [1729.13, 2437.80];
-				break;
-			case 'RA2': // ISO 478, 430 mm x 610 mm
-				$sizes = [1218.90, 1729.13];
-				break;
-			case 'RA3': // ISO 478, 305 mm x 430 mm
-				$sizes = [864.57, 1218.90];
-				break;
-			case 'RA4': // ISO 478, 215 mm x 305 mm
-				$sizes = [609.45, 864.57];
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
-			case 'SRA0': // ISO 593, 900 mm x 1280 mm
-				$sizes = [2551.18, 3628.35];
-				break;
-			case 'SRA1': // ISO 593, 640 mm x 900 mm
-				$sizes = [1814.17, 2551.18];
-				break;
-			case 'SRA2': // ISO 593, 450 mm x 640 mm
-				$sizes = [1275.59, 1814.17];
-				break;
-			case 'SRA3': // ISO 593, 320 mm x 450 mm
-				$sizes = [907.09, 1275.59];
-				break;
-			case 'SRA4': // ISO 593, 225 mm x 320 mm
-				$sizes = [637.80, 907.09];
-				break;
-
-			// ISO size variations
-			case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
-				$sizes = [1261.42, 1754.65];
-				break;
-			case 'A2SUPER': // ISO 216, 305 mm x 508 mm
-				$sizes = [864.57, 1440.00];
-				break;
-			case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
-				$sizes = [912.76, 1261.42];
-				break;
-			case 'SUPERA3': // ISO 216, 305 mm x 487 mm
-				$sizes = [864.57, 1380.47];
-				break;
-			case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
-				$sizes = [666.14, 912.76];
-				break;
-			case 'A4LONG': // ISO 216, 210 mm x 348 mm
-				$sizes = [595.28, 986.46];
-				break;
-			case 'A4SUPER': // ISO 216, 229 mm x 322 mm
-				$sizes = [649.13, 912.76];
-				break;
-			case 'SUPERA4': // ISO 216, 227 mm x 356 mm
-				$sizes = [643.46, 1009.13];
-				break;
-			case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
-				$sizes = [490.39, 666.14];
-				break;
-			case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
-				$sizes = [572.60, 782.36];
-				break;
-
-			// Japanese version of the ISO 216 B series
-			case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
-				$sizes = [2919.69, 4127.24];
-				break;
-			case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
-				$sizes = [2063.62, 2919.69];
-				break;
-			case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
-				$sizes = [1459.84, 2063.62];
-				break;
-			case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
-				$sizes = [1031.81, 1459.84];
-				break;
-			case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
-				$sizes = [728.50, 1031.81];
-				break;
-			case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
-				$sizes = [515.91, 728.50];
-				break;
-			case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
-				$sizes = [362.83, 515.91];
-				break;
-			case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
-				$sizes = [257.95, 362.83];
-				break;
-			case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
-				$sizes = [181.42, 257.95];
-				break;
-			case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
-				$sizes = [127.56, 181.42];
-				break;
-			case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
-				$sizes = [90.71, 127.56];
-				break;
-
-			// US pages
-			case 'EXECUTIVE': // 7.25 in x 10.5 in
-				$sizes = [522.00, 756.00];
-				break;
-			case 'FOLIO': // 8.5 in x 13 in
-				$sizes = [612.00, 936.00];
-				break;
-			case 'FOOLSCAP': // 13.5 in x 17 in
-				$sizes = [972.00, 1224.00];
-				break;
-			case 'LEDGER': // 11 in x 17 in
-				$sizes = [792.00, 1224.00];
-				break;
-			case 'LEGAL': // 8.5 in x 14 in
-				$sizes = [612.00, 1008.00];
-				break;
-			case 'LETTER': // 8.5 in x 11 in
-				$sizes = [612.00, 792.00];
-				break;
-			case 'QUARTO': // 8.46 in x 10.8 in
-				$sizes = [609.12, 777.50];
-				break;
-			case 'STATEMENT': // 5.5 in x 8.5 in
-				$sizes = [396.00, 612.00];
-				break;
-			case 'USGOVT': // 8 in x 11 in
-				$sizes = [576.00, 792.00];
-				break;
-			default:
-				$this->pageFormat = 'A4';
-				$sizes            = [595.28, 841.89];
-				break;
+				case '4A0': // ISO 216, 1682 mm x 2378 mm
+					$sizes = [4767.86, 6740.79];
+					break;
+				case '2A0': // ISO 216, 1189 mm x 1682 mm
+					$sizes = [3370.39, 4767.86];
+					break;
+				case 'A0': // ISO 216, 841 mm x 1189mm
+					$sizes = [2383.94, 3370.39];
+					break;
+				case 'A1': // ISO 216, 594 mm x 841 mm
+					$sizes = [1683.78, 2383.94];
+					break;
+				case 'A2': // ISO 216, 420 mm x 594 mm
+					$sizes = [1190.55, 1683.78];
+					break;
+				case 'A3': // ISO 216, 297 mm x 420 mm
+					$sizes = [841.89, 1190.55];
+					break;
+				case 'A4': // ISO 216, 210 mm 297 mm
+					$sizes = [595.28, 841.89];
+					break;
+				case 'A5': // ISO 216, 148 mm x 210 mm
+					$sizes = [419.53, 595.28];
+					break;
+				case 'A6': // ISO 216, 105 mm x 148 mm
+					$sizes = [297.64, 419.53];
+					break;
+				case 'A7': // ISO 216, 74 mm x 105 mm
+					$sizes = [209.76, 297.64];
+					break;
+				case 'A8': // ISO 216, 52 mm x 74 mm
+					$sizes = [147.40, 209.76];
+					break;
+				case 'A9': // ISO 216, 37 mm x 52 mm
+					$sizes = [104.88, 147.40];
+					break;
+				case 'A10': // ISO 216, 26 mm x 37 mm
+					$sizes = [73.70, 104.88];
+					break;
+
+				// ISO B series
+				case 'B0': // ISO 216, 1000 mm x 1414 mm
+					$sizes = [2834.65, 4008.19];
+					break;
+				case 'B1': // ISO 216, 707 mm x 1000 mm
+					$sizes = [2004.09, 2834.65];
+					break;
+				case 'B2': // ISO 216, 500 mm x 707 mm
+					$sizes = [1417.32, 2004.09];
+					break;
+				case 'B3': // ISO 216, 353 mm x 500 mm
+					$sizes = [1000.63, 1417.32];
+					break;
+				case 'B4': // ISO 216, 250 mm x 353 mm
+					$sizes = [708.66, 1000.63];
+					break;
+				case 'B5': // ISO 216, 176 mm x 250 mm
+					$sizes = [498.90, 708.66];
+					break;
+				case 'B6': // ISO 216, 125 mm x 176 mm
+					$sizes = [354.33, 498.90];
+					break;
+				case 'B7': // ISO 216, 88 mm x 125 mm
+					$sizes = [249.45, 354.33];
+					break;
+				case 'B8': // ISO 216, 62 mm x 88 mm
+					$sizes = [175.75, 249.45];
+					break;
+				case 'B9': // ISO 216, 44 mm x 62 mm
+					$sizes = [124.72, 175.75];
+					break;
+				case 'B10': // ISO 216, 31 mm x 44 mm
+					$sizes = [87.87, 124.72];
+					break;
+
+				// ISO C series, Envelope
+				case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
+					$sizes = [2599.37, 3676.54];
+					break;
+				case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
+					$sizes = [1836.85, 2599.37];
+					break;
+				case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
+					$sizes = [1298.27, 1836.85];
+					break;
+				case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
+					$sizes = [918.43, 1298.27];
+					break;
+				case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
+					$sizes = [649.13, 918.43];
+					break;
+				case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
+					$sizes = [459.21, 649.13];
+					break;
+				case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
+					$sizes = [323.15, 649.13];
+					break;
+				case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
+					$sizes = [323.15, 459.21];
+					break;
+				case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
+					$sizes = [229.61, 459.21];
+					break;
+				case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
+					$sizes = [229.61, 323.15];
+					break;
+				case 'C8': // ISO 269, 57 mm x 81 mm
+					$sizes = [161.57, 229.61];
+					break;
+				case 'C9': // ISO 269, 40 mm x 57 mm
+					$sizes = [113.39, 161.57];
+					break;
+				case 'C10': // ISO 269, 28 mm x 40 mm
+					$sizes = [79.37, 113.39];
+					break;
+				case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
+					$sizes = [311.81, 623.62];
+					break;
+
+				// Untrimmed stock sizes for the ISO-A Series - ISO primary range
+				case 'RA0': // ISO 478, 860 mm x 1220 mm
+					$sizes = [2437.80, 3458.27];
+					break;
+				case 'RA1': // ISO 478, 610 mm x 860 mm
+					$sizes = [1729.13, 2437.80];
+					break;
+				case 'RA2': // ISO 478, 430 mm x 610 mm
+					$sizes = [1218.90, 1729.13];
+					break;
+				case 'RA3': // ISO 478, 305 mm x 430 mm
+					$sizes = [864.57, 1218.90];
+					break;
+				case 'RA4': // ISO 478, 215 mm x 305 mm
+					$sizes = [609.45, 864.57];
+					break;
+
+				// Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
+				case 'SRA0': // ISO 593, 900 mm x 1280 mm
+					$sizes = [2551.18, 3628.35];
+					break;
+				case 'SRA1': // ISO 593, 640 mm x 900 mm
+					$sizes = [1814.17, 2551.18];
+					break;
+				case 'SRA2': // ISO 593, 450 mm x 640 mm
+					$sizes = [1275.59, 1814.17];
+					break;
+				case 'SRA3': // ISO 593, 320 mm x 450 mm
+					$sizes = [907.09, 1275.59];
+					break;
+				case 'SRA4': // ISO 593, 225 mm x 320 mm
+					$sizes = [637.80, 907.09];
+					break;
+
+				// ISO size variations
+				case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
+					$sizes = [1261.42, 1754.65];
+					break;
+				case 'A2SUPER': // ISO 216, 305 mm x 508 mm
+					$sizes = [864.57, 1440.00];
+					break;
+				case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
+					$sizes = [912.76, 1261.42];
+					break;
+				case 'SUPERA3': // ISO 216, 305 mm x 487 mm
+					$sizes = [864.57, 1380.47];
+					break;
+				case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
+					$sizes = [666.14, 912.76];
+					break;
+				case 'A4LONG': // ISO 216, 210 mm x 348 mm
+					$sizes = [595.28, 986.46];
+					break;
+				case 'A4SUPER': // ISO 216, 229 mm x 322 mm
+					$sizes = [649.13, 912.76];
+					break;
+				case 'SUPERA4': // ISO 216, 227 mm x 356 mm
+					$sizes = [643.46, 1009.13];
+					break;
+				case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
+					$sizes = [490.39, 666.14];
+					break;
+				case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
+					$sizes = [572.60, 782.36];
+					break;
+
+				// Japanese version of the ISO 216 B series
+				case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
+					$sizes = [2919.69, 4127.24];
+					break;
+				case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
+					$sizes = [2063.62, 2919.69];
+					break;
+				case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
+					$sizes = [1459.84, 2063.62];
+					break;
+				case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
+					$sizes = [1031.81, 1459.84];
+					break;
+				case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
+					$sizes = [728.50, 1031.81];
+					break;
+				case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
+					$sizes = [515.91, 728.50];
+					break;
+				case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
+					$sizes = [362.83, 515.91];
+					break;
+				case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
+					$sizes = [257.95, 362.83];
+					break;
+				case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
+					$sizes = [181.42, 257.95];
+					break;
+				case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
+					$sizes = [127.56, 181.42];
+					break;
+				case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
+					$sizes = [90.71, 127.56];
+					break;
+
+				// US pages
+				case 'EXECUTIVE': // 7.25 in x 10.5 in
+					$sizes = [522.00, 756.00];
+					break;
+				case 'FOLIO': // 8.5 in x 13 in
+					$sizes = [612.00, 936.00];
+					break;
+				case 'FOOLSCAP': // 13.5 in x 17 in
+					$sizes = [972.00, 1224.00];
+					break;
+				case 'LEDGER': // 11 in x 17 in
+					$sizes = [792.00, 1224.00];
+					break;
+				case 'LEGAL': // 8.5 in x 14 in
+					$sizes = [612.00, 1008.00];
+					break;
+				case 'LETTER': // 8.5 in x 11 in
+					$sizes = [612.00, 792.00];
+					break;
+				case 'QUARTO': // 8.46 in x 10.8 in
+					$sizes = [609.12, 777.50];
+					break;
+				case 'STATEMENT': // 5.5 in x 8.5 in
+					$sizes = [396.00, 612.00];
+					break;
+				case 'USGOVT': // 8 in x 11 in
+					$sizes = [576.00, 792.00];
+					break;
+				default:
+					$this->pageFormat = 'A4';
+					$sizes            = [595.28, 841.89];
+					break;
 			}
 			$this->pagew = $sizes[0];
 			$this->pageh = $sizes[1];

app/Report/ReportHtmlCell.php

Switch Indentation +9 added lines, -9 removed lines

@@ -147,15 +147,15 @@
 
 		// Text alignment
 		switch ($this->align) {
-		case 'C':
-			echo ' text-align:center;';
-			break;
-		case 'L':
-			echo ' text-align:left;';
-			break;
-		case 'R':
-			echo ' text-align:right;';
-			break;
+			case 'C':
+				echo ' text-align:center;';
+				break;
+			case 'L':
+				echo ' text-align:left;';
+				break;
+			case 'R':
+				echo ' text-align:right;';
+				break;
 		}
 
 		// Print the collected HTML code

app/Tree.php

Switch Indentation +19 added lines, -19 removed lines

@@ -457,25 +457,25 @@
 		$tree->setPreference('WEBMASTER_USER_ID', Auth::id());
 		$tree->setPreference('LANGUAGE', WT_LOCALE); // Default to the current admin’s language
 		switch (WT_LOCALE) {
-		case 'es':
-			$tree->setPreference('SURNAME_TRADITION', 'spanish');
-			break;
-		case 'is':
-			$tree->setPreference('SURNAME_TRADITION', 'icelandic');
-			break;
-		case 'lt':
-			$tree->setPreference('SURNAME_TRADITION', 'lithuanian');
-			break;
-		case 'pl':
-			$tree->setPreference('SURNAME_TRADITION', 'polish');
-			break;
-		case 'pt':
-		case 'pt-BR':
-			$tree->setPreference('SURNAME_TRADITION', 'portuguese');
-			break;
-		default:
-			$tree->setPreference('SURNAME_TRADITION', 'paternal');
-			break;
+			case 'es':
+				$tree->setPreference('SURNAME_TRADITION', 'spanish');
+				break;
+			case 'is':
+				$tree->setPreference('SURNAME_TRADITION', 'icelandic');
+				break;
+			case 'lt':
+				$tree->setPreference('SURNAME_TRADITION', 'lithuanian');
+				break;
+			case 'pl':
+				$tree->setPreference('SURNAME_TRADITION', 'polish');
+				break;
+			case 'pt':
+			case 'pt-BR':
+				$tree->setPreference('SURNAME_TRADITION', 'portuguese');
+				break;
+			default:
+				$tree->setPreference('SURNAME_TRADITION', 'paternal');
+				break;
 		}
 
 		// Genealogy data

app/Individual.php

Switch Indentation +23 added lines, -23 removed lines

@@ -853,33 +853,33 @@
 	public function getPrimaryChildFamily() {
 		$families = $this->getChildFamilies();
 		switch (count($families)) {
-		case 0:
-			return null;
-		case 1:
-			return $families[0];
-		default:
-			// If there is more than one FAMC record, choose the preferred parents:
-			// a) records with '2 _PRIMARY'
-			foreach ($families as $famid => $fam) {
-				if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 _PRIMARY Y)/", $this->getGedcom())) {
-					return $fam;
+			case 0:
+				return null;
+			case 1:
+				return $families[0];
+			default:
+				// If there is more than one FAMC record, choose the preferred parents:
+				// a) records with '2 _PRIMARY'
+				foreach ($families as $famid => $fam) {
+					if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 _PRIMARY Y)/", $this->getGedcom())) {
+						return $fam;
+					}
 				}
-			}
-			// b) records with '2 PEDI birt'
-			foreach ($families as $famid => $fam) {
-				if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI birth)/", $this->getGedcom())) {
-					return $fam;
+				// b) records with '2 PEDI birt'
+				foreach ($families as $famid => $fam) {
+					if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI birth)/", $this->getGedcom())) {
+						return $fam;
+					}
 				}
-			}
-			// c) records with no '2 PEDI'
-			foreach ($families as $famid => $fam) {
-				if (!preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI)/", $this->getGedcom())) {
-					return $fam;
+				// c) records with no '2 PEDI'
+				foreach ($families as $famid => $fam) {
+					if (!preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI)/", $this->getGedcom())) {
+						return $fam;
+					}
 				}
-			}
 
-			// d) any record
-			return $families[0];
+				// d) any record
+				return $families[0];
 		}
 	}
 

app/Note.php

Switch Indentation +5 added lines, -5 removed lines

@@ -97,11 +97,11 @@
 
 		if ($text) {
 			switch ($this->getTree()->getPreference('FORMAT_TEXT')) {
-			case 'markdown':
-				$text = Filter::markdown($text, $this->getTree());
-				$text = strip_tags($text);
-				$text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
-				break;
+				case 'markdown':
+					$text = Filter::markdown($text, $this->getTree());
+					$text = strip_tags($text);
+					$text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
+					break;
 			}
 
 			list($text) = explode("\n", $text);

app/Filter.php

Switch Indentation +4 added lines, -4 removed lines

@@ -50,10 +50,10 @@
 	 */
 	public static function formatText($text, Tree $WT_TREE) {
 		switch ($WT_TREE->getPreference('FORMAT_TEXT')) {
-		case 'markdown':
-			return '<div class="markdown" dir="auto">' . self::markdown($text, $WT_TREE) . '</div>';
-		default:
-			return '<div class="markdown" style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text, $WT_TREE) . '</div>';
+			case 'markdown':
+				return '<div class="markdown" dir="auto">' . self::markdown($text, $WT_TREE) . '</div>';
+			default:
+				return '<div class="markdown" style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text, $WT_TREE) . '</div>';
 		}
 	}