fisharebest / webtrees

app/Functions/FunctionsPrintLists.php

Switch Indentation +76 added lines, -76 removed lines

@@ -1687,37 +1687,37 @@ 
 
 		}
 		switch ($style) {
-			case 1:
-				return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
-			case 2:
-				return implode(I18N::$list_separator, $html);
-			case 3:
-				$i     = 0;
-				$count = count($html);
-				if ($count > 36) {
-					$col = 4;
-				} elseif ($count > 18) {
-					$col = 3;
-				} elseif ($count > 6) {
-					$col = 2;
-				} else {
-					$col = 1;
-				}
-				$newcol = ceil($count / $col);
-				$html2  = '<table class="list_table"><tr>';
-				$html2 .= '<td class="list_value" style="padding: 14px;">';
-
-				foreach ($html as $surns) {
-					$html2 .= $surns . '<br>';
-					$i++;
-					if ($i == $newcol && $i < $count) {
-						$html2 .= '</td><td class="list_value" style="padding: 14px;">';
-						$newcol = $i + ceil($count / $col);
-					}
+		case 1:
+			return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
+		case 2:
+			return implode(I18N::$list_separator, $html);
+		case 3:
+			$i     = 0;
+			$count = count($html);
+			if ($count > 36) {
+				$col = 4;
+			} elseif ($count > 18) {
+				$col = 3;
+			} elseif ($count > 6) {
+				$col = 2;
+			} else {
+				$col = 1;
+			}
+			$newcol = ceil($count / $col);
+			$html2  = '<table class="list_table"><tr>';
+			$html2 .= '<td class="list_value" style="padding: 14px;">';
+
+			foreach ($html as $surns) {
+				$html2 .= $surns . '<br>';
+				$i++;
+				if ($i == $newcol && $i < $count) {
+					$html2 .= '</td><td class="list_value" style="padding: 14px;">';
+					$newcol = $i + ceil($count / $col);
 				}
-				$html2 .= '</td></tr></table>';
+			}
+			$html2 .= '</td></tr></table>';
 
-				return $html2;
+			return $html2;
 		}
 	}
 
@@ -1747,15 +1747,15 @@ 
 		}
 
 		switch ($sort) {
-			case 'name':
-				uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSortName');
-				break;
-			case 'date_asc':
-				uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
-				$arr = array_reverse($arr);
-				break;
-			case 'date_desc':
-				uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
+		case 'name':
+			uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSortName');
+			break;
+		case 'date_asc':
+			uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
+			$arr = array_reverse($arr);
+			break;
+		case 'date_desc':
+			uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
 		}
 		$html = '';
 		foreach ($arr as $value) {
@@ -1788,15 +1788,15 @@ 
 		$n        = 0;
 		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
 		switch ($sort) {
-			case 'name':        //name
-				$aaSorting = "[5,'asc'], [4,'desc']";
-				break;
-			case 'date_asc':    //date ascending
-				$aaSorting = "[4,'asc'], [5,'asc']";
-				break;
-			case 'date_desc':   //date descending
-				$aaSorting = "[4,'desc'], [5,'asc']";
-				break;
+		case 'name':        //name
+			$aaSorting = "[5,'asc'], [4,'desc']";
+			break;
+		case 'date_asc':    //date ascending
+			$aaSorting = "[4,'asc'], [5,'asc']";
+			break;
+		case 'date_desc':   //date descending
+			$aaSorting = "[4,'desc'], [5,'asc']";
+			break;
 		}
 		$html = '';
 		$controller
@@ -1843,27 +1843,27 @@ 
 			}
 			$html .= '<tr><td>';
 			switch ($record::RECORD_TYPE) {
-				case 'INDI':
-					$icon = $record->getSexImage('small');
-					break;
-				case 'FAM':
-					$icon = '<i class="icon-button_family"></i>';
-					break;
-				case 'OBJE':
-					$icon = '<i class="icon-button_media"></i>';
-					break;
-				case 'NOTE':
-					$icon = '<i class="icon-button_note"></i>';
-					break;
-				case 'SOUR':
-					$icon = '<i class="icon-button_source"></i>';
-					break;
-				case 'REPO':
-					$icon = '<i class="icon-button_repository"></i>';
-					break;
-				default:
-					$icon = '&nbsp;';
-					break;
+			case 'INDI':
+				$icon = $record->getSexImage('small');
+				break;
+			case 'FAM':
+				$icon = '<i class="icon-button_family"></i>';
+				break;
+			case 'OBJE':
+				$icon = '<i class="icon-button_media"></i>';
+				break;
+			case 'NOTE':
+				$icon = '<i class="icon-button_note"></i>';
+				break;
+			case 'SOUR':
+				$icon = '<i class="icon-button_source"></i>';
+				break;
+			case 'REPO':
+				$icon = '<i class="icon-button_repository"></i>';
+				break;
+			default:
+				$icon = '&nbsp;';
+				break;
 			}
 			$html .= '<a href="' . $record->getHtmlUrl() . '">' . $icon . '</a>';
 			$html .= '</td>';
@@ -2092,14 +2092,14 @@ 
 
 		// Now we've filtered the list, we can sort by event, if required
 		switch ($sort_by) {
-			case 'anniv':
-				// Data is already sorted by anniversary date
-				break;
-			case 'alpha':
-				uasort($filtered_events, function (Fact $x, Fact $y) {
-					return GedcomRecord::compare($x->getParent(), $y->getParent());
-				});
-				break;
+		case 'anniv':
+			// Data is already sorted by anniversary date
+			break;
+		case 'alpha':
+			uasort($filtered_events, function (Fact $x, Fact $y) {
+				return GedcomRecord::compare($x->getParent(), $y->getParent());
+			});
+			break;
 		}
 
 		foreach ($filtered_events as $fact) {

app/Functions/FunctionsRtl.php

Switch Indentation +212 added lines, -212 removed lines

@@ -124,227 +124,227 @@ 
 			$closeParIndex = strpos(self::CLOSE_PARENTHESES, $currentLetter); // Which closing parenthesis is this?
 
 			switch ($currentLetter) {
-				case '<':
-					// Assume this '<' starts an HTML element
-					$endPos = strpos($workingText, '>'); // look for the terminating '>'
-					if ($endPos === false) {
-						$endPos = 0;
-					}
-					$currentLen += $endPos;
-					$element = substr($workingText, 0, $currentLen);
-					$temp    = strtolower(substr($element, 0, 3));
-					if (strlen($element) < 7 && $temp == '<br') {
-						if ($numberState) {
-							$numberState = false;
-							if (self::$currentState == 'RTL') {
-								self::$waitingText .= WT_UTF8_PDF;
-							}
+			case '<':
+				// Assume this '<' starts an HTML element
+				$endPos = strpos($workingText, '>'); // look for the terminating '>'
+				if ($endPos === false) {
+					$endPos = 0;
+				}
+				$currentLen += $endPos;
+				$element = substr($workingText, 0, $currentLen);
+				$temp    = strtolower(substr($element, 0, 3));
+				if (strlen($element) < 7 && $temp == '<br') {
+					if ($numberState) {
+						$numberState = false;
+						if (self::$currentState == 'RTL') {
+							self::$waitingText .= WT_UTF8_PDF;
 						}
-						self::breakCurrentSpan($result);
-					} elseif (self::$waitingText == '') {
-						$result .= $element;
-					} else {
-						self::$waitingText .= $element;
 					}
-					$workingText = substr($workingText, $currentLen);
-					break;
-				case '&':
-					// Assume this '&' starts an HTML entity
-					$endPos = strpos($workingText, ';'); // look for the terminating ';'
+					self::breakCurrentSpan($result);
+				} elseif (self::$waitingText == '') {
+					$result .= $element;
+				} else {
+					self::$waitingText .= $element;
+				}
+				$workingText = substr($workingText, $currentLen);
+				break;
+			case '&':
+				// Assume this '&' starts an HTML entity
+				$endPos = strpos($workingText, ';'); // look for the terminating ';'
+				if ($endPos === false) {
+					$endPos = 0;
+				}
+				$currentLen += $endPos;
+				$entity = substr($workingText, 0, $currentLen);
+				if (strtolower($entity) == '&nbsp;') {
+					$entity .= '&nbsp;'; // Ensure consistent case for this entity
+				}
+				if (self::$waitingText == '') {
+					$result .= $entity;
+				} else {
+					self::$waitingText .= $entity;
+				}
+				$workingText = substr($workingText, $currentLen);
+				break;
+			case '{':
+				if (substr($workingText, 1, 1) == '{') {
+					// Assume this '{{' starts a TCPDF directive
+					$endPos = strpos($workingText, '}}'); // look for the terminating '}}'
 					if ($endPos === false) {
 						$endPos = 0;
 					}
-					$currentLen += $endPos;
-					$entity = substr($workingText, 0, $currentLen);
-					if (strtolower($entity) == '&nbsp;') {
-						$entity .= '&nbsp;'; // Ensure consistent case for this entity
-					}
-					if (self::$waitingText == '') {
-						$result .= $entity;
-					} else {
-						self::$waitingText .= $entity;
-					}
-					$workingText = substr($workingText, $currentLen);
+					$currentLen        = $endPos + 2;
+					$directive         = substr($workingText, 0, $currentLen);
+					$workingText       = substr($workingText, $currentLen);
+					$result            = $result . self::$waitingText . $directive;
+					self::$waitingText = '';
 					break;
-				case '{':
-					if (substr($workingText, 1, 1) == '{') {
-						// Assume this '{{' starts a TCPDF directive
-						$endPos = strpos($workingText, '}}'); // look for the terminating '}}'
-						if ($endPos === false) {
-							$endPos = 0;
+				}
+			default:
+				// Look for strings of numbers with optional leading or trailing + or -
+				// and with optional embedded numeric punctuation
+				if ($numberState) {
+					// If we're inside a numeric string, look for reasons to end it
+					$offset    = 0; // Be sure to look at the current character first
+					$charArray = self::getChar($workingText . "\n", $offset);
+					if (strpos(self::NUMBERS, $charArray['letter']) === false) {
+						// This is not a digit.  Is it numeric punctuation?
+						if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
+							$offset += 6; // This could be numeric punctuation
+						} elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
+							$offset += $charArray['length']; // This could be numeric punctuation
 						}
-						$currentLen        = $endPos + 2;
-						$directive         = substr($workingText, 0, $currentLen);
-						$workingText       = substr($workingText, $currentLen);
-						$result            = $result . self::$waitingText . $directive;
-						self::$waitingText = '';
-						break;
-					}
-				default:
-					// Look for strings of numbers with optional leading or trailing + or -
-					// and with optional embedded numeric punctuation
-					if ($numberState) {
-						// If we're inside a numeric string, look for reasons to end it
-						$offset    = 0; // Be sure to look at the current character first
+						// If the next character is a digit, the current character is numeric punctuation
 						$charArray = self::getChar($workingText . "\n", $offset);
 						if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-							// This is not a digit.  Is it numeric punctuation?
-							if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
-								$offset += 6; // This could be numeric punctuation
-							} elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
-								$offset += $charArray['length']; // This could be numeric punctuation
-							}
-							// If the next character is a digit, the current character is numeric punctuation
-							$charArray = self::getChar($workingText . "\n", $offset);
-							if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-								// This is not a digit.  End the run of digits and punctuation.
-								$numberState = false;
-								if (self::$currentState == 'RTL') {
-									if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
-										$currentLetter = WT_UTF8_PDF . $currentLetter;
-									} else {
-										$currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
-									}
+							// This is not a digit.  End the run of digits and punctuation.
+							$numberState = false;
+							if (self::$currentState == 'RTL') {
+								if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
+									$currentLetter = WT_UTF8_PDF . $currentLetter;
+								} else {
+									$currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
 								}
 							}
 						}
-					} else {
-						// If we're outside a numeric string, look for reasons to start it
-						if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
-							// This might be a number lead-in
-							$offset   = $currentLen;
-							$nextChar = substr($workingText . "\n", $offset, 1);
-							if (strpos(self::NUMBERS, $nextChar) !== false) {
-								$numberState = true; // We found a digit: the lead-in is therefore numeric
-								if (self::$currentState == 'RTL') {
-									$currentLetter = WT_UTF8_LRE . $currentLetter;
-								}
-							}
-						} elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
-							$numberState = true; // The current letter is a digit
+					}
+				} else {
+					// If we're outside a numeric string, look for reasons to start it
+					if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
+						// This might be a number lead-in
+						$offset   = $currentLen;
+						$nextChar = substr($workingText . "\n", $offset, 1);
+						if (strpos(self::NUMBERS, $nextChar) !== false) {
+							$numberState = true; // We found a digit: the lead-in is therefore numeric
 							if (self::$currentState == 'RTL') {
 								$currentLetter = WT_UTF8_LRE . $currentLetter;
 							}
 						}
+					} elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
+						$numberState = true; // The current letter is a digit
+						if (self::$currentState == 'RTL') {
+							$currentLetter = WT_UTF8_LRE . $currentLetter;
+						}
 					}
+				}
+
+				// Determine the directionality of the current UTF-8 character
+				$newState = self::$currentState;
+				while (true) {
+					if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
+						if (self::$currentState == '') {
+							$newState = 'RTL';
+							break;
+						}
 
-					// Determine the directionality of the current UTF-8 character
-					$newState = self::$currentState;
-					while (true) {
-						if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
-							if (self::$currentState == '') {
+						if (self::$currentState == 'RTL') {
+							break;
+						}
+						// Switch to RTL only if this isn't a solitary RTL letter
+						$tempText = substr($workingText, $currentLen);
+						while ($tempText != '') {
+							$nextCharArray = self::getChar($tempText, 0);
+							$nextLetter    = $nextCharArray['letter'];
+							$nextLen       = $nextCharArray['length'];
+							$tempText      = substr($tempText, $nextLen);
+
+							if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
 								$newState = 'RTL';
-								break;
+								break 2;
 							}
 
-							if (self::$currentState == 'RTL') {
-								break;
+							if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
+								$newState = 'RTL';
+								break 2;
 							}
-							// Switch to RTL only if this isn't a solitary RTL letter
-							$tempText = substr($workingText, $currentLen);
-							while ($tempText != '') {
-								$nextCharArray = self::getChar($tempText, 0);
-								$nextLetter    = $nextCharArray['letter'];
-								$nextLen       = $nextCharArray['length'];
-								$tempText      = substr($tempText, $nextLen);
-
-								if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
-									$newState = 'RTL';
-									break 2;
-								}
-
-								if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
-									$newState = 'RTL';
-									break 2;
-								}
 
-								if ($nextLetter === ' ') {
-									break;
-								}
-								$nextLetter .= substr($tempText . "\n", 0, 5);
-								if ($nextLetter === '&nbsp;') {
-									break;
-								}
-							}
-							// This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
-							$currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
-							$newState      = 'LTR';
-							break;
-						}
-						if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
-							// Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
-							$newState = 'LTR';
-							break;
-						}
-						if ($closeParIndex !== false) {
-							// This closing parenthesis has to inherit the matching opening parenthesis' directionality
-							if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
-								$newState = $openParDirection[$closeParIndex];
+							if ($nextLetter === ' ') {
+								break;
 							}
-							$openParDirection[$closeParIndex] = '';
-							break;
-						}
-						if ($openParIndex !== false) {
-							// Opening parentheses always inherit the following directionality
-							self::$waitingText .= $currentLetter;
-							$workingText = substr($workingText, $currentLen);
-							while (true) {
-								if ($workingText === '') {
-									break;
-								}
-								if (substr($workingText, 0, 1) === ' ') {
-									// Spaces following this left parenthesis inherit the following directionality too
-									self::$waitingText .= ' ';
-									$workingText = substr($workingText, 1);
-									continue;
-								}
-								if (substr($workingText, 0, 6) === '&nbsp;') {
-									// Spaces following this left parenthesis inherit the following directionality too
-									self::$waitingText .= '&nbsp;';
-									$workingText = substr($workingText, 6);
-									continue;
-								}
+							$nextLetter .= substr($tempText . "\n", 0, 5);
+							if ($nextLetter === '&nbsp;') {
 								break;
 							}
-							$openParDirection[$openParIndex] = '?';
-							break 2; // double break because we're waiting for more information
 						}
-
-						// We have a digit or a "normal" special character.
-						//
-						// When this character is not at the start of the input string, it inherits the preceding directionality;
-						// at the start of the input string, it assumes the following directionality.
-						//
-						// Exceptions to this rule will be handled later during final clean-up.
-						//
+						// This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
+						$currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
+						$newState      = 'LTR';
+						break;
+					}
+					if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
+						// Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
+						$newState = 'LTR';
+						break;
+					}
+					if ($closeParIndex !== false) {
+						// This closing parenthesis has to inherit the matching opening parenthesis' directionality
+						if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
+							$newState = $openParDirection[$closeParIndex];
+						}
+						$openParDirection[$closeParIndex] = '';
+						break;
+					}
+					if ($openParIndex !== false) {
+						// Opening parentheses always inherit the following directionality
 						self::$waitingText .= $currentLetter;
 						$workingText = substr($workingText, $currentLen);
-						if (self::$currentState != '') {
-							$result .= self::$waitingText;
-							self::$waitingText = '';
+						while (true) {
+							if ($workingText === '') {
+								break;
+							}
+							if (substr($workingText, 0, 1) === ' ') {
+								// Spaces following this left parenthesis inherit the following directionality too
+								self::$waitingText .= ' ';
+								$workingText = substr($workingText, 1);
+								continue;
+							}
+							if (substr($workingText, 0, 6) === '&nbsp;') {
+								// Spaces following this left parenthesis inherit the following directionality too
+								self::$waitingText .= '&nbsp;';
+								$workingText = substr($workingText, 6);
+								continue;
+							}
+							break;
 						}
+						$openParDirection[$openParIndex] = '?';
 						break 2; // double break because we're waiting for more information
 					}
-					if ($newState != self::$currentState) {
-						// A direction change has occurred
-						self::finishCurrentSpan($result, false);
-						self::$previousState = self::$currentState;
-						self::$currentState  = $newState;
-						self::beginCurrentSpan($result);
-					}
+
+					// We have a digit or a "normal" special character.
+					//
+					// When this character is not at the start of the input string, it inherits the preceding directionality;
+					// at the start of the input string, it assumes the following directionality.
+					//
+					// Exceptions to this rule will be handled later during final clean-up.
+					//
 					self::$waitingText .= $currentLetter;
 					$workingText = substr($workingText, $currentLen);
-					$result .= self::$waitingText;
-					self::$waitingText = '';
+					if (self::$currentState != '') {
+						$result .= self::$waitingText;
+						self::$waitingText = '';
+					}
+					break 2; // double break because we're waiting for more information
+				}
+				if ($newState != self::$currentState) {
+					// A direction change has occurred
+					self::finishCurrentSpan($result, false);
+					self::$previousState = self::$currentState;
+					self::$currentState  = $newState;
+					self::beginCurrentSpan($result);
+				}
+				self::$waitingText .= $currentLetter;
+				$workingText = substr($workingText, $currentLen);
+				$result .= self::$waitingText;
+				self::$waitingText = '';
 
-					foreach ($openParDirection as $index => $value) {
-						// Since we now know the proper direction, remember it for all waiting opening parentheses
-						if ($value === '?') {
-							$openParDirection[$index] = self::$currentState;
-						}
+				foreach ($openParDirection as $index => $value) {
+					// Since we now know the proper direction, remember it for all waiting opening parentheses
+					if ($value === '?') {
+						$openParDirection[$index] = self::$currentState;
 					}
+				}
 
-					break;
+				break;
 			}
 		}
 
@@ -461,34 +461,34 @@ 
 
 		// Finally, correct '<LTR>', '</LTR>', '<RTL>', and '</RTL>'
 		switch ($direction) {
-			case 'BOTH':
-			case 'both':
-				// LTR text: <span dir="ltr"> text </span>
-				// RTL text: <span dir="rtl"> text </span>
-				$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
-				$eLTR = $nothing . '</span>';
-				$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
-				$eRTL = $nothing . '</span>';
-				break;
-			case 'LTR':
-			case 'ltr':
-				// LTR text: <span dir="ltr"> text </span>
-				// RTL text: text
-				$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
-				$eLTR = $nothing . '</span>';
-				$sRTL = '';
-				$eRTL = '';
-				break;
-			case 'RTL':
-			case 'rtl':
-			default:
-				// LTR text: text
-				// RTL text: <span dir="rtl"> text </span>
-				$sLTR = '';
-				$eLTR = '';
-				$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
-				$eRTL = $nothing . '</span>';
-				break;
+		case 'BOTH':
+		case 'both':
+			// LTR text: <span dir="ltr"> text </span>
+			// RTL text: <span dir="rtl"> text </span>
+			$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
+			$eLTR = $nothing . '</span>';
+			$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
+			$eRTL = $nothing . '</span>';
+			break;
+		case 'LTR':
+		case 'ltr':
+			// LTR text: <span dir="ltr"> text </span>
+			// RTL text: text
+			$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
+			$eLTR = $nothing . '</span>';
+			$sRTL = '';
+			$eRTL = '';
+			break;
+		case 'RTL':
+		case 'rtl':
+		default:
+			// LTR text: text
+			// RTL text: <span dir="rtl"> text </span>
+			$sLTR = '';
+			$eLTR = '';
+			$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
+			$eRTL = $nothing . '</span>';
+			break;
 		}
 		$result = str_replace(array(self::$startLTR, self::$endLTR, self::$startRTL, self::$endRTL), array($sLTR, $eLTR, $sRTL, $eRTL), $result);
 

app/I18N.php

Switch Indentation +18 added lines, -18 removed lines

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

app/Report/ReportParserGenerate.php

Switch Indentation +310 added lines, -310 removed lines

@@ -934,14 +934,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.
@@ -1325,22 +1325,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) {
@@ -1850,180 +1850,180 @@ 
 		}
 		// 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(array(
-					'tree_id' => $WT_TREE->getTreeId(),
-				))->fetchAll();
-				$this->list = array();
-				foreach ($rows as $row) {
-					$this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
-				}
-				break;
-			case 'individual':
-				$sql_select   = "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
-				$sql_join     = "";
-				$sql_where    = " WHERE i_file = :tree_id";
-				$sql_order_by = "";
-				$sql_params   = array('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();
+		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(array(
+				'tree_id' => $WT_TREE->getTreeId(),
+			))->fetchAll();
+			$this->list = array();
+			foreach ($rows as $row) {
+				$this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			}
+			break;
+		case 'individual':
+			$sql_select   = "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
+			$sql_join     = "";
+			$sql_where    = " WHERE i_file = :tree_id";
+			$sql_order_by = "";
+			$sql_params   = array('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;
+								}
 							}
-							if ($sortby == $match[1]) {
+							// 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}.d_julianday1";
+								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
 							}
-							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 = array();
-				$rows       = Database::prepare(
-					$sql_select . $sql_join . $sql_where . $sql_order_by
-				)->execute($sql_params)->fetchAll();
-
-				foreach ($rows as $row) {
-					$this->list[] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-				}
-				break;
-
-			case 'family':
-				$sql_select   = "SELECT DISTINCT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
-				$sql_join     = "";
-				$sql_where    = " WHERE f_file = :tree_id";
-				$sql_order_by = "";
-				$sql_params   = array('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();
+			$this->list = array();
+			$rows       = Database::prepare(
+				$sql_select . $sql_join . $sql_where . $sql_order_by
+			)->execute($sql_params)->fetchAll();
+
+			foreach ($rows as $row) {
+				$this->list[] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			}
+			break;
+
+		case 'family':
+			$sql_select   = "SELECT DISTINCT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
+			$sql_join     = "";
+			$sql_where    = " WHERE f_file = :tree_id";
+			$sql_order_by = "";
+			$sql_params   = array('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;
+								}
 							}
-							if ($sortby == $match[1]) {
+							// 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}.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";
-								}
+								$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 = array();
-				$rows       = Database::prepare(
-					$sql_select . $sql_join . $sql_where . $sql_order_by
-				)->execute($sql_params)->fetchAll();
+			$this->list = array();
+			$rows       = Database::prepare(
+				$sql_select . $sql_join . $sql_where . $sql_order_by
+			)->execute($sql_params)->fetchAll();
 
-				foreach ($rows as $row) {
-					$this->list[] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-				}
-				break;
+			foreach ($rows as $row) {
+				$this->list[] = 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  = array();
@@ -2084,17 +2084,17 @@ 
 								$searchstr = "1 " . $tag;
 							}
 							switch ($expr) {
-								case "CONTAINS":
-									if ($t == "PLAC") {
-										$searchstr .= "[^\n]*[, ]*" . $val;
-									} else {
-										$searchstr .= "[^\n]*" . $val;
-									}
-									$filters[] = $searchstr;
-									break;
-								default:
-									$filters2[] = array("tag" => $tag, "expr" => $expr, "val" => $val);
-									break;
+							case "CONTAINS":
+								if ($t == "PLAC") {
+									$searchstr .= "[^\n]*[, ]*" . $val;
+								} else {
+									$searchstr .= "[^\n]*" . $val;
+								}
+								$filters[] = $searchstr;
+								break;
+							default:
+								$filters2[] = array("tag" => $tag, "expr" => $expr, "val" => $val);
+								break;
 							}
 						}
 					}
@@ -2138,31 +2138,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;
 						}
 					}
 				}
@@ -2174,26 +2174,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, array($this->repeats, $this->repeat_bytes));
@@ -2344,88 +2344,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;
 					}
-					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;
+					if (!empty($wife)) {
+						$this->list[$wife->getXref()] = $wife;
+					}
+					$children = $family->getChildren();
+					foreach ($children as $child) {
+						if (!empty($child)) {
+							$this->list[$child->getXref()] = $child;
 						}
-						$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 = array();
-				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 = array();
+			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++;
 				}
-				$this->list = $newarray;
-				break;
-			default:
-				// unsorted
-				break;
+				$genCounter++;
+			}
+			$this->list = $newarray;
+			break;
+		default:
+			// unsorted
+			break;
 		}
 		array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
 		$this->repeat_bytes = xml_get_current_line_number($this->parser) + 1;

admin_site_change.php

Switch Indentation +8 added lines, -8 removed lines

@@ -207,14 +207,14 @@
 
 		foreach ($differences as $difference) {
 			switch ($difference[1]) {
-				case MyersDiff::DELETE:
-					$diff_lines[] = '<del>' . $difference[0] . '</del>';
-					break;
-				case MyersDiff::INSERT:
-					$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
-					break;
-				default:
-					$diff_lines[] = $difference[0];
+			case MyersDiff::DELETE:
+				$diff_lines[] = '<del>' . $difference[0] . '</del>';
+				break;
+			case MyersDiff::INSERT:
+				$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
+				break;
+			default:
+				$diff_lines[] = $difference[0];
 			}
 		}