fisharebest / webtrees

expand_view.php

Switch Indentation +33 added lines, -33 removed lines

@@ -38,38 +38,38 @@
 
 foreach ($facts as $fact) {
 	switch ($fact->getTag()) {
-	case 'ADDR':
-	case 'ALIA':
-	case 'ASSO':
-	case 'CHAN':
-	case 'CHIL':
-	case 'EMAIL':
-	case 'FAMC':
-	case 'FAMS':
-	case 'HUSB':
-	case 'NAME':
-	case 'NOTE':
-	case 'OBJE':
-	case 'PHON':
-	case 'RESI':
-	case 'RESN':
-	case 'SEX':
-	case 'SOUR':
-	case 'SSN':
-	case 'SUBM':
-	case 'TITL':
-	case 'URL':
-	case 'WIFE':
-	case 'WWW':
-	case '_EMAIL':
-	case '_TODO':
-	case '_UID':
-	case '_WT_OBJE_SORT':
-		// Do not show these
-		break;
-	default:
-		// Simple version of FunctionsPrintFacts::print_fact()
-		echo $fact->summary();
-		break;
+		case 'ADDR':
+		case 'ALIA':
+		case 'ASSO':
+		case 'CHAN':
+		case 'CHIL':
+		case 'EMAIL':
+		case 'FAMC':
+		case 'FAMS':
+		case 'HUSB':
+		case 'NAME':
+		case 'NOTE':
+		case 'OBJE':
+		case 'PHON':
+		case 'RESI':
+		case 'RESN':
+		case 'SEX':
+		case 'SOUR':
+		case 'SSN':
+		case 'SUBM':
+		case 'TITL':
+		case 'URL':
+		case 'WIFE':
+		case 'WWW':
+		case '_EMAIL':
+		case '_TODO':
+		case '_UID':
+		case '_WT_OBJE_SORT':
+			// Do not show these
+			break;
+		default:
+			// Simple version of FunctionsPrintFacts::print_fact()
+			echo $fact->summary();
+			break;
 	}
 }

admin_site_logs.php

Switch Indentation +6 added lines, -6 removed lines

@@ -131,12 +131,12 @@
 			// Datatables numbers columns 0, 1, 2
 			// MySQL numbers columns 1, 2, 3
 			switch ($value['dir']) {
-			case 'asc':
-				$order_by .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$order_by .= (1 + $value['column']) . " DESC ";
-				break;
+				case 'asc':
+					$order_by .= (1 + $value['column']) . " ASC ";
+					break;
+				case 'desc':
+					$order_by .= (1 + $value['column']) . " DESC ";
+					break;
 			}
 		}
 	} else {

action.php

Switch Indentation +8 added lines, -8 removed lines

@@ -62,14 +62,14 @@
 		foreach ($record->getFacts() as $fact) {
 			if ($fact->getFactId() == $fact_id) {
 				switch ($fact->getTag()) {
-				case 'NOTE':
-				case 'SOUR':
-				case 'OBJE':
-					$type = 'all'; // paste this anywhere
-					break;
-				default:
-					$type = $record::RECORD_TYPE; // paste only to the same record type
-					break;
+					case 'NOTE':
+					case 'SOUR':
+					case 'OBJE':
+						$type = 'all'; // paste this anywhere
+						break;
+					default:
+						$type = $record::RECORD_TYPE; // paste only to the same record type
+						break;
 				}
 				$clipboard = Session::get('clipboard');
 				if (!is_array($clipboard)) {

app/Date/CalendarDate.php

Switch Indentation +102 added lines, -102 removed lines

@@ -491,20 +491,20 @@ 
 	 */
 	public function convertToCalendar($calendar) {
 		switch ($calendar) {
-		case 'gregorian':
-			return new GregorianDate($this);
-		case 'julian':
-			return new JulianDate($this);
-		case 'jewish':
-			return new JewishDate($this);
-		case 'french':
-			return new FrenchDate($this);
-		case 'hijri':
-			return new HijriDate($this);
-		case 'jalali':
-			return new JalaliDate($this);
-		default:
-			return $this;
+			case 'gregorian':
+				return new GregorianDate($this);
+			case 'julian':
+				return new JulianDate($this);
+			case 'jewish':
+				return new JewishDate($this);
+			case 'french':
+				return new FrenchDate($this);
+			case 'hijri':
+				return new HijriDate($this);
+			case 'jalali':
+				return new JalaliDate($this);
+			default:
+				return $this;
 		}
 	}
 
@@ -581,90 +581,90 @@ 
 			$case = 'GENITIVE';
 		} else {
 			switch ($qualifier) {
-			case 'TO':
-			case 'ABT':
-			case 'FROM':
-				$case = 'GENITIVE';
-				break;
-			case 'AFT':
-				$case = 'LOCATIVE';
-				break;
-			case 'BEF':
-			case 'BET':
-			case 'AND':
-				$case = 'INSTRUMENTAL';
-				break;
-			case '':
-			case 'INT':
-			case 'EST':
-			case 'CAL':
-			default: // There shouldn't be any other options...
-				$case = 'NOMINATIVE';
-				break;
+				case 'TO':
+				case 'ABT':
+				case 'FROM':
+					$case = 'GENITIVE';
+					break;
+				case 'AFT':
+					$case = 'LOCATIVE';
+					break;
+				case 'BEF':
+				case 'BET':
+				case 'AND':
+					$case = 'INSTRUMENTAL';
+					break;
+				case '':
+				case 'INT':
+				case 'EST':
+				case 'CAL':
+				default: // There shouldn't be any other options...
+					$case = 'NOMINATIVE';
+					break;
 			}
 		}
 		// Build up the formatted date, character at a time
 		preg_match_all('/%[^%]/', $format, $matches);
 		foreach ($matches[0] as $match) {
 			switch ($match) {
-			case '%d':
-				$format = str_replace($match, $this->formatDayZeros(), $format);
-				break;
-			case '%j':
-				$format = str_replace($match, $this->formatDay(), $format);
-				break;
-			case '%l':
-				$format = str_replace($match, $this->formatLongWeekday(), $format);
-				break;
-			case '%D':
-				$format = str_replace($match, $this->formatShortWeekday(), $format);
-				break;
-			case '%N':
-				$format = str_replace($match, $this->formatIsoWeekday(), $format);
-				break;
-			case '%w':
-				$format = str_replace($match, $this->formatNumericWeekday(), $format);
-				break;
-			case '%z':
-				$format = str_replace($match, $this->formatDayOfYear(), $format);
-				break;
-			case '%F':
-				$format = str_replace($match, $this->formatLongMonth($case), $format);
-				break;
-			case '%m':
-				$format = str_replace($match, $this->formatMonthZeros(), $format);
-				break;
-			case '%M':
-				$format = str_replace($match, $this->formatShortMonth(), $format);
-				break;
-			case '%n':
-				$format = str_replace($match, $this->formatMonth(), $format);
-				break;
-			case '%t':
-				$format = str_replace($match, $this->daysInMonth(), $format);
-				break;
-			case '%L':
-				$format = str_replace($match, (int) $this->isLeapYear(), $format);
-				break;
-			case '%Y':
-				$format = str_replace($match, $this->formatLongYear(), $format);
-				break;
-			case '%y':
-				$format = str_replace($match, $this->formatShortYear(), $format);
-				break;
-				// These 4 extensions are useful for re-formatting gedcom dates.
-			case '%@':
-				$format = str_replace($match, $this->calendar->gedcomCalendarEscape(), $format);
-				break;
-			case '%A':
-				$format = str_replace($match, $this->formatGedcomDay(), $format);
-				break;
-			case '%O':
-				$format = str_replace($match, $this->formatGedcomMonth(), $format);
-				break;
-			case '%E':
-				$format = str_replace($match, $this->formatGedcomYear(), $format);
-				break;
+				case '%d':
+					$format = str_replace($match, $this->formatDayZeros(), $format);
+					break;
+				case '%j':
+					$format = str_replace($match, $this->formatDay(), $format);
+					break;
+				case '%l':
+					$format = str_replace($match, $this->formatLongWeekday(), $format);
+					break;
+				case '%D':
+					$format = str_replace($match, $this->formatShortWeekday(), $format);
+					break;
+				case '%N':
+					$format = str_replace($match, $this->formatIsoWeekday(), $format);
+					break;
+				case '%w':
+					$format = str_replace($match, $this->formatNumericWeekday(), $format);
+					break;
+				case '%z':
+					$format = str_replace($match, $this->formatDayOfYear(), $format);
+					break;
+				case '%F':
+					$format = str_replace($match, $this->formatLongMonth($case), $format);
+					break;
+				case '%m':
+					$format = str_replace($match, $this->formatMonthZeros(), $format);
+					break;
+				case '%M':
+					$format = str_replace($match, $this->formatShortMonth(), $format);
+					break;
+				case '%n':
+					$format = str_replace($match, $this->formatMonth(), $format);
+					break;
+				case '%t':
+					$format = str_replace($match, $this->daysInMonth(), $format);
+					break;
+				case '%L':
+					$format = str_replace($match, (int) $this->isLeapYear(), $format);
+					break;
+				case '%Y':
+					$format = str_replace($match, $this->formatLongYear(), $format);
+					break;
+				case '%y':
+					$format = str_replace($match, $this->formatShortYear(), $format);
+					break;
+					// These 4 extensions are useful for re-formatting gedcom dates.
+				case '%@':
+					$format = str_replace($match, $this->calendar->gedcomCalendarEscape(), $format);
+					break;
+				case '%A':
+					$format = str_replace($match, $this->formatGedcomDay(), $format);
+					break;
+				case '%O':
+					$format = str_replace($match, $this->formatGedcomMonth(), $format);
+					break;
+				case '%E':
+					$format = str_replace($match, $this->formatGedcomYear(), $format);
+					break;
 			}
 		}
 
@@ -769,16 +769,16 @@ 
 	 */
 	protected function formatLongMonth($case = 'NOMINATIVE') {
 		switch ($case) {
-		case 'GENITIVE':
-			return $this->monthNameGenitiveCase($this->m, $this->isLeapYear());
-		case 'NOMINATIVE':
-			return $this->monthNameNominativeCase($this->m, $this->isLeapYear());
-		case 'LOCATIVE':
-			return $this->monthNameLocativeCase($this->m, $this->isLeapYear());
-		case 'INSTRUMENTAL':
-			return $this->monthNameInstrumentalCase($this->m, $this->isLeapYear());
-		default:
-			throw new \InvalidArgumentException($case);
+			case 'GENITIVE':
+				return $this->monthNameGenitiveCase($this->m, $this->isLeapYear());
+			case 'NOMINATIVE':
+				return $this->monthNameNominativeCase($this->m, $this->isLeapYear());
+			case 'LOCATIVE':
+				return $this->monthNameLocativeCase($this->m, $this->isLeapYear());
+			case 'INSTRUMENTAL':
+				return $this->monthNameInstrumentalCase($this->m, $this->isLeapYear());
+			default:
+				throw new \InvalidArgumentException($case);
 		}
 	}
 

app/Statement.php

Switch Indentation +12 added lines, -12 removed lines

@@ -64,18 +64,18 @@
 				$key = ':' . $key;
 			}
 			switch (gettype($bind_variable)) {
-			case 'NULL':
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_NULL);
-				break;
-			case 'boolean':
-				$this->pdo_statement->bindValue($key, (int) $bind_variable, PDO::PARAM_INT);
-				break;
-			case 'integer':
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_INT);
-				break;
-			default:
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_STR);
-				break;
+				case 'NULL':
+					$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_NULL);
+					break;
+				case 'boolean':
+					$this->pdo_statement->bindValue($key, (int) $bind_variable, PDO::PARAM_INT);
+					break;
+				case 'integer':
+					$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_INT);
+					break;
+				default:
+					$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_STR);
+					break;
 			}
 		}
 

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/FunctionsMedia.php

Switch Indentation +11 added lines, -11 removed lines

@@ -32,17 +32,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/Controller/AdvancedSearchController.php

Switch Indentation +187 added lines, -187 removed lines

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

app/GedcomCode/GedcomCodePedi.php

Switch Indentation +76 added lines, -76 removed lines

@@ -42,57 +42,57 @@ 
 		}
 
 		switch ($type) {
-		case 'birth':
-			switch ($sex) {
-			case 'M':
-				return I18N::translateContext('Male pedigree', 'Birth');
-			case 'F':
-				return I18N::translateContext('Female pedigree', 'Birth');
-			default:
-				return I18N::translateContext('Pedigree', 'Birth');
-			}
-		case 'adopted':
-			switch ($sex) {
-			case 'M':
-				return I18N::translateContext('Male pedigree', 'Adopted');
-			case 'F':
-				return I18N::translateContext('Female pedigree', 'Adopted');
-			default:
-				return I18N::translateContext('Pedigree', 'Adopted');
-			}
-		case 'foster':
-			switch ($sex) {
-			case 'M':
-				return I18N::translateContext('Male pedigree', 'Foster');
-			case 'F':
-				return I18N::translateContext('Female pedigree', 'Foster');
-			default:
-				return I18N::translateContext('Pedigree', 'Foster');
-			}
-		case 'sealing':
-			switch ($sex) {
-			case 'M':
+			case 'birth':
+				switch ($sex) {
+					case 'M':
+						return I18N::translateContext('Male pedigree', 'Birth');
+					case 'F':
+						return I18N::translateContext('Female pedigree', 'Birth');
+					default:
+						return I18N::translateContext('Pedigree', 'Birth');
+				}
+			case 'adopted':
+				switch ($sex) {
+					case 'M':
+						return I18N::translateContext('Male pedigree', 'Adopted');
+					case 'F':
+						return I18N::translateContext('Female pedigree', 'Adopted');
+					default:
+						return I18N::translateContext('Pedigree', 'Adopted');
+				}
+			case 'foster':
+				switch ($sex) {
+					case 'M':
+						return I18N::translateContext('Male pedigree', 'Foster');
+					case 'F':
+						return I18N::translateContext('Female pedigree', 'Foster');
+					default:
+						return I18N::translateContext('Pedigree', 'Foster');
+				}
+			case 'sealing':
+				switch ($sex) {
+					case 'M':
+						return
+							/* I18N: “sealing” is a ceremony in the Mormon church. */
+							I18N::translateContext('Male pedigree', 'Sealing');
+					case 'F':
+						return
+							/* I18N: “sealing” is a ceremony in the Mormon church. */
+							I18N::translateContext('Female pedigree', 'Sealing');
+					default:
+						return
+							/* I18N: “sealing” is a ceremony in the Mormon church. */
+							I18N::translateContext('Pedigree', 'Sealing');
+				}
+			case 'rada':
+				// Not standard GEDCOM - a webtrees extension
+				// This is an arabic word which does not exist in other languages.
+				// So, it will not have any inflected forms.
 				return
-					/* I18N: “sealing” is a ceremony in the Mormon church. */
-					I18N::translateContext('Male pedigree', 'Sealing');
-			case 'F':
-				return
-					/* I18N: “sealing” is a ceremony in the Mormon church. */
-					I18N::translateContext('Female pedigree', 'Sealing');
+					/* I18N: This is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */
+					I18N::translate('Rada');
 			default:
-				return
-					/* I18N: “sealing” is a ceremony in the Mormon church. */
-					I18N::translateContext('Pedigree', 'Sealing');
-			}
-		case 'rada':
-			// Not standard GEDCOM - a webtrees extension
-			// This is an arabic word which does not exist in other languages.
-			// So, it will not have any inflected forms.
-			return
-				/* I18N: This is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */
-				I18N::translate('Rada');
-		default:
-			return $type;
+				return $type;
 		}
 	}
 
@@ -122,23 +122,23 @@ 
 	 */
 	public static function getChildFamilyLabel($pedi) {
 		switch ($pedi) {
-		case '':
-		case 'birth':
-			return I18N::translate('Family with parents');
-		case 'adopted':
-			return I18N::translate('Family with adoptive parents');
-		case 'foster':
-			return I18N::translate('Family with foster parents');
-		case 'sealing':
-			return
-				/* I18N: “sealing” is a Mormon ceremony. */
-				I18N::translate('Family with sealing parents');
-		case 'rada':
-			return
-				/* I18N: “rada” is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */
-				I18N::translate('Family with rada parents');
-		default:
-			return I18N::translate('Family with parents') . ' - ' . $pedi;
+			case '':
+			case 'birth':
+				return I18N::translate('Family with parents');
+			case 'adopted':
+				return I18N::translate('Family with adoptive parents');
+			case 'foster':
+				return I18N::translate('Family with foster parents');
+			case 'sealing':
+				return
+					/* I18N: “sealing” is a Mormon ceremony. */
+					I18N::translate('Family with sealing parents');
+			case 'rada':
+				return
+					/* I18N: “rada” is an Arabic word, pronounced “ra DAH”. It is child-to-parent pedigree, established by wet-nursing. */
+					I18N::translate('Family with rada parents');
+			default:
+				return I18N::translate('Family with parents') . ' - ' . $pedi;
 		}
 	}
 
@@ -152,16 +152,16 @@ 
 	 */
 	public static function createNewFamcPedi($pedi, $xref) {
 		switch ($pedi) {
-		case '':
-			return "1 FAMC @$xref@";
-		case 'adopted':
-			return "1 FAMC @$xref@\n2 PEDI $pedi\n1 ADOP\n2 FAMC @$xref@\n3 ADOP BOTH";
-		case 'sealing':
-			return "1 FAMC @$xref@\n2 PEDI $pedi\n1 SLGC\n2 FAMC @$xref@";
-		case 'foster':
-			return "1 FAMC @$xref@\n2 PEDI $pedi\n1 EVEN\n2 TYPE $pedi";
-		default:
-			return "1 FAMC @$xref@\n2 PEDI $pedi";
+			case '':
+				return "1 FAMC @$xref@";
+			case 'adopted':
+				return "1 FAMC @$xref@\n2 PEDI $pedi\n1 ADOP\n2 FAMC @$xref@\n3 ADOP BOTH";
+			case 'sealing':
+				return "1 FAMC @$xref@\n2 PEDI $pedi\n1 SLGC\n2 FAMC @$xref@";
+			case 'foster':
+				return "1 FAMC @$xref@\n2 PEDI $pedi\n1 EVEN\n2 TYPE $pedi";
+			default:
+				return "1 FAMC @$xref@\n2 PEDI $pedi";
 		}
 	}
 }