fisharebest / webtrees

app/Filter.php

Switch Indentation +4 added lines, -4 removed lines

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

app/GedcomRecord.php

Switch Indentation +47 added lines, -47 removed lines

@@ -198,27 +198,27 @@ 
 		}
 
 		switch ($type) {
-		case 'INDI':
-			$record = new Individual($xref, $gedcom, $pending, $tree);
-			break;
-		case 'FAM':
-			$record = new Family($xref, $gedcom, $pending, $tree);
-			break;
-		case 'SOUR':
-			$record = new Source($xref, $gedcom, $pending, $tree);
-			break;
-		case 'OBJE':
-			$record = new Media($xref, $gedcom, $pending, $tree);
-			break;
-		case 'REPO':
-			$record = new Repository($xref, $gedcom, $pending, $tree);
-			break;
-		case 'NOTE':
-			$record = new Note($xref, $gedcom, $pending, $tree);
-			break;
-		default:
-			$record = new self($xref, $gedcom, $pending, $tree);
-			break;
+			case 'INDI':
+				$record = new Individual($xref, $gedcom, $pending, $tree);
+				break;
+			case 'FAM':
+				$record = new Family($xref, $gedcom, $pending, $tree);
+				break;
+			case 'SOUR':
+				$record = new Source($xref, $gedcom, $pending, $tree);
+				break;
+			case 'OBJE':
+				$record = new Media($xref, $gedcom, $pending, $tree);
+				break;
+			case 'REPO':
+				$record = new Repository($xref, $gedcom, $pending, $tree);
+				break;
+			case 'NOTE':
+				$record = new Note($xref, $gedcom, $pending, $tree);
+				break;
+			default:
+				$record = new self($xref, $gedcom, $pending, $tree);
+				break;
 		}
 
 		// Store it in the cache
@@ -437,31 +437,31 @@ 
 // CACHING: this function can take three different parameters,
 		// and therefore needs three different caches for the result.
 		switch ($access_level) {
-		case Auth::PRIV_PRIVATE: // visitor
-			if ($this->disp_public === null) {
-				$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
-			}
+			case Auth::PRIV_PRIVATE: // visitor
+				if ($this->disp_public === null) {
+					$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
+				}
 
-			return $this->disp_public;
-		case Auth::PRIV_USER: // member
-			if ($this->disp_user === null) {
-				$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
-			}
+				return $this->disp_public;
+			case Auth::PRIV_USER: // member
+				if ($this->disp_user === null) {
+					$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
+				}
 
-			return $this->disp_user;
-		case Auth::PRIV_NONE: // admin
-			if ($this->disp_none === null) {
-				$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
-			}
+				return $this->disp_user;
+			case Auth::PRIV_NONE: // admin
+				if ($this->disp_none === null) {
+					$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
+				}
 
-			return $this->disp_none;
-		case Auth::PRIV_HIDE: // hidden from admins
-			// We use this value to bypass privacy checks. For example,
-			// when downloading data or when calculating privacy itself.
-			return true;
-		default:
-			// Should never get here.
-			return false;
+				return $this->disp_none;
+			case Auth::PRIV_HIDE: // hidden from admins
+				// We use this value to bypass privacy checks. For example,
+				// when downloading data or when calculating privacy itself.
+				return true;
+			default:
+				// Should never get here.
+				return false;
 		}
 	}
 
@@ -816,10 +816,10 @@ 
 			}
 			if ($event->getDate()->isOK() || !$event->getPlace()->isEmpty()) {
 				switch ($style) {
-				case 1:
-					return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
-				case 2:
-					return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
+					case 1:
+						return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
+					case 2:
+						return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
 				}
 			}
 		}

app/Date.php

Switch Indentation +101 added lines, -101 removed lines

@@ -169,22 +169,22 @@ 
 		}
 		// Now construct an object of the correct type
 		switch ($cal) {
-		case '@#DGREGORIAN@':
-			return new GregorianDate(array($y, $m, $d));
-		case '@#DJULIAN@':
-			return new JulianDate(array($y, $m, $d));
-		case '@#DHEBREW@':
-			return new JewishDate(array($y, $m, $d));
-		case '@#DHIJRI@':
-			return new HijriDate(array($y, $m, $d));
-		case '@#DFRENCH R@':
-			return new FrenchDate(array($y, $m, $d));
-		case '@#DJALALI@':
-			return new JalaliDate(array($y, $m, $d));
-		case '@#DROMAN@':
-			return new RomanDate(array($y, $m, $d));
-		default:
-			throw new \DomainException('Invalid calendar');
+			case '@#DGREGORIAN@':
+				return new GregorianDate(array($y, $m, $d));
+			case '@#DJULIAN@':
+				return new JulianDate(array($y, $m, $d));
+			case '@#DHEBREW@':
+				return new JewishDate(array($y, $m, $d));
+			case '@#DHIJRI@':
+				return new HijriDate(array($y, $m, $d));
+			case '@#DFRENCH R@':
+				return new FrenchDate(array($y, $m, $d));
+			case '@#DJALALI@':
+				return new JalaliDate(array($y, $m, $d));
+			case '@#DROMAN@':
+				return new RomanDate(array($y, $m, $d));
+			default:
+				throw new \DomainException('Invalid calendar');
 		}
 	}
 
@@ -291,42 +291,42 @@ 
 
 		// Localise the date
 		switch ($q1 . $q2) {
-		case '':
-			$tmp = $d1 . $conv1;
-			break;
-		case 'ABT':
-			$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
-			break;
-		case 'CAL':
-			$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
-			break;
-		case 'EST':
-			$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
-			break;
-		case 'INT':
-			$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, $this->text);
-			break;
-		case 'BEF':
-			$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
-			break;
-		case 'AFT':
-			$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
-			break;
-		case 'FROM':
-			$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
-			break;
-		case 'TO':
-			$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
-			break;
-		case 'BETAND':
-			$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		case 'FROMTO':
-			$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		default:
-			$tmp = I18N::translate('Invalid date');
-			break; // e.g. BET without AND
+			case '':
+				$tmp = $d1 . $conv1;
+				break;
+			case 'ABT':
+				$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
+				break;
+			case 'CAL':
+				$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
+				break;
+			case 'EST':
+				$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
+				break;
+			case 'INT':
+				$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, $this->text);
+				break;
+			case 'BEF':
+				$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
+				break;
+			case 'AFT':
+				$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
+				break;
+			case 'FROM':
+				$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
+				break;
+			case 'TO':
+				$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
+				break;
+			case 'BETAND':
+				$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
+				break;
+			case 'FROMTO':
+				$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
+				break;
+			default:
+				$tmp = I18N::translate('Invalid date');
+				break; // e.g. BET without AND
 		}
 		if ($this->text && !$q1) {
 			$tmp = I18N::translate('%1$s (%2$s)', $tmp, $this->text);
@@ -445,33 +445,33 @@ 
 		}
 
 		switch ($format) {
-		case 0:
-			// Years - integer only (for statistics, rather than for display)
-			if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
-				return $d1->minimumDate()->getAge(false, $jd, false);
-			} else {
-				return -1;
-			}
-		case 1:
-			// Days - integer only (for sorting, rather than for display)
-			if ($jd && $d1->minimumJulianDay()) {
-				return $jd - $d1->minimumJulianDay();
-			} else {
-				return -1;
-			}
-		case 2:
-			// Just years, in local digits, with warning for negative/
-			if ($jd && $d1->minimumJulianDay()) {
-				if ($d1->minimumJulianDay() > $jd) {
-					return '<i class="icon-warning"></i>';
+			case 0:
+				// Years - integer only (for statistics, rather than for display)
+				if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
+					return $d1->minimumDate()->getAge(false, $jd, false);
 				} else {
-					return I18N::number($d1->minimumDate()->getAge(false, $jd));
+					return -1;
 				}
-			} else {
-				return '';
-			}
-		default:
-			throw new \InvalidArgumentException('format: ' . $format);
+			case 1:
+				// Days - integer only (for sorting, rather than for display)
+				if ($jd && $d1->minimumJulianDay()) {
+					return $jd - $d1->minimumJulianDay();
+				} else {
+					return -1;
+				}
+			case 2:
+				// Just years, in local digits, with warning for negative/
+				if ($jd && $d1->minimumJulianDay()) {
+					if ($d1->minimumJulianDay() > $jd) {
+						return '<i class="icon-warning"></i>';
+					} else {
+						return I18N::number($d1->minimumDate()->getAge(false, $jd));
+					}
+				} else {
+					return '';
+				}
+			default:
+				throw new \InvalidArgumentException('format: ' . $format);
 		}
 	}
 
@@ -515,32 +515,32 @@ 
 	public static function compare(Date $a, Date $b) {
 		// Get min/max JD for each date.
 		switch ($a->qual1) {
-		case 'BEF':
-			$amin = $a->minimumJulianDay() - 1;
-			$amax = $amin;
-			break;
-		case 'AFT':
-			$amax = $a->maximumJulianDay() + 1;
-			$amin = $amax;
-			break;
-		default:
-			$amin = $a->minimumJulianDay();
-			$amax = $a->maximumJulianDay();
-			break;
+			case 'BEF':
+				$amin = $a->minimumJulianDay() - 1;
+				$amax = $amin;
+				break;
+			case 'AFT':
+				$amax = $a->maximumJulianDay() + 1;
+				$amin = $amax;
+				break;
+			default:
+				$amin = $a->minimumJulianDay();
+				$amax = $a->maximumJulianDay();
+				break;
 		}
 		switch ($b->qual1) {
-		case 'BEF':
-			$bmin = $b->minimumJulianDay() - 1;
-			$bmax = $bmin;
-			break;
-		case 'AFT':
-			$bmax = $b->maximumJulianDay() + 1;
-			$bmin = $bmax;
-			break;
-		default:
-			$bmin = $b->minimumJulianDay();
-			$bmax = $b->maximumJulianDay();
-			break;
+			case 'BEF':
+				$bmin = $b->minimumJulianDay() - 1;
+				$bmax = $bmin;
+				break;
+			case 'AFT':
+				$bmax = $b->maximumJulianDay() + 1;
+				$bmin = $bmax;
+				break;
+			default:
+				$bmin = $b->minimumJulianDay();
+				$bmax = $b->maximumJulianDay();
+				break;
 		}
 		if ($amax < $bmin) {
 			return -1;

app/Mail.php

Switch Indentation +21 added lines, -21 removed lines

@@ -98,30 +98,30 @@
 	 */
 	public static function transport() {
 		switch (Site::getPreference('SMTP_ACTIVE')) {
-		case 'internal':
-			return Swift_MailTransport::newInstance();
-		case 'sendmail':
-			return Swift_SendmailTransport::newInstance();
-		case 'external':
-            $transport = Swift_SmtpTransport::newInstance()
-                ->setHost(Site::getPreference('SMTP_HOST'))
-                ->setPort(Site::getPreference('SMTP_PORT'))
-                ->setLocalDomain(Site::getPreference('SMTP_HELO'));
+			case 'internal':
+				return Swift_MailTransport::newInstance();
+			case 'sendmail':
+				return Swift_SendmailTransport::newInstance();
+			case 'external':
+            	$transport = Swift_SmtpTransport::newInstance()
+                	->setHost(Site::getPreference('SMTP_HOST'))
+                	->setPort(Site::getPreference('SMTP_PORT'))
+                	->setLocalDomain(Site::getPreference('SMTP_HELO'));
 
-            if (Site::getPreference('SMTP_AUTH')) {
-                $transport
-                    ->setUsername(Site::getPreference('SMTP_AUTH_USER'))
-                    ->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
-            }
+            	if (Site::getPreference('SMTP_AUTH')) {
+                	$transport
+                    	->setUsername(Site::getPreference('SMTP_AUTH_USER'))
+                    	->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
+            	}
 
-            if (Site::getPreference('SMTP_SSL') !== 'none') {
-                $transport->setEncryption(Site::getPreference('SMTP_SSL'));
-            }
+            	if (Site::getPreference('SMTP_SSL') !== 'none') {
+                	$transport->setEncryption(Site::getPreference('SMTP_SSL'));
+            	}
 
-			return $transport;
-		default:
-			// For testing
-			return Swift_NullTransport::newInstance();
+				return $transport;
+			default:
+				// For testing
+				return Swift_NullTransport::newInstance();
 		}
 	}
 }

edit_changes.php

Switch Indentation +85 added lines, -85 removed lines

@@ -49,72 +49,72 @@ 
 echo '<div id="pending"><h2>', I18N::translate('Pending changes'), '</h2>';
 
 switch ($action) {
-case 'undo':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Undo a change, and subsequent changes to the same record
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET   status     = 'rejected'" .
-		" WHERE status     = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id >= ?"
-	)->execute(array($gedcom_id, $xref, $change_id));
-	break;
-case 'accept':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Accept a change, and all previous changes to the same record
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM  `##change` c" .
-		" JOIN  `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status   = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id <= ?" .
-		" ORDER BY change_id"
-	)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+	case 'undo':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		// Undo a change, and subsequent changes to the same record
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET   status     = 'rejected'" .
+			" WHERE status     = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id >= ?"
+		)->execute(array($gedcom_id, $xref, $change_id));
+		break;
+	case 'accept':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		// Accept a change, and all previous changes to the same record
+		$changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM  `##change` c" .
+			" JOIN  `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status   = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id <= ?" .
+			" ORDER BY change_id"
+		)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
+		foreach ($changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
-case 'undoall':
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET status='rejected'" .
-		" WHERE status='pending' AND gedcom_id=?"
-	)->execute(array($WT_TREE->getTreeId()));
-	break;
-case 'acceptall':
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM `##change` c" .
-		" JOIN `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status='pending' AND gedcom_id=?" .
-		" ORDER BY change_id"
-	)->execute(array($WT_TREE->getTreeId()))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+		break;
+	case 'undoall':
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET status='rejected'" .
+			" WHERE status='pending' AND gedcom_id=?"
+		)->execute(array($WT_TREE->getTreeId()));
+		break;
+	case 'acceptall':
+		$changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM `##change` c" .
+			" JOIN `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status='pending' AND gedcom_id=?" .
+			" ORDER BY change_id"
+		)->execute(array($WT_TREE->getTreeId()))->fetchAll();
+		foreach ($changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
+		break;
 }
 
 $changed_gedcoms = Database::prepare(
@@ -146,27 +146,27 @@ 
 
 
 		switch ($match[1]) {
-		case 'INDI':
-			$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'FAM':
-			$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'SOUR':
-			$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'REPO':
-			$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'OBJE':
-			$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'NOTE':
-			$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		default:
-			$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
+			case 'INDI':
+				$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'FAM':
+				$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'SOUR':
+				$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'REPO':
+				$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'OBJE':
+				$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'NOTE':
+				$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			default:
+				$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
 		}
 		if ($change->xref != $prev_xref || $change->gedcom_id != $prev_gedcom_id) {
 			if ($prev_xref) {

search_advanced.php

Switch Indentation +12 added lines, -12 removed lines

@@ -185,18 +185,18 @@
 				$searchField  = $controller->getField($k);
 				$searchOption = substr($searchField, 20); // Assume we have something like "FAMC:HUSB:NAME:GIVN:foo"
 				switch (substr($searchField, 0, 20)) {
-				case 'FAMC:HUSB:NAME:GIVN:':
-					$fatherGivnOption = $searchOption;
-					break;
-				case 'FAMC:HUSB:NAME:SURN:':
-					$fatherSurnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:GIVN:':
-					$motherGivnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:SURN:':
-					$motherSurnOption = $searchOption;
-					break;
+					case 'FAMC:HUSB:NAME:GIVN:':
+						$fatherGivnOption = $searchOption;
+						break;
+					case 'FAMC:HUSB:NAME:SURN:':
+						$fatherSurnOption = $searchOption;
+						break;
+					case 'FAMC:WIFE:NAME:GIVN:':
+						$motherGivnOption = $searchOption;
+						break;
+					case 'FAMC:WIFE:NAME:SURN:':
+						$motherSurnOption = $searchOption;
+						break;
 				}
 			}
 			?>

message.php

Switch Indentation +14 added lines, -14 removed lines

@@ -65,20 +65,20 @@
 // Ensure the user always visits this page twice - once to compose it and again to send it.
 // This makes it harder for spammers.
 switch ($action) {
-case 'compose':
-	Session::put('good_to_send', true);
-	break;
-case 'send':
-	// Only send messages if we've come straight from the compose page.
-	if (!Session::get('good_to_send')) {
-		Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
-		$action = 'compose';
-	}
-	if (!Filter::checkCsrf()) {
-		$action = 'compose';
-	}
-	Session::forget('good_to_send');
-	break;
+	case 'compose':
+		Session::put('good_to_send', true);
+		break;
+	case 'send':
+		// Only send messages if we've come straight from the compose page.
+		if (!Session::get('good_to_send')) {
+			Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
+			$action = 'compose';
+		}
+		if (!Filter::checkCsrf()) {
+			$action = 'compose';
+		}
+		Session::forget('good_to_send');
+		break;
 }
 
 switch ($action) {

calendar.php

Switch Indentation +99 added lines, -99 removed lines

@@ -118,15 +118,15 @@ 
 $controller->setPageTitle(I18N::translate('Anniversary calendar'));
 
 switch ($view) {
-case 'day':
-	$controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
-	break;
-case 'month':
-	$controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
-	break;
-case 'year':
-	$controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
-	break;
+	case 'day':
+		$controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
+		break;
+	case 'month':
+		$controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
+		break;
+	case 'year':
+		$controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
+		break;
 }
 
 $controller->pageHeader();
@@ -329,38 +329,38 @@ 
 $found_facts = array();
 
 switch ($view) {
-case 'day':
-	$found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
-	break;
-case 'month':
-	$cal_date->d = 0;
-	$cal_date->setJdFromYmd();
-	// Make a separate list for each day. Unspecified/invalid days go in day 0.
-	for ($d = 0; $d <= $days_in_month; ++$d) {
-		$found_facts[$d] = array();
-	}
-	// Fetch events for each day
-	for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
-		foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
-			$tmp = $fact->getDate()->minimumDate();
-			if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
-				// If the day is valid (for its own calendar), display it in the
-				// anniversary day (for the display calendar).
-				$found_facts[$jd - $cal_date->minJD + 1][] = $fact;
-			} else {
-				// Otherwise, display it in the "Day not set" box.
-				$found_facts[0][] = $fact;
+	case 'day':
+		$found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
+		break;
+	case 'month':
+		$cal_date->d = 0;
+		$cal_date->setJdFromYmd();
+		// Make a separate list for each day. Unspecified/invalid days go in day 0.
+		for ($d = 0; $d <= $days_in_month; ++$d) {
+			$found_facts[$d] = array();
+		}
+		// Fetch events for each day
+		for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
+			foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
+				$tmp = $fact->getDate()->minimumDate();
+				if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
+					// If the day is valid (for its own calendar), display it in the
+					// anniversary day (for the display calendar).
+					$found_facts[$jd - $cal_date->minJD + 1][] = $fact;
+				} else {
+					// Otherwise, display it in the "Day not set" box.
+					$found_facts[0][] = $fact;
+				}
 			}
 		}
-	}
-	break;
-case 'year':
-	$cal_date->m = 0;
-	$cal_date->setJdFromYmd();
-	$found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
-	// Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
-	$found_facts = array_unique($found_facts);
-	break;
+		break;
+	case 'year':
+		$cal_date->m = 0;
+		$cal_date->setJdFromYmd();
+		$found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
+		// Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
+		$found_facts = array_unique($found_facts);
+		break;
 }
 
 // Group the facts by family/individual
@@ -369,39 +369,39 @@ 
 $cal_facts = array();
 
 switch ($view) {
-case 'year':
-case 'day':
-	foreach ($found_facts as $fact) {
-		$record = $fact->getParent();
-		$xref   = $record->getXref();
-		if ($record instanceof Individual) {
-			if (empty($indis[$xref])) {
-				$indis[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
-			}
-		} elseif ($record instanceof Family) {
-			if (empty($indis[$xref])) {
-				$fams[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
+	case 'year':
+	case 'day':
+		foreach ($found_facts as $fact) {
+			$record = $fact->getParent();
+			$xref   = $record->getXref();
+			if ($record instanceof Individual) {
+				if (empty($indis[$xref])) {
+					$indis[$xref] = calendar_fact_text($fact, true);
+				} else {
+					$indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
+				}
+			} elseif ($record instanceof Family) {
+				if (empty($indis[$xref])) {
+					$fams[$xref] = calendar_fact_text($fact, true);
+				} else {
+					$fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
+				}
 			}
 		}
-	}
-	break;
-case 'month':
-	foreach ($found_facts as $d => $facts) {
-		$cal_facts[$d] = array();
-		foreach ($facts as $fact) {
-			$xref = $fact->getParent()->getXref();
-			if (empty($cal_facts[$d][$xref])) {
-				$cal_facts[$d][$xref] = calendar_fact_text($fact, false);
-			} else {
-				$cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
+		break;
+	case 'month':
+		foreach ($found_facts as $d => $facts) {
+			$cal_facts[$d] = array();
+			foreach ($facts as $fact) {
+				$xref = $fact->getParent()->getXref();
+				if (empty($cal_facts[$d][$xref])) {
+					$cal_facts[$d][$xref] = calendar_fact_text($fact, false);
+				} else {
+					$cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
+				}
 			}
 		}
-	}
-	break;
+		break;
 }
 
 switch ($view) {
@@ -498,26 +498,26 @@ 
 			// Show a converted date
 			foreach (explode('_and_', $CALENDAR_FORMAT) as $convcal) {
 				switch ($convcal) {
-				case 'french':
-					$alt_date = new FrenchDate($cal_date->minJD + $d - 1);
-					break;
-				case 'gregorian':
-					$alt_date = new GregorianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jewish':
-					$alt_date = new JewishDate($cal_date->minJD + $d - 1);
-					break;
-				case 'julian':
-					$alt_date = new JulianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'hijri':
-					$alt_date = new HijriDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jalali':
-					$alt_date = new JalaliDate($cal_date->minJD + $d - 1);
-					break;
-				default:
-					break 2;
+					case 'french':
+						$alt_date = new FrenchDate($cal_date->minJD + $d - 1);
+						break;
+					case 'gregorian':
+						$alt_date = new GregorianDate($cal_date->minJD + $d - 1);
+						break;
+					case 'jewish':
+						$alt_date = new JewishDate($cal_date->minJD + $d - 1);
+						break;
+					case 'julian':
+						$alt_date = new JulianDate($cal_date->minJD + $d - 1);
+						break;
+					case 'hijri':
+						$alt_date = new HijriDate($cal_date->minJD + $d - 1);
+						break;
+					case 'jalali':
+						$alt_date = new JalaliDate($cal_date->minJD + $d - 1);
+						break;
+					default:
+						break 2;
 				}
 				if (get_class($alt_date) !== get_class($cal_date) && $alt_date->inValidRange()) {
 					echo '<span class="rtl_cal_day">' . $alt_date->format("%j %M") . '</span>';
@@ -627,17 +627,17 @@ 
 		$html .= $tag1 . '<a href="' . $tmp->getHtmlUrl() . '">' . $tmp->getFullName() . '</a> ';
 		if ($show_sex_symbols && $tmp instanceof Individual) {
 			switch ($tmp->getSex()) {
-			case 'M':
-				$html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
-				++$males;
-				break;
-			case 'F':
-				$html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
-				++$females;
-				break;
-			default:
-				$html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
-				break;
+				case 'M':
+					$html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
+					++$males;
+					break;
+				case 'F':
+					$html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
+					++$females;
+					break;
+				default:
+					$html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
+					break;
 			}
 		}
 		$html .= '<div class="indent">' . $facts . '</div>' . $tag2;

app/Theme/MinimalTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}