fisharebest / webtrees

app/Module/FamilyNavigatorModule.php

Indentation +2 added lines, -2 removed lines

@@ -150,8 +150,8 @@
 				}
 
 				foreach ($family->getChildren() as $child) {
-          $icon = $controller->record === $child ? '<i class="icon-selected"></i>' : '';
-          $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child));
+					$icon = $controller->record === $child ? '<i class="icon-selected"></i>' : '';
+					$menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child));
 					$menu->addSubmenu(new Menu($this->getFamily($child)));
 					?>
 					<tr class="text-center wt-child wt-gender-<?= $child->getSex() ?>">

app/Module/RelativesTabModule.php

Indentation +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 					$row_class .= ' old';
 				}
 				$icon = $controller->record === $person ? '<i class="icon-selected"></i>' : '';
-        ?>
+				?>
 				<tr class="<?= $row_class ?>">
 					<th scope="row">
 					<?= $icon ?>

app/Datatables.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 		return [
 			'data-language'     => json_encode($language),
-		  'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)])
+			'data-length-menu' => json_encode([array_keys($length_menu), array_values($length_menu)])
 		];
 	}
 

app/Theme/AbstractTheme.php

Indentation +3 added lines, -3 removed lines

@@ -101,9 +101,9 @@
 		'info'    => 'fa fa-info-circle',
 		'warning' => 'fa fa-exclamation-circle',
 
-	  // Icons for file types
-	  'mime-application-pdf' => '',
-	  'mime-text-html'       => '',
+		// Icons for file types
+		'mime-application-pdf' => '',
+		'mime-text-html'       => '',
 
 		// Other icons
 		'mail'   => 'fa fa-envelope-o',

Switch Indentation +20 added lines, -20 removed lines

@@ -329,12 +329,12 @@ 
 		$method = $user->getPreference('contactmethod');
 
 		switch ($method) {
-		case 'none':
-			return '';
-		case 'mailto':
-			return '<a href="mailto:' . Html::escape($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
-		default:
-			return '<a href="message.php?to=' . rawurlencode($user->getUserName()) . '&amp;ged=' . $this->tree->getNameUrl() . '&amp;url=' . Html::escape(Functions::getQueryUrl()) . '">' . $user->getRealNameHtml() . '</a>';
+			case 'none':
+				return '';
+			case 'mailto':
+				return '<a href="mailto:' . Html::escape($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
+			default:
+				return '<a href="message.php?to=' . rawurlencode($user->getUserName()) . '&amp;ged=' . $this->tree->getNameUrl() . '&amp;url=' . Html::escape(Functions::getQueryUrl()) . '">' . $user->getRealNameHtml() . '</a>';
 		}
 	}
 
@@ -1413,20 +1413,20 @@ 
 		$records  = [];
 		foreach ($favorites as $favorite) {
 			switch ($favorite['type']) {
-			case 'URL':
-				$submenus[] = new Menu($favorite['title'], $favorite['url']);
-				break;
-			case 'INDI':
-			case 'FAM':
-			case 'SOUR':
-			case 'OBJE':
-			case 'NOTE':
-				$record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
-				if ($record && $record->canShowName()) {
-					$submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
-					$records[]  = $record;
-				}
-				break;
+				case 'URL':
+					$submenus[] = new Menu($favorite['title'], $favorite['url']);
+					break;
+				case 'INDI':
+				case 'FAM':
+				case 'SOUR':
+				case 'OBJE':
+				case 'NOTE':
+					$record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
+					if ($record && $record->canShowName()) {
+						$submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
+						$records[]  = $record;
+					}
+					break;
 			}
 		}
 

app/MediaFile.php

Indentation +6 added lines, -6 removed lines

@@ -31,17 +31,17 @@
 	private $multimedia_format = '';
 
 	/** @var string The type of document; newspaper, microfiche, etc. */
-  private $source_media_type = '';
+	private $source_media_type = '';
 	/** @var string The filename */
 
 	/** @var string The name of the document */
-  private $descriptive_title = '';
+	private $descriptive_title = '';
 
-  /** @var Media $media The media object to which this file belongs */
-  private $media;
+	/** @var Media $media The media object to which this file belongs */
+	private $media;
 
-  /** @var string */
-  private $fact_id;
+	/** @var string */
+	private $fact_id;
 
 	/**
 	 * Create a MediaFile from raw GEDCOM data.

Switch Indentation +50 added lines, -50 removed lines

@@ -387,56 +387,56 @@
 	public function mimeType() {
 		// Themes contain icon definitions for some/all of these mime-types
 		switch ($this->extension()) {
-		case 'bmp':
-			return 'image/bmp';
-		case 'doc':
-			return 'application/msword';
-		case 'docx':
-			return 'application/msword';
-		case 'ged':
-			return 'text/x-gedcom';
-		case 'gif':
-			return 'image/gif';
-		case 'htm':
-			return 'text/html';
-		case 'html':
-			return 'text/html';
-		case 'jpeg':
-			return 'image/jpeg';
-		case 'jpg':
-			return 'image/jpeg';
-		case 'mov':
-			return 'video/quicktime';
-		case 'mp3':
-			return 'audio/mpeg';
-		case 'mp4':
-			return 'video/mp4';
-		case 'ogv':
-			return 'video/ogg';
-		case 'pdf':
-			return 'application/pdf';
-		case 'png':
-			return 'image/png';
-		case 'rar':
-			return 'application/x-rar-compressed';
-		case 'swf':
-			return 'application/x-shockwave-flash';
-		case 'svg':
-			return 'image/svg';
-		case 'tif':
-			return 'image/tiff';
-		case 'tiff':
-			return 'image/tiff';
-		case 'xls':
-			return 'application/vnd-ms-excel';
-		case 'xlsx':
-			return 'application/vnd-ms-excel';
-		case 'wmv':
-			return 'video/x-ms-wmv';
-		case 'zip':
-			return 'application/zip';
-		default:
-			return 'application/octet-stream';
+			case 'bmp':
+				return 'image/bmp';
+			case 'doc':
+				return 'application/msword';
+			case 'docx':
+				return 'application/msword';
+			case 'ged':
+				return 'text/x-gedcom';
+			case 'gif':
+				return 'image/gif';
+			case 'htm':
+				return 'text/html';
+			case 'html':
+				return 'text/html';
+			case 'jpeg':
+				return 'image/jpeg';
+			case 'jpg':
+				return 'image/jpeg';
+			case 'mov':
+				return 'video/quicktime';
+			case 'mp3':
+				return 'audio/mpeg';
+			case 'mp4':
+				return 'video/mp4';
+			case 'ogv':
+				return 'video/ogg';
+			case 'pdf':
+				return 'application/pdf';
+			case 'png':
+				return 'image/png';
+			case 'rar':
+				return 'application/x-rar-compressed';
+			case 'swf':
+				return 'application/x-shockwave-flash';
+			case 'svg':
+				return 'image/svg';
+			case 'tif':
+				return 'image/tiff';
+			case 'tiff':
+				return 'image/tiff';
+			case 'xls':
+				return 'application/vnd-ms-excel';
+			case 'xlsx':
+				return 'application/vnd-ms-excel';
+			case 'wmv':
+				return 'video/x-ms-wmv';
+			case 'zip':
+				return 'application/zip';
+			default:
+				return 'application/octet-stream';
 		}
 	}
 }

edit_changes.php

Switch Indentation +85 added lines, -85 removed lines

@@ -35,72 +35,72 @@ 
 $url       = Filter::get('url', null, 'index.php');
 
 switch ($action) {
-case 'reject':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	// Reject 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([$gedcom_id, $xref, $change_id]);
-	break;
-case 'accept':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
-	// Accept a change, and all previous changes to the same record
-	$all_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([$gedcom_id, $xref, $change_id])->fetchAll();
-	foreach ($all_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 'reject':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		// Reject 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([$gedcom_id, $xref, $change_id]);
+		break;
+	case 'accept':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute([$change_id])->fetchOne();
+		// Accept a change, and all previous changes to the same record
+		$all_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([$gedcom_id, $xref, $change_id])->fetchAll();
+		foreach ($all_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([$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([$change->change_id]);
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
-case 'rejectall':
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET status='rejected'" .
-		" WHERE status='pending' AND gedcom_id=?"
-	)->execute([$WT_TREE->getTreeId()]);
-	break;
-case 'acceptall':
-	$all_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([$WT_TREE->getTreeId()])->fetchAll();
-	foreach ($all_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 'rejectall':
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET status='rejected'" .
+			" WHERE status='pending' AND gedcom_id=?"
+		)->execute([$WT_TREE->getTreeId()]);
+		break;
+	case 'acceptall':
+		$all_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([$WT_TREE->getTreeId()])->fetchAll();
+		foreach ($all_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([$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([$change->change_id]);
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
+		break;
 }
 
 $rows = Database::prepare(
@@ -120,27 +120,27 @@ 
 	preg_match('/^0 (?:@' . WT_REGEX_XREF . '@ )?(' . WT_REGEX_TAG . ')/', $row->old_gedcom . $row->new_gedcom, $match);
 
 	switch ($match[1]) {
-	case 'INDI':
-		$row->record = new Individual($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'FAM':
-		$row->record = new Family($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'SOUR':
-		$row->record = new Source($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'REPO':
-		$row->record = new Repository($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'OBJE':
-		$row->record = new Media($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	case 'NOTE':
-		$row->record = new Note($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
-	default:
-		$row->record = new GedcomRecord($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
-		break;
+		case 'INDI':
+			$row->record = new Individual($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'FAM':
+			$row->record = new Family($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'SOUR':
+			$row->record = new Source($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'REPO':
+			$row->record = new Repository($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'OBJE':
+			$row->record = new Media($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		case 'NOTE':
+			$row->record = new Note($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
+		default:
+			$row->record = new GedcomRecord($row->xref, $row->old_gedcom, $row->new_gedcom, $tree);
+			break;
 	}
 
 	$row->accept_url = Html::url('edit_changes.php', [

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;
 	}
 }

famlist.php

Switch Indentation +26 added lines, -26 removed lines

@@ -37,12 +37,12 @@ 
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
-case 'no':
-case 'yes':
-	Auth::user()->setPreference('famlist.php_show_marnm', $show_marnm);
-	break;
-default:
-	$show_marnm = Auth::user()->getPreference('famlist.php_show_marnm');
+	case 'no':
+	case 'yes':
+		Auth::user()->setPreference('famlist.php_show_marnm', $show_marnm);
+		break;
+	default:
+		$show_marnm = Auth::user()->getPreference('famlist.php_show_marnm');
 }
 
 // Make sure selections are consistent.
@@ -79,16 +79,16 @@ 
 	}
 	$url = '?surname=' . rawurlencode($surname) . '&ged=' . $controller->tree()->getNameUrl();
 	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $controller->tree()->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Html::escape($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $controller->tree()->getNameUrl();
-		break;
+		case '':
+			break;
+		case '@':
+			$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+			$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $controller->tree()->getNameUrl();
+			break;
+		default:
+			$legend .= ', ' . Html::escape($falpha) . '…';
+			$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $controller->tree()->getNameUrl();
+			break;
 	}
 	$show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
@@ -173,16 +173,16 @@ 
 	if ($show === 'surn') {
 		// Show the surname list
 		switch ($controller->tree()->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, 'famlist.php', $controller->tree());
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, 'famlist.php', true, $controller->tree());
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, 'famlist.php', $controller->tree());
-			break;
+			case 'style1':
+				echo FunctionsPrintLists::surnameList($surns, 3, true, 'famlist.php', $controller->tree());
+				break;
+			case 'style3':
+				echo FunctionsPrintLists::surnameTagCloud($surns, 'famlist.php', true, $controller->tree());
+				break;
+			case 'style2':
+			default:
+				echo FunctionsPrintLists::surnameTable($surns, 'famlist.php', $controller->tree());
+				break;
 		}
 	} else {
 		// Show the list

setup.php

Switch Indentation +8 added lines, -8 removed lines

@@ -53,15 +53,15 @@
 $route   = $request->get('route');
 
 switch ($method . ':' . $route) {
-default:
-	$url      = Html::url('setup.php', ['route' => 'setup']);
-	$response = new RedirectResponse($url);
-	break;
+	default:
+		$url      = Html::url('setup.php', ['route' => 'setup']);
+		$response = new RedirectResponse($url);
+		break;
 
-case 'GET:setup':
-case 'POST:setup':
-	$response = (new SetupController)->setup($request);
-	break;
+	case 'GET:setup':
+	case 'POST:setup':
+		$response = (new SetupController)->setup($request);
+		break;
 }
 
 $response->prepare($request)->send();