fisharebest / webtrees

app/Controller/LifespanController.php

Switch Indentation +17 added lines, -17 removed lines

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

app/Controller/PedigreeController.php

Switch Indentation +74 added lines, -74 removed lines

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

app/Functions/FunctionsDate.php

Switch Indentation +60 added lines, -60 removed lines

@@ -32,32 +32,32 @@ 
 	 */
 	public static function getAgeAtEvent($age_string, $show_years) {
 		switch (strtoupper($age_string)) {
-			case 'CHILD':
-				return I18N::translate('Child');
-			case 'INFANT':
-				return I18N::translate('Infant');
-			case 'STILLBORN':
-				return I18N::translate('Stillborn');
-			default:
-				return preg_replace_callback(
-					array(
-						'/(\d+)([ymwd])/',
-					),
-					function ($match) use ($age_string, $show_years) {
-						switch ($match[2]) {
-							case 'y':
-								if ($show_years || preg_match('/[dm]/', $age_string)) {
-									return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
-								} else {
-									return I18N::digits($match[1]);
-								}
-							case 'm':
-								return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
-							case 'w':
-								return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
-							case 'd':
-								return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
-						}
+		case 'CHILD':
+			return I18N::translate('Child');
+		case 'INFANT':
+			return I18N::translate('Infant');
+		case 'STILLBORN':
+			return I18N::translate('Stillborn');
+		default:
+			return preg_replace_callback(
+				array(
+					'/(\d+)([ymwd])/',
+				),
+				function ($match) use ($age_string, $show_years) {
+					switch ($match[2]) {
+					case 'y':
+					if ($show_years || preg_match('/[dm]/', $age_string)) {
+					return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
+					} else {
+					return I18N::digits($match[1]);
+					}
+					case 'm':
+					return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
+					case 'w':
+					return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
+					case 'd':
+					return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
+					}
 					},
 					$age_string
 				);
@@ -79,40 +79,40 @@ 
 		preg_match_all('/%[^%]/', $time_fmt, $matches);
 		foreach ($matches[0] as $match) {
 			switch ($match) {
-				case '%a':
-					$t = gmdate('His', $time);
-					if ($t == '000000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
-							I18N::translate('midnight'), $time_fmt);
-					} elseif ($t < '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
-							I18N::translate('a.m.'), $time_fmt);
-					} elseif ($t == '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
-							I18N::translate('noon'), $time_fmt);
-					} else {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
-							I18N::translate('p.m.'), $time_fmt);
-					}
-					break;
-				case '%A':
-					$t = gmdate('His', $time);
-					if ($t == '000000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
-							I18N::translate('Midnight'), $time_fmt);
-					} elseif ($t < '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
-							I18N::translate('A.M.'), $time_fmt);
-					} elseif ($t == '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
-							I18N::translate('Noon'), $time_fmt);
-					} else {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
-							I18N::translate('P.M.'), $time_fmt);
-					}
-					break;
-				default:
-					$time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
+			case '%a':
+				$t = gmdate('His', $time);
+				if ($t == '000000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
+						I18N::translate('midnight'), $time_fmt);
+				} elseif ($t < '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
+						I18N::translate('a.m.'), $time_fmt);
+				} elseif ($t == '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
+						I18N::translate('noon'), $time_fmt);
+				} else {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
+						I18N::translate('p.m.'), $time_fmt);
+				}
+				break;
+			case '%A':
+				$t = gmdate('His', $time);
+				if ($t == '000000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
+						I18N::translate('Midnight'), $time_fmt);
+				} elseif ($t < '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
+						I18N::translate('A.M.'), $time_fmt);
+				} elseif ($t == '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
+						I18N::translate('Noon'), $time_fmt);
+				} else {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
+						I18N::translate('P.M.'), $time_fmt);
+				}
+				break;
+			default:
+				$time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
 			}
 		}
 

app/Functions/FunctionsDb.php

Switch Indentation +100 added lines, -100 removed lines

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

app/Functions/FunctionsExport.php

Switch Indentation +21 added lines, -21 removed lines

@@ -183,18 +183,18 @@ 
 	 */
 	public static function exportGedcom(Tree $tree, $gedout, $exportOptions) {
 		switch ($exportOptions['privatize']) {
-			case 'gedadmin':
-				$access_level = Auth::PRIV_NONE;
-				break;
-			case 'user':
-				$access_level = Auth::PRIV_USER;
-				break;
-			case 'visitor':
-				$access_level = Auth::PRIV_PRIVATE;
-				break;
-			case 'none':
-				$access_level = Auth::PRIV_HIDE;
-				break;
+		case 'gedadmin':
+			$access_level = Auth::PRIV_NONE;
+			break;
+		case 'user':
+			$access_level = Auth::PRIV_USER;
+			break;
+		case 'visitor':
+			$access_level = Auth::PRIV_PRIVATE;
+			break;
+		case 'none':
+			$access_level = Auth::PRIV_HIDE;
+			break;
 		}
 
 		$head = self::gedcomHeader($tree);
@@ -251,15 +251,15 @@ 
 
 		foreach ($rows as $row) {
 			switch ($row->type) {
-				case 'NOTE':
-					$record = Note::getInstance($row->xref, $tree, $row->gedcom);
-					break;
-				case 'REPO':
-					$record = Repository::getInstance($row->xref, $tree, $row->gedcom);
-					break;
-				default:
-					$record = GedcomRecord::getInstance($row->xref, $tree, $row->gedcom);
-					break;
+			case 'NOTE':
+				$record = Note::getInstance($row->xref, $tree, $row->gedcom);
+				break;
+			case 'REPO':
+				$record = Repository::getInstance($row->xref, $tree, $row->gedcom);
+				break;
+			default:
+				$record = GedcomRecord::getInstance($row->xref, $tree, $row->gedcom);
+				break;
 			}
 
 			$rec = $record->privatizeGedcom($access_level);

app/Functions/FunctionsImport.php

Switch Indentation +644 added lines, -644 removed lines

@@ -59,477 +59,477 @@ 
 			$tag                               = strtoupper($tag); // Tags should always be upper case
 			switch ($tag) {
 				// Convert PhpGedView tags to WT
-				case '_PGVU':
-					$tag = '_WT_USER';
-					break;
-				case '_PGV_OBJS':
-					$tag = '_WT_OBJE_SORT';
-					break;
-				// Convert FTM-style "TAG_FORMAL_NAME" into "TAG".
-				case 'ABBREVIATION':
-					$tag = 'ABBR';
-					break;
-				case 'ADDRESS':
-					$tag = 'ADDR';
-					break;
-				case 'ADDRESS1':
-					$tag = 'ADR1';
-					break;
-				case 'ADDRESS2':
-					$tag = 'ADR2';
-					break;
-				case 'ADDRESS3':
-					$tag = 'ADR3';
-					break;
-				case 'ADOPTION':
-					$tag = 'ADOP';
-					break;
-				case 'ADULT_CHRISTENING':
-					$tag = 'CHRA';
-					break;
-				case 'AFN':
-					// AFN values are upper case
-					$data = strtoupper($data);
-					break;
-				case 'AGENCY':
-					$tag = 'AGNC';
-					break;
-				case 'ALIAS':
-					$tag = 'ALIA';
-					break;
-				case 'ANCESTORS':
-					$tag = 'ANCE';
-					break;
-				case 'ANCES_INTEREST':
-					$tag = 'ANCI';
-					break;
-				case 'ANNULMENT':
-					$tag = 'ANUL';
-					break;
-				case 'ASSOCIATES':
-					$tag = 'ASSO';
-					break;
-				case 'AUTHOR':
-					$tag = 'AUTH';
-					break;
-				case 'BAPTISM':
-					$tag = 'BAPM';
-					break;
-				case 'BAPTISM_LDS':
-					$tag = 'BAPL';
-					break;
-				case 'BAR_MITZVAH':
-					$tag = 'BARM';
-					break;
-				case 'BAS_MITZVAH':
-					$tag = 'BASM';
-					break;
-				case 'BIRTH':
-					$tag = 'BIRT';
-					break;
-				case 'BLESSING':
-					$tag = 'BLES';
-					break;
-				case 'BURIAL':
-					$tag = 'BURI';
-					break;
-				case 'CALL_NUMBER':
-					$tag = 'CALN';
-					break;
-				case 'CASTE':
-					$tag = 'CAST';
-					break;
-				case 'CAUSE':
-					$tag = 'CAUS';
-					break;
-				case 'CENSUS':
-					$tag = 'CENS';
-					break;
-				case 'CHANGE':
-					$tag = 'CHAN';
-					break;
-				case 'CHARACTER':
-					$tag = 'CHAR';
-					break;
-				case 'CHILD':
-					$tag = 'CHIL';
-					break;
-				case 'CHILDREN_COUNT':
-					$tag = 'NCHI';
-					break;
-				case 'CHRISTENING':
-					$tag = 'CHR';
-					break;
-				case 'CONCATENATION':
-					$tag = 'CONC';
-					break;
-				case 'CONFIRMATION':
-					$tag = 'CONF';
-					break;
-				case 'CONFIRMATION_LDS':
-					$tag = 'CONL';
-					break;
-				case 'CONTINUED':
-					$tag = 'CONT';
-					break;
-				case 'COPYRIGHT':
-					$tag = 'COPR';
-					break;
-				case 'CORPORATE':
-					$tag = 'CORP';
-					break;
-				case 'COUNTRY':
-					$tag = 'CTRY';
-					break;
-				case 'CREMATION':
-					$tag = 'CREM';
-					break;
-				case 'DATE':
-					// Preserve text from INT dates
-					if (strpos($data, '(') !== false) {
-						list($date, $text) = explode('(', $data, 2);
-						$text              = ' (' . $text;
-					} else {
-						$date = $data;
-						$text = '';
-					}
-					// Capitals
-					$date = strtoupper($date);
-					// Temporarily add leading/trailing spaces, to allow efficient matching below
-					$date = " {$date} ";
-					// Ensure space digits and letters
-					$date = preg_replace('/([A-Z])(\d)/', '$1 $2', $date);
-					$date = preg_replace('/(\d)([A-Z])/', '$1 $2', $date);
-					// Ensure space before/after calendar escapes
-					$date = preg_replace('/@#[^@]+@/', ' $0 ', $date);
-					// "BET." => "BET"
-					$date = preg_replace('/(\w\w)\./', '$1', $date);
-					// "CIR" => "ABT"
-					$date = str_replace(' CIR ', ' ABT ', $date);
-					$date = str_replace(' APX ', ' ABT ', $date);
-					// B.C. => BC (temporarily, to allow easier handling of ".")
-					$date = str_replace(' B.C. ', ' BC ', $date);
-					// "BET X - Y " => "BET X AND Y"
-					$date = preg_replace('/^(.* BET .+) - (.+)/', '$1 AND $2', $date);
-					$date = preg_replace('/^(.* FROM .+) - (.+)/', '$1 TO $2', $date);
-					// "@#ESC@ FROM X TO Y" => "FROM @#ESC@ X TO @#ESC@ Y"
-					$date = preg_replace('/^ +(@#[^@]+@) +FROM +(.+) +TO +(.+)/', ' FROM $1 $2 TO $1 $3', $date);
-					$date = preg_replace('/^ +(@#[^@]+@) +BET +(.+) +AND +(.+)/', ' BET $1 $2 AND $1 $3', $date);
-					// "@#ESC@ AFT X" => "AFT @#ESC@ X"
-					$date = preg_replace('/^ +(@#[^@]+@) +(FROM|BET|TO|AND|BEF|AFT|CAL|EST|INT|ABT) +(.+)/', ' $2 $1 $3', $date);
-					// Ignore any remaining punctuation, e.g. "14-MAY, 1900" => "14 MAY 1900"
-					// (don't change "/" - it is used in NS/OS dates)
-					$date = preg_replace('/[.,:;-]/', ' ', $date);
-					// BC => B.C.
-					$date = str_replace(' BC ', ' B.C. ', $date);
-					// Append the "INT" text
-					$data = $date . $text;
-					break;
-				case 'DEATH':
-					$tag = 'DEAT';
-					break;
-				case '_DEATH_OF_SPOUSE':
-					$tag = '_DETS';
-					break;
-				case '_DEGREE':
-					$tag = '_DEG';
-					break;
-				case 'DESCENDANTS':
-					$tag = 'DESC';
-					break;
-				case 'DESCENDANT_INT':
-					$tag = 'DESI';
-					break;
-				case 'DESTINATION':
-					$tag = 'DEST';
-					break;
-				case 'DIVORCE':
-					$tag = 'DIV';
-					break;
-				case 'DIVORCE_FILED':
-					$tag = 'DIVF';
-					break;
-				case 'EDUCATION':
-					$tag = 'EDUC';
-					break;
-				case 'EMIGRATION':
-					$tag = 'EMIG';
-					break;
-				case 'ENDOWMENT':
-					$tag = 'ENDL';
-					break;
-				case 'ENGAGEMENT':
-					$tag = 'ENGA';
-					break;
-				case 'EVENT':
-					$tag = 'EVEN';
-					break;
-				case 'FACSIMILE':
-					$tag = 'FAX';
-					break;
-				case 'FAMILY':
-					$tag = 'FAM';
-					break;
-				case 'FAMILY_CHILD':
-					$tag = 'FAMC';
-					break;
-				case 'FAMILY_FILE':
-					$tag = 'FAMF';
-					break;
-				case 'FAMILY_SPOUSE':
-					$tag = 'FAMS';
-					break;
-				case 'FIRST_COMMUNION':
-					$tag = 'FCOM';
-					break;
-				case '_FILE':
-					$tag = 'FILE';
-					break;
-				case 'FORMAT':
-					$tag = 'FORM';
-				case 'FORM':
-					// Consistent commas
-					$data = preg_replace('/ *, */', ', ', $data);
-					break;
-				case 'GEDCOM':
-					$tag = 'GEDC';
-					break;
-				case 'GIVEN_NAME':
-					$tag = 'GIVN';
-					break;
-				case 'GRADUATION':
-					$tag = 'GRAD';
-					break;
-				case 'HEADER':
-					$tag = 'HEAD';
-				case 'HEAD':
-					// HEAD records don't have an XREF or DATA
-					if ($level == '0') {
-						$xref = '';
-						$data = '';
-					}
-					break;
-				case 'HUSBAND':
-					$tag = 'HUSB';
-					break;
-				case 'IDENT_NUMBER':
-					$tag = 'IDNO';
-					break;
-				case 'IMMIGRATION':
-					$tag = 'IMMI';
-					break;
-				case 'INDIVIDUAL':
-					$tag = 'INDI';
-					break;
-				case 'LANGUAGE':
-					$tag = 'LANG';
-					break;
-				case 'LATITUDE':
-					$tag = 'LATI';
-					break;
-				case 'LONGITUDE':
-					$tag = 'LONG';
-					break;
-				case 'MARRIAGE':
-					$tag = 'MARR';
-					break;
-				case 'MARRIAGE_BANN':
-					$tag = 'MARB';
-					break;
-				case 'MARRIAGE_COUNT':
-					$tag = 'NMR';
-					break;
-				case 'MARRIAGE_CONTRACT':
-					$tag = 'MARC';
-					break;
-				case 'MARRIAGE_LICENSE':
-					$tag = 'MARL';
-					break;
-				case 'MARRIAGE_SETTLEMENT':
-					$tag = 'MARS';
-					break;
-				case 'MEDIA':
-					$tag = 'MEDI';
-					break;
-				case '_MEDICAL':
-					$tag = '_MDCL';
-					break;
-				case '_MILITARY_SERVICE':
-					$tag = '_MILT';
-					break;
-				case 'NAME':
-					// Tidy up whitespace
-					$data = preg_replace('/  +/', ' ', trim($data));
-					break;
-				case 'NAME_PREFIX':
-					$tag = 'NPFX';
-					break;
-				case 'NAME_SUFFIX':
-					$tag = 'NSFX';
-					break;
-				case 'NATIONALITY':
-					$tag = 'NATI';
-					break;
-				case 'NATURALIZATION':
-					$tag = 'NATU';
-					break;
-				case 'NICKNAME':
-					$tag = 'NICK';
-					break;
-				case 'OBJECT':
-					$tag = 'OBJE';
-					break;
-				case 'OCCUPATION':
-					$tag = 'OCCU';
-					break;
-				case 'ORDINANCE':
-					$tag = 'ORDI';
-					break;
-				case 'ORDINATION':
-					$tag = 'ORDN';
-					break;
-				case 'PEDIGREE':
-					$tag = 'PEDI';
-				case 'PEDI':
-					// PEDI values are lower case
-					$data = strtolower($data);
-					break;
-				case 'PHONE':
-					$tag = 'PHON';
-					break;
-				case 'PHONETIC':
-					$tag = 'FONE';
-					break;
-				case 'PHY_DESCRIPTION':
-					$tag = 'DSCR';
-					break;
-				case 'PLACE':
-					$tag = 'PLAC';
-				case 'PLAC':
-					// Consistent commas
-					$data = preg_replace('/ *(،|,) */', ', ', $data);
-					// The Master Genealogist stores LAT/LONG data in the PLAC field, e.g. Pennsylvania, USA, 395945N0751013W
-					if (preg_match('/(.*), (\d\d)(\d\d)(\d\d)([NS])(\d\d\d)(\d\d)(\d\d)([EW])$/', $data, $match)) {
-						$data =
-							$match[1] . "\n" .
-							($level + 1) . " MAP\n" .
-							($level + 2) . " LATI " . ($match[5] . (round($match[2] + ($match[3] / 60) + ($match[4] / 3600), 4))) . "\n" .
-							($level + 2) . " LONG " . ($match[9] . (round($match[6] + ($match[7] / 60) + ($match[8] / 3600), 4)));
-					}
-					break;
-				case 'POSTAL_CODE':
-					$tag = 'POST';
-					break;
-				case 'PROBATE':
-					$tag = 'PROB';
-					break;
-				case 'PROPERTY':
-					$tag = 'PROP';
-					break;
-				case 'PUBLICATION':
-					$tag = 'PUBL';
-					break;
-				case 'QUALITY_OF_DATA':
-					$tag = 'QUAL';
-					break;
-				case 'REC_FILE_NUMBER':
-					$tag = 'RFN';
-					break;
-				case 'REC_ID_NUMBER':
-					$tag = 'RIN';
-					break;
-				case 'REFERENCE':
-					$tag = 'REFN';
-					break;
-				case 'RELATIONSHIP':
-					$tag = 'RELA';
-					break;
-				case 'RELIGION':
-					$tag = 'RELI';
-					break;
-				case 'REPOSITORY':
-					$tag = 'REPO';
-					break;
-				case 'RESIDENCE':
-					$tag = 'RESI';
-					break;
-				case 'RESTRICTION':
-					$tag = 'RESN';
-				case 'RESN':
-					// RESN values are lower case (confidential, privacy, locked, none)
-					$data = strtolower($data);
-					if ($data == 'invisible') {
-						$data = 'confidential'; // From old versions of Legacy.
-					}
-					break;
-				case 'RETIREMENT':
-					$tag = 'RETI';
-					break;
-				case 'ROMANIZED':
-					$tag = 'ROMN';
-					break;
-				case 'SEALING_CHILD':
-					$tag = 'SLGC';
-					break;
-				case 'SEALING_SPOUSE':
-					$tag = 'SLGS';
-					break;
-				case 'SOC_SEC_NUMBER':
-					$tag = 'SSN';
-					break;
-				case 'SEX':
-					$data = strtoupper($data);
-					break;
-				case 'SOURCE':
-					$tag = 'SOUR';
-					break;
-				case 'STATE':
-					$tag = 'STAE';
-					break;
-				case 'STATUS':
-					$tag = 'STAT';
-				case 'STAT':
-					if ($data == 'CANCELLED') {
-						// PhpGedView mis-spells this tag - correct it.
-						$data = 'CANCELED';
-					}
-					break;
-				case 'SUBMISSION':
-					$tag = 'SUBN';
-					break;
-				case 'SUBMITTER':
-					$tag = 'SUBM';
-					break;
-				case 'SURNAME':
-					$tag = 'SURN';
-					break;
-				case 'SURN_PREFIX':
-					$tag = 'SPFX';
-					break;
-				case 'TEMPLE':
-					$tag = 'TEMP';
-				case 'TEMP':
-					// Temple codes are upper case
-					$data = strtoupper($data);
-					break;
-				case 'TITLE':
-					$tag = 'TITL';
-					break;
-				case 'TRAILER':
-					$tag = 'TRLR';
-				case 'TRLR':
-					// TRLR records don't have an XREF or DATA
-					if ($level == '0') {
-						$xref = '';
-						$data = '';
-					}
-					break;
-				case 'VERSION':
-					$tag = 'VERS';
-					break;
-				case 'WEB':
-					$tag = 'WWW';
-					break;
+			case '_PGVU':
+				$tag = '_WT_USER';
+				break;
+			case '_PGV_OBJS':
+				$tag = '_WT_OBJE_SORT';
+				break;
+			// Convert FTM-style "TAG_FORMAL_NAME" into "TAG".
+			case 'ABBREVIATION':
+				$tag = 'ABBR';
+				break;
+			case 'ADDRESS':
+				$tag = 'ADDR';
+				break;
+			case 'ADDRESS1':
+				$tag = 'ADR1';
+				break;
+			case 'ADDRESS2':
+				$tag = 'ADR2';
+				break;
+			case 'ADDRESS3':
+				$tag = 'ADR3';
+				break;
+			case 'ADOPTION':
+				$tag = 'ADOP';
+				break;
+			case 'ADULT_CHRISTENING':
+				$tag = 'CHRA';
+				break;
+			case 'AFN':
+				// AFN values are upper case
+				$data = strtoupper($data);
+				break;
+			case 'AGENCY':
+				$tag = 'AGNC';
+				break;
+			case 'ALIAS':
+				$tag = 'ALIA';
+				break;
+			case 'ANCESTORS':
+				$tag = 'ANCE';
+				break;
+			case 'ANCES_INTEREST':
+				$tag = 'ANCI';
+				break;
+			case 'ANNULMENT':
+				$tag = 'ANUL';
+				break;
+			case 'ASSOCIATES':
+				$tag = 'ASSO';
+				break;
+			case 'AUTHOR':
+				$tag = 'AUTH';
+				break;
+			case 'BAPTISM':
+				$tag = 'BAPM';
+				break;
+			case 'BAPTISM_LDS':
+				$tag = 'BAPL';
+				break;
+			case 'BAR_MITZVAH':
+				$tag = 'BARM';
+				break;
+			case 'BAS_MITZVAH':
+				$tag = 'BASM';
+				break;
+			case 'BIRTH':
+				$tag = 'BIRT';
+				break;
+			case 'BLESSING':
+				$tag = 'BLES';
+				break;
+			case 'BURIAL':
+				$tag = 'BURI';
+				break;
+			case 'CALL_NUMBER':
+				$tag = 'CALN';
+				break;
+			case 'CASTE':
+				$tag = 'CAST';
+				break;
+			case 'CAUSE':
+				$tag = 'CAUS';
+				break;
+			case 'CENSUS':
+				$tag = 'CENS';
+				break;
+			case 'CHANGE':
+				$tag = 'CHAN';
+				break;
+			case 'CHARACTER':
+				$tag = 'CHAR';
+				break;
+			case 'CHILD':
+				$tag = 'CHIL';
+				break;
+			case 'CHILDREN_COUNT':
+				$tag = 'NCHI';
+				break;
+			case 'CHRISTENING':
+				$tag = 'CHR';
+				break;
+			case 'CONCATENATION':
+				$tag = 'CONC';
+				break;
+			case 'CONFIRMATION':
+				$tag = 'CONF';
+				break;
+			case 'CONFIRMATION_LDS':
+				$tag = 'CONL';
+				break;
+			case 'CONTINUED':
+				$tag = 'CONT';
+				break;
+			case 'COPYRIGHT':
+				$tag = 'COPR';
+				break;
+			case 'CORPORATE':
+				$tag = 'CORP';
+				break;
+			case 'COUNTRY':
+				$tag = 'CTRY';
+				break;
+			case 'CREMATION':
+				$tag = 'CREM';
+				break;
+			case 'DATE':
+				// Preserve text from INT dates
+				if (strpos($data, '(') !== false) {
+					list($date, $text) = explode('(', $data, 2);
+					$text              = ' (' . $text;
+				} else {
+					$date = $data;
+					$text = '';
+				}
+				// Capitals
+				$date = strtoupper($date);
+				// Temporarily add leading/trailing spaces, to allow efficient matching below
+				$date = " {$date} ";
+				// Ensure space digits and letters
+				$date = preg_replace('/([A-Z])(\d)/', '$1 $2', $date);
+				$date = preg_replace('/(\d)([A-Z])/', '$1 $2', $date);
+				// Ensure space before/after calendar escapes
+				$date = preg_replace('/@#[^@]+@/', ' $0 ', $date);
+				// "BET." => "BET"
+				$date = preg_replace('/(\w\w)\./', '$1', $date);
+				// "CIR" => "ABT"
+				$date = str_replace(' CIR ', ' ABT ', $date);
+				$date = str_replace(' APX ', ' ABT ', $date);
+				// B.C. => BC (temporarily, to allow easier handling of ".")
+				$date = str_replace(' B.C. ', ' BC ', $date);
+				// "BET X - Y " => "BET X AND Y"
+				$date = preg_replace('/^(.* BET .+) - (.+)/', '$1 AND $2', $date);
+				$date = preg_replace('/^(.* FROM .+) - (.+)/', '$1 TO $2', $date);
+				// "@#ESC@ FROM X TO Y" => "FROM @#ESC@ X TO @#ESC@ Y"
+				$date = preg_replace('/^ +(@#[^@]+@) +FROM +(.+) +TO +(.+)/', ' FROM $1 $2 TO $1 $3', $date);
+				$date = preg_replace('/^ +(@#[^@]+@) +BET +(.+) +AND +(.+)/', ' BET $1 $2 AND $1 $3', $date);
+				// "@#ESC@ AFT X" => "AFT @#ESC@ X"
+				$date = preg_replace('/^ +(@#[^@]+@) +(FROM|BET|TO|AND|BEF|AFT|CAL|EST|INT|ABT) +(.+)/', ' $2 $1 $3', $date);
+				// Ignore any remaining punctuation, e.g. "14-MAY, 1900" => "14 MAY 1900"
+				// (don't change "/" - it is used in NS/OS dates)
+				$date = preg_replace('/[.,:;-]/', ' ', $date);
+				// BC => B.C.
+				$date = str_replace(' BC ', ' B.C. ', $date);
+				// Append the "INT" text
+				$data = $date . $text;
+				break;
+			case 'DEATH':
+				$tag = 'DEAT';
+				break;
+			case '_DEATH_OF_SPOUSE':
+				$tag = '_DETS';
+				break;
+			case '_DEGREE':
+				$tag = '_DEG';
+				break;
+			case 'DESCENDANTS':
+				$tag = 'DESC';
+				break;
+			case 'DESCENDANT_INT':
+				$tag = 'DESI';
+				break;
+			case 'DESTINATION':
+				$tag = 'DEST';
+				break;
+			case 'DIVORCE':
+				$tag = 'DIV';
+				break;
+			case 'DIVORCE_FILED':
+				$tag = 'DIVF';
+				break;
+			case 'EDUCATION':
+				$tag = 'EDUC';
+				break;
+			case 'EMIGRATION':
+				$tag = 'EMIG';
+				break;
+			case 'ENDOWMENT':
+				$tag = 'ENDL';
+				break;
+			case 'ENGAGEMENT':
+				$tag = 'ENGA';
+				break;
+			case 'EVENT':
+				$tag = 'EVEN';
+				break;
+			case 'FACSIMILE':
+				$tag = 'FAX';
+				break;
+			case 'FAMILY':
+				$tag = 'FAM';
+				break;
+			case 'FAMILY_CHILD':
+				$tag = 'FAMC';
+				break;
+			case 'FAMILY_FILE':
+				$tag = 'FAMF';
+				break;
+			case 'FAMILY_SPOUSE':
+				$tag = 'FAMS';
+				break;
+			case 'FIRST_COMMUNION':
+				$tag = 'FCOM';
+				break;
+			case '_FILE':
+				$tag = 'FILE';
+				break;
+			case 'FORMAT':
+				$tag = 'FORM';
+			case 'FORM':
+				// Consistent commas
+				$data = preg_replace('/ *, */', ', ', $data);
+				break;
+			case 'GEDCOM':
+				$tag = 'GEDC';
+				break;
+			case 'GIVEN_NAME':
+				$tag = 'GIVN';
+				break;
+			case 'GRADUATION':
+				$tag = 'GRAD';
+				break;
+			case 'HEADER':
+				$tag = 'HEAD';
+			case 'HEAD':
+				// HEAD records don't have an XREF or DATA
+				if ($level == '0') {
+					$xref = '';
+					$data = '';
+				}
+				break;
+			case 'HUSBAND':
+				$tag = 'HUSB';
+				break;
+			case 'IDENT_NUMBER':
+				$tag = 'IDNO';
+				break;
+			case 'IMMIGRATION':
+				$tag = 'IMMI';
+				break;
+			case 'INDIVIDUAL':
+				$tag = 'INDI';
+				break;
+			case 'LANGUAGE':
+				$tag = 'LANG';
+				break;
+			case 'LATITUDE':
+				$tag = 'LATI';
+				break;
+			case 'LONGITUDE':
+				$tag = 'LONG';
+				break;
+			case 'MARRIAGE':
+				$tag = 'MARR';
+				break;
+			case 'MARRIAGE_BANN':
+				$tag = 'MARB';
+				break;
+			case 'MARRIAGE_COUNT':
+				$tag = 'NMR';
+				break;
+			case 'MARRIAGE_CONTRACT':
+				$tag = 'MARC';
+				break;
+			case 'MARRIAGE_LICENSE':
+				$tag = 'MARL';
+				break;
+			case 'MARRIAGE_SETTLEMENT':
+				$tag = 'MARS';
+				break;
+			case 'MEDIA':
+				$tag = 'MEDI';
+				break;
+			case '_MEDICAL':
+				$tag = '_MDCL';
+				break;
+			case '_MILITARY_SERVICE':
+				$tag = '_MILT';
+				break;
+			case 'NAME':
+				// Tidy up whitespace
+				$data = preg_replace('/  +/', ' ', trim($data));
+				break;
+			case 'NAME_PREFIX':
+				$tag = 'NPFX';
+				break;
+			case 'NAME_SUFFIX':
+				$tag = 'NSFX';
+				break;
+			case 'NATIONALITY':
+				$tag = 'NATI';
+				break;
+			case 'NATURALIZATION':
+				$tag = 'NATU';
+				break;
+			case 'NICKNAME':
+				$tag = 'NICK';
+				break;
+			case 'OBJECT':
+				$tag = 'OBJE';
+				break;
+			case 'OCCUPATION':
+				$tag = 'OCCU';
+				break;
+			case 'ORDINANCE':
+				$tag = 'ORDI';
+				break;
+			case 'ORDINATION':
+				$tag = 'ORDN';
+				break;
+			case 'PEDIGREE':
+				$tag = 'PEDI';
+			case 'PEDI':
+				// PEDI values are lower case
+				$data = strtolower($data);
+				break;
+			case 'PHONE':
+				$tag = 'PHON';
+				break;
+			case 'PHONETIC':
+				$tag = 'FONE';
+				break;
+			case 'PHY_DESCRIPTION':
+				$tag = 'DSCR';
+				break;
+			case 'PLACE':
+				$tag = 'PLAC';
+			case 'PLAC':
+				// Consistent commas
+				$data = preg_replace('/ *(،|,) */', ', ', $data);
+				// The Master Genealogist stores LAT/LONG data in the PLAC field, e.g. Pennsylvania, USA, 395945N0751013W
+				if (preg_match('/(.*), (\d\d)(\d\d)(\d\d)([NS])(\d\d\d)(\d\d)(\d\d)([EW])$/', $data, $match)) {
+					$data =
+						$match[1] . "\n" .
+						($level + 1) . " MAP\n" .
+						($level + 2) . " LATI " . ($match[5] . (round($match[2] + ($match[3] / 60) + ($match[4] / 3600), 4))) . "\n" .
+						($level + 2) . " LONG " . ($match[9] . (round($match[6] + ($match[7] / 60) + ($match[8] / 3600), 4)));
+				}
+				break;
+			case 'POSTAL_CODE':
+				$tag = 'POST';
+				break;
+			case 'PROBATE':
+				$tag = 'PROB';
+				break;
+			case 'PROPERTY':
+				$tag = 'PROP';
+				break;
+			case 'PUBLICATION':
+				$tag = 'PUBL';
+				break;
+			case 'QUALITY_OF_DATA':
+				$tag = 'QUAL';
+				break;
+			case 'REC_FILE_NUMBER':
+				$tag = 'RFN';
+				break;
+			case 'REC_ID_NUMBER':
+				$tag = 'RIN';
+				break;
+			case 'REFERENCE':
+				$tag = 'REFN';
+				break;
+			case 'RELATIONSHIP':
+				$tag = 'RELA';
+				break;
+			case 'RELIGION':
+				$tag = 'RELI';
+				break;
+			case 'REPOSITORY':
+				$tag = 'REPO';
+				break;
+			case 'RESIDENCE':
+				$tag = 'RESI';
+				break;
+			case 'RESTRICTION':
+				$tag = 'RESN';
+			case 'RESN':
+				// RESN values are lower case (confidential, privacy, locked, none)
+				$data = strtolower($data);
+				if ($data == 'invisible') {
+					$data = 'confidential'; // From old versions of Legacy.
+				}
+				break;
+			case 'RETIREMENT':
+				$tag = 'RETI';
+				break;
+			case 'ROMANIZED':
+				$tag = 'ROMN';
+				break;
+			case 'SEALING_CHILD':
+				$tag = 'SLGC';
+				break;
+			case 'SEALING_SPOUSE':
+				$tag = 'SLGS';
+				break;
+			case 'SOC_SEC_NUMBER':
+				$tag = 'SSN';
+				break;
+			case 'SEX':
+				$data = strtoupper($data);
+				break;
+			case 'SOURCE':
+				$tag = 'SOUR';
+				break;
+			case 'STATE':
+				$tag = 'STAE';
+				break;
+			case 'STATUS':
+				$tag = 'STAT';
+			case 'STAT':
+				if ($data == 'CANCELLED') {
+					// PhpGedView mis-spells this tag - correct it.
+					$data = 'CANCELED';
+				}
+				break;
+			case 'SUBMISSION':
+				$tag = 'SUBN';
+				break;
+			case 'SUBMITTER':
+				$tag = 'SUBM';
+				break;
+			case 'SURNAME':
+				$tag = 'SURN';
+				break;
+			case 'SURN_PREFIX':
+				$tag = 'SPFX';
+				break;
+			case 'TEMPLE':
+				$tag = 'TEMP';
+			case 'TEMP':
+				// Temple codes are upper case
+				$data = strtoupper($data);
+				break;
+			case 'TITLE':
+				$tag = 'TITL';
+				break;
+			case 'TRAILER':
+				$tag = 'TRLR';
+			case 'TRLR':
+				// TRLR records don't have an XREF or DATA
+				if ($level == '0') {
+					$xref = '';
+					$data = '';
+				}
+				break;
+			case 'VERSION':
+				$tag = 'VERS';
+				break;
+			case 'WEB':
+				$tag = 'WWW';
+				break;
 			}
 			// Suppress "Y", for facts/events with a DATE or PLAC
 			if ($data == 'y') {
@@ -545,40 +545,40 @@ 
 			}
 			// Reassemble components back into a single line
 			switch ($tag) {
-				default:
-					// Remove tabs and multiple/leading/trailing spaces
-					if (strpos($data, "\t") !== false) {
-						$data = str_replace("\t", ' ', $data);
-					}
-					if (substr($data, 0, 1) == ' ' || substr($data, -1, 1) == ' ') {
-						$data = trim($data);
-					}
-					while (strpos($data, '  ')) {
-						$data = str_replace('  ', ' ', $data);
-					}
-					$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-					break;
-				case 'NOTE':
-				case 'TEXT':
-				case 'DATA':
-				case 'CONT':
-					$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-					break;
-				case 'FILE':
-					// Strip off the user-defined path prefix
-					$GEDCOM_MEDIA_PATH = $tree->getPreference('GEDCOM_MEDIA_PATH');
-					if ($GEDCOM_MEDIA_PATH && strpos($data, $GEDCOM_MEDIA_PATH) === 0) {
-						$data = substr($data, strlen($GEDCOM_MEDIA_PATH));
-					}
-					// convert backslashes in filenames to forward slashes
-					$data = preg_replace("/\\\/", "/", $data);
+			default:
+				// Remove tabs and multiple/leading/trailing spaces
+				if (strpos($data, "\t") !== false) {
+					$data = str_replace("\t", ' ', $data);
+				}
+				if (substr($data, 0, 1) == ' ' || substr($data, -1, 1) == ' ') {
+					$data = trim($data);
+				}
+				while (strpos($data, '  ')) {
+					$data = str_replace('  ', ' ', $data);
+				}
+				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+				break;
+			case 'NOTE':
+			case 'TEXT':
+			case 'DATA':
+			case 'CONT':
+				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+				break;
+			case 'FILE':
+				// Strip off the user-defined path prefix
+				$GEDCOM_MEDIA_PATH = $tree->getPreference('GEDCOM_MEDIA_PATH');
+				if ($GEDCOM_MEDIA_PATH && strpos($data, $GEDCOM_MEDIA_PATH) === 0) {
+					$data = substr($data, strlen($GEDCOM_MEDIA_PATH));
+				}
+				// convert backslashes in filenames to forward slashes
+				$data = preg_replace("/\\\/", "/", $data);
 
-					$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-					break;
-				case 'CONC':
-					// Merge CONC lines, to simplify access later on.
-					$newrec .= ($tree->getPreference('WORD_WRAPPED_NOTES') ? ' ' : '') . $data;
-					break;
+				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+				break;
+			case 'CONC':
+				// Merge CONC lines, to simplify access later on.
+				$newrec .= ($tree->getPreference('WORD_WRAPPED_NOTES') ? ' ' : '') . $data;
+				break;
 			}
 		}
 
@@ -635,136 +635,136 @@ 
 		}
 
 		switch ($type) {
-			case 'INDI':
-				// Convert inline media into media objects
-				$gedrec = self::convertInlineMedia($tree, $gedrec);
+		case 'INDI':
+			// Convert inline media into media objects
+			$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-				$record = new Individual($xref, $gedrec, null, $tree);
-				if ($tree->getPreference('USE_RIN') && preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
-					$rin = $match[1];
-				} else {
-					$rin = $xref;
-				}
-				Database::prepare(
-					"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
-				)->execute(array(
-					$xref, $tree_id, $rin, $record->getSex(), $gedrec,
-				));
-				// Update the cross-reference/index tables.
-				self::updatePlaces($xref, $tree_id, $gedrec);
-				self::updateDates($xref, $tree_id, $gedrec);
-				self::updateLinks($xref, $tree_id, $gedrec);
-				self::updateNames($xref, $tree_id, $record);
-				break;
-			case 'FAM':
-				// Convert inline media into media objects
-				$gedrec = self::convertInlineMedia($tree, $gedrec);
+			$record = new Individual($xref, $gedrec, null, $tree);
+			if ($tree->getPreference('USE_RIN') && preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
+				$rin = $match[1];
+			} else {
+				$rin = $xref;
+			}
+			Database::prepare(
+				"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
+			)->execute(array(
+				$xref, $tree_id, $rin, $record->getSex(), $gedrec,
+			));
+			// Update the cross-reference/index tables.
+			self::updatePlaces($xref, $tree_id, $gedrec);
+			self::updateDates($xref, $tree_id, $gedrec);
+			self::updateLinks($xref, $tree_id, $gedrec);
+			self::updateNames($xref, $tree_id, $record);
+			break;
+		case 'FAM':
+			// Convert inline media into media objects
+			$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-				if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-					$husb = $match[1];
-				} else {
-					$husb = '';
-				}
-				if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-					$wife = $match[1];
-				} else {
-					$wife = '';
-				}
-				$nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
-				if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
-					$nchi = max($nchi, $match[1]);
-				}
-				Database::prepare(
-					"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
-				)->execute(array(
-					$xref, $tree_id, $husb, $wife, $gedrec, $nchi,
-				));
-				// Update the cross-reference/index tables.
-				self::updatePlaces($xref, $tree_id, $gedrec);
-				self::updateDates($xref, $tree_id, $gedrec);
-				self::updateLinks($xref, $tree_id, $gedrec);
-				break;
-			case 'SOUR':
-				// Convert inline media into media objects
-				$gedrec = self::convertInlineMedia($tree, $gedrec);
+			if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+				$husb = $match[1];
+			} else {
+				$husb = '';
+			}
+			if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+				$wife = $match[1];
+			} else {
+				$wife = '';
+			}
+			$nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
+			if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
+				$nchi = max($nchi, $match[1]);
+			}
+			Database::prepare(
+				"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
+			)->execute(array(
+				$xref, $tree_id, $husb, $wife, $gedrec, $nchi,
+			));
+			// Update the cross-reference/index tables.
+			self::updatePlaces($xref, $tree_id, $gedrec);
+			self::updateDates($xref, $tree_id, $gedrec);
+			self::updateLinks($xref, $tree_id, $gedrec);
+			break;
+		case 'SOUR':
+			// Convert inline media into media objects
+			$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-				$record = new Source($xref, $gedrec, null, $tree);
-				if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
-					$name = $match[1];
-				} elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
-					$name = $match[1];
-				} else {
-					$name = $xref;
-				}
-				Database::prepare(
-					"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
-				)->execute(array(
-					$xref, $tree_id, $name, $gedrec,
-				));
-				// Update the cross-reference/index tables.
-				self::updateLinks($xref, $tree_id, $gedrec);
-				self::updateNames($xref, $tree_id, $record);
-				break;
-			case 'REPO':
-				// Convert inline media into media objects
-				$gedrec = self::convertInlineMedia($tree, $gedrec);
+			$record = new Source($xref, $gedrec, null, $tree);
+			if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
+				$name = $match[1];
+			} elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
+				$name = $match[1];
+			} else {
+				$name = $xref;
+			}
+			Database::prepare(
+				"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
+			)->execute(array(
+				$xref, $tree_id, $name, $gedrec,
+			));
+			// Update the cross-reference/index tables.
+			self::updateLinks($xref, $tree_id, $gedrec);
+			self::updateNames($xref, $tree_id, $record);
+			break;
+		case 'REPO':
+			// Convert inline media into media objects
+			$gedrec = self::convertInlineMedia($tree, $gedrec);
 
-				$record = new Repository($xref, $gedrec, null, $tree);
-				Database::prepare(
-					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
-				)->execute(array(
-					$xref, $tree_id, $gedrec,
-				));
-				// Update the cross-reference/index tables.
-				self::updateLinks($xref, $tree_id, $gedrec);
-				self::updateNames($xref, $tree_id, $record);
-				break;
-			case 'NOTE':
-				$record = new Note($xref, $gedrec, null, $tree);
-				Database::prepare(
-					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
-				)->execute(array(
-					$xref, $tree_id, $gedrec,
-				));
-				// Update the cross-reference/index tables.
-				self::updateLinks($xref, $tree_id, $gedrec);
-				self::updateNames($xref, $tree_id, $record);
-				break;
-			case 'OBJE':
-				$record = new Media($xref, $gedrec, null, $tree);
-				Database::prepare(
-					"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, ?, ?, ?, ?, ?, ?)"
-				)->execute(array(
-					$xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
-				));
-				// Update the cross-reference/index tables.
-				self::updateLinks($xref, $tree_id, $gedrec);
-				self::updateNames($xref, $tree_id, $record);
-				break;
-			case 'HEAD':
-				// Force HEAD records to have a creation date.
-				if (!strpos($gedrec, "\n1 DATE ")) {
-					$gedrec .= "\n1 DATE " . date('j M Y');
-				}
-			// No break;
-			case 'TRLR':
-			case 'SUBM':
-			case 'SUBN':
-				Database::prepare(
-					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
-				)->execute(array($xref, $tree_id, $type, $gedrec));
-				// Update the cross-reference/index tables.
+			$record = new Repository($xref, $gedrec, null, $tree);
+			Database::prepare(
+				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
+			)->execute(array(
+				$xref, $tree_id, $gedrec,
+			));
+			// Update the cross-reference/index tables.
 			self::updateLinks($xref, $tree_id, $gedrec);
-				break;
-			default:
-				$record = new GedcomRecord($xref, $gedrec, null, $tree);
-				Database::prepare(
-					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
-				)->execute(array($xref, $tree_id, $type, $gedrec));
-				// Update the cross-reference/index tables.
-				self::updateLinks($xref, $tree_id, $gedrec);
-				self::updateNames($xref, $tree_id, $record);
-				break;
+			self::updateNames($xref, $tree_id, $record);
+			break;
+		case 'NOTE':
+			$record = new Note($xref, $gedrec, null, $tree);
+			Database::prepare(
+				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
+			)->execute(array(
+				$xref, $tree_id, $gedrec,
+			));
+			// Update the cross-reference/index tables.
+			self::updateLinks($xref, $tree_id, $gedrec);
+			self::updateNames($xref, $tree_id, $record);
+			break;
+		case 'OBJE':
+			$record = new Media($xref, $gedrec, null, $tree);
+			Database::prepare(
+				"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, ?, ?, ?, ?, ?, ?)"
+			)->execute(array(
+				$xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
+			));
+			// Update the cross-reference/index tables.
+			self::updateLinks($xref, $tree_id, $gedrec);
+			self::updateNames($xref, $tree_id, $record);
+			break;
+		case 'HEAD':
+			// Force HEAD records to have a creation date.
+			if (!strpos($gedrec, "\n1 DATE ")) {
+				$gedrec .= "\n1 DATE " . date('j M Y');
+			}
+		// No break;
+		case 'TRLR':
+		case 'SUBM':
+		case 'SUBN':
+			Database::prepare(
+				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
+			)->execute(array($xref, $tree_id, $type, $gedrec));
+			// Update the cross-reference/index tables.
+		self::updateLinks($xref, $tree_id, $gedrec);
+			break;
+		default:
+			$record = new GedcomRecord($xref, $gedrec, null, $tree);
+			Database::prepare(
+				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
+			)->execute(array($xref, $tree_id, $type, $gedrec));
+			// Update the cross-reference/index tables.
+			self::updateLinks($xref, $tree_id, $gedrec);
+			self::updateNames($xref, $tree_id, $record);
+			break;
 		}
 	}
 
@@ -1137,21 +1137,21 @@ 
 		Database::prepare("DELETE FROM `##link` WHERE l_from=? AND l_file=?")->execute(array($gid, $ged_id));
 
 		switch ($type) {
-			case 'INDI':
-				Database::prepare("DELETE FROM `##individuals` WHERE i_id=? AND i_file=?")->execute(array($gid, $ged_id));
-				break;
-			case 'FAM':
-				Database::prepare("DELETE FROM `##families` WHERE f_id=? AND f_file=?")->execute(array($gid, $ged_id));
-				break;
-			case 'SOUR':
-				Database::prepare("DELETE FROM `##sources` WHERE s_id=? AND s_file=?")->execute(array($gid, $ged_id));
-				break;
-			case 'OBJE':
-				Database::prepare("DELETE FROM `##media` WHERE m_id=? AND m_file=?")->execute(array($gid, $ged_id));
-				break;
-			default:
-				Database::prepare("DELETE FROM `##other` WHERE o_id=? AND o_file=?")->execute(array($gid, $ged_id));
-				break;
+		case 'INDI':
+			Database::prepare("DELETE FROM `##individuals` WHERE i_id=? AND i_file=?")->execute(array($gid, $ged_id));
+			break;
+		case 'FAM':
+			Database::prepare("DELETE FROM `##families` WHERE f_id=? AND f_file=?")->execute(array($gid, $ged_id));
+			break;
+		case 'SOUR':
+			Database::prepare("DELETE FROM `##sources` WHERE s_id=? AND s_file=?")->execute(array($gid, $ged_id));
+			break;
+		case 'OBJE':
+			Database::prepare("DELETE FROM `##media` WHERE m_id=? AND m_file=?")->execute(array($gid, $ged_id));
+			break;
+		default:
+			Database::prepare("DELETE FROM `##other` WHERE o_id=? AND o_file=?")->execute(array($gid, $ged_id));
+			break;
 		}
 
 		if (!$delete) {

app/Functions/FunctionsMedia.php

Switch Indentation +11 added lines, -11 removed lines

@@ -34,17 +34,17 @@
 			$val = -1;
 		}
 		switch (substr($val, -1)) {
-			case 'g':
-			case 'G':
-				return (int) $val * 1024 * 1024 * 1024;
-			case 'm':
-			case 'M':
-				return (int) $val * 1024 * 1024;
-			case 'k':
-			case 'K':
-				return (int) $val * 1024;
-			default:
-				return (int) $val;
+		case 'g':
+		case 'G':
+			return (int) $val * 1024 * 1024 * 1024;
+		case 'm':
+		case 'M':
+			return (int) $val * 1024 * 1024;
+		case 'k':
+		case 'K':
+			return (int) $val * 1024;
+		default:
+			return (int) $val;
 		}
 	}
 

app/Functions/FunctionsPrint.php

Switch Indentation +60 added lines, -60 removed lines

@@ -50,20 +50,20 @@ 
 	public static function printPedigreePerson(Individual $person = null, $show_full = 1) {
 
 		switch ($show_full) {
-			case 0:
-				if ($person) {
-					echo Theme::theme()->individualBoxSmall($person);
-				} else {
-					echo Theme::theme()->individualBoxSmallEmpty();
-				}
-				break;
-			case 1:
-				if ($person) {
-					echo Theme::theme()->individualBox($person);
-				} else {
-					echo Theme::theme()->individualBoxEmpty();
-				}
-				break;
+		case 0:
+			if ($person) {
+				echo Theme::theme()->individualBoxSmall($person);
+			} else {
+				echo Theme::theme()->individualBoxSmallEmpty();
+			}
+			break;
+		case 1:
+			if ($person) {
+				echo Theme::theme()->individualBox($person);
+			} else {
+				echo Theme::theme()->individualBoxEmpty();
+			}
+			break;
 		}
 	}
 
@@ -259,25 +259,25 @@ 
 					$age      = Date::getAge($parent->getBirthDate(), $birth_date, 2);
 					$deatdate = $parent->getDeathDate();
 					switch ($parent->getSex()) {
-						case 'F':
-							// Highlight mothers who die in childbirth or shortly afterwards
-							if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
-								$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-							} else {
-								$html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
-							}
-							break;
-						case 'M':
-							// Highlight fathers who die before the birth
-							if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
-								$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-							} else {
-								$html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
-							}
-							break;
-						default:
-							$html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
-							break;
+					case 'F':
+						// Highlight mothers who die in childbirth or shortly afterwards
+						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
+							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+						} else {
+							$html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
+						}
+						break;
+					case 'M':
+						// Highlight fathers who die before the birth
+						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
+							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+						} else {
+							$html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
+						}
+						break;
+					default:
+						$html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
+						break;
 					}
 				}
 			}
@@ -578,33 +578,33 @@ 
 
 		// -- Add from pick list
 		switch ($type) {
-			case "INDI":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "FAM":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "SOUR":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "NOTE":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "REPO":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			default:
-				return;
+		case "INDI":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "FAM":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "SOUR":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "NOTE":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "REPO":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		default:
+			return;
 		}
 		$addfacts            = array_merge(self::checkFactUnique($uniquefacts, $usedfacts, $type), $addfacts);
 		$quickfacts          = array_intersect($quickfacts, $addfacts);

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) {