fisharebest / webtrees

app/Module/DescendancyModule.php

Switch Indentation +13 added lines, -13 removed lines

@@ -50,19 +50,19 @@
 		header('Content-Type: text/html; charset=UTF-8');
 
 		switch ($mod_action) {
-		case 'search':
-			$search = Filter::get('search');
-			echo $this->search($search, $WT_TREE);
-			break;
-		case 'descendants':
-			$individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
-			if ($individual) {
-				echo $this->loadSpouses($individual, 1);
-			}
-			break;
-		default:
-			http_response_code(404);
-			break;
+		    case 'search':
+			    $search = Filter::get('search');
+			    echo $this->search($search, $WT_TREE);
+			    break;
+		    case 'descendants':
+			    $individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
+			    if ($individual) {
+				    echo $this->loadSpouses($individual, 1);
+			    }
+			    break;
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 

app/Module/IndividualFactsTabModule.php

Switch Indentation +65 added lines, -65 removed lines

@@ -60,19 +60,19 @@ 
 		// The individual’s own facts
 		foreach ($controller->record->getFacts() as $fact) {
 			switch ($fact->getTag()) {
-			case 'SEX':
-			case 'NAME':
-			case 'SOUR':
-			case 'OBJE':
-			case 'NOTE':
-			case 'FAMC':
-			case 'FAMS':
-				break;
-			default:
-				if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) {
-					$indifacts[] = $fact;
-				}
-				break;
+			    case 'SEX':
+			    case 'NAME':
+			    case 'SOUR':
+			    case 'OBJE':
+			    case 'NOTE':
+			    case 'FAMC':
+			    case 'FAMS':
+				    break;
+			    default:
+				    if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) {
+					    $indifacts[] = $fact;
+				    }
+				    break;
 			}
 		}
 
@@ -80,19 +80,19 @@ 
 		foreach ($controller->record->getSpouseFamilies() as $family) {
 			foreach ($family->getFacts() as $fact) {
 				switch ($fact->getTag()) {
-				case 'SOUR':
-				case 'NOTE':
-				case 'OBJE':
-				case 'CHAN':
-				case '_UID':
-				case 'RIN':
-				case 'HUSB':
-				case 'WIFE':
-				case 'CHIL':
-					break;
-				default:
-					$indifacts[] = $fact;
-					break;
+				    case 'SOUR':
+				    case 'NOTE':
+				    case 'OBJE':
+				    case 'CHAN':
+				    case '_UID':
+				    case 'RIN':
+				    case 'HUSB':
+				    case 'WIFE':
+				    case 'CHIL':
+					    break;
+				    default:
+					    $indifacts[] = $fact;
+					    break;
 				}
 			}
 			$spouse = $family->getSpouse($controller->record);
@@ -239,27 +239,27 @@ 
 
 		// Deal with recursion.
 		switch ($option) {
-		case '_CHIL':
-			// Add grandchildren
-			foreach ($family->getChildren() as $child) {
-				foreach ($child->getSpouseFamilies() as $cfamily) {
-					switch ($child->getSex()) {
-					case 'M':
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					case 'F':
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					default:
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					}
+		    case '_CHIL':
+			    // Add grandchildren
+			    foreach ($family->getChildren() as $child) {
+				    foreach ($child->getSpouseFamilies() as $cfamily) {
+					    switch ($child->getSex()) {
+					        case 'M':
+						        foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) {
+							        $facts[] = $fact;
+						        }
+						        break;
+					        case 'F':
+						        foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) {
+							        $facts[] = $fact;
+						        }
+						        break;
+					        default:
+						        foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) {
+							        $facts[] = $fact;
+						        }
+						        break;
+					    }
 				}
 			}
 			break;
@@ -424,24 +424,24 @@ 
 					foreach ($parent->getFacts(WT_EVENTS_DEAT) as $fact) {
 						if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
 							switch ($sosa) {
-							case 1:
-								// Convert the event to a close relatives event.
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_PARE');
-								$facts[] = $rela_fact;
-								break;
-							case 2:
-								// Convert the event to a close relatives event
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GPA1');
-								$facts[] = $rela_fact;
-								break;
-							case 3:
-								// Convert the event to a close relatives event
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GPA2');
-								$facts[] = $rela_fact;
-								break;
+							    case 1:
+								    // Convert the event to a close relatives event.
+								    $rela_fact = clone($fact);
+								    $rela_fact->setTag('_' . $fact->getTag() . '_PARE');
+								    $facts[] = $rela_fact;
+								    break;
+							    case 2:
+								    // Convert the event to a close relatives event
+								    $rela_fact = clone($fact);
+								    $rela_fact->setTag('_' . $fact->getTag() . '_GPA1');
+								    $facts[] = $rela_fact;
+								    break;
+							    case 3:
+								    // Convert the event to a close relatives event
+								    $rela_fact = clone($fact);
+								    $rela_fact->setTag('_' . $fact->getTag() . '_GPA2');
+								    $facts[] = $rela_fact;
+								    break;
 							}
 						}
 					}

app/Module/ChartsBlockModule.php

Switch Indentation +51 added lines, -51 removed lines

@@ -82,57 +82,57 @@
 		if ($person) {
 			$content = '';
 			switch ($type) {
-			case 'pedigree':
-				$title .= I18N::translate('Pedigree of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
-				$content .= '<td>';
-				ob_start();
-				FunctionsPrint::printPedigreePerson($person, $details);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printPersonPedigree($person, 1);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '</tr></table>';
-				break;
-			case 'descendants':
-				$title .= I18N::translate('Descendants of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				ob_start();
-				$chartController->printDescendency($person, 1, false);
-				$content .= ob_get_clean();
-				break;
-			case 'hourglass':
-				$title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printDescendency($person, 1, false);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printPersonPedigree($person, 1);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '</tr></table>';
-				break;
-			case 'treenav':
-				$title .= I18N::translate('Interactive tree of %s', $person->getFullName());
-				$mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
-				$tv  = new TreeView;
-				$content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
-				$content .= '<script src="' . $mod->js() . '"></script>';
-				list($html, $js) = $tv->drawViewport($person, 2);
-				$content .= $html . '<script>' . $js . '</script>';
-				break;
+			    case 'pedigree':
+				    $title .= I18N::translate('Pedigree of %s', $person->getFullName());
+				    $chartController = new HourglassController($person->getXref(), $details, false);
+				    $controller->addInlineJavascript($chartController->setupJavascript());
+				    $content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
+				    $content .= '<td>';
+				    ob_start();
+				    FunctionsPrint::printPedigreePerson($person, $details);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '<td>';
+				    ob_start();
+				    $chartController->printPersonPedigree($person, 1);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '</tr></table>';
+				    break;
+			    case 'descendants':
+				    $title .= I18N::translate('Descendants of %s', $person->getFullName());
+				    $chartController = new HourglassController($person->getXref(), $details, false);
+				    $controller->addInlineJavascript($chartController->setupJavascript());
+				    ob_start();
+				    $chartController->printDescendency($person, 1, false);
+				    $content .= ob_get_clean();
+				    break;
+			    case 'hourglass':
+				    $title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
+				    $chartController = new HourglassController($person->getXref(), $details, false);
+				    $controller->addInlineJavascript($chartController->setupJavascript());
+				    $content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
+				    $content .= '<td>';
+				    ob_start();
+				    $chartController->printDescendency($person, 1, false);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '<td>';
+				    ob_start();
+				    $chartController->printPersonPedigree($person, 1);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '</tr></table>';
+				    break;
+			    case 'treenav':
+				    $title .= I18N::translate('Interactive tree of %s', $person->getFullName());
+				    $mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
+				    $tv  = new TreeView;
+				    $content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
+				    $content .= '<script src="' . $mod->js() . '"></script>';
+				    list($html, $js) = $tv->drawViewport($person, 2);
+				    $content .= $html . '<script>' . $js . '</script>';
+				    break;
 			}
 		} else {
 			$content = I18N::translate('You must select an individual and a chart type in the block preferences');

app/Module/FamilyTreeFavoritesModule.php

Switch Indentation +44 added lines, -44 removed lines

@@ -85,43 +85,43 @@ 
 
 		$action = Filter::get('action');
 		switch ($action) {
-		case 'deletefav':
-			$favorite_id = Filter::getInteger('favorite_id');
-			if ($favorite_id) {
-				self::deleteFavorite($favorite_id);
-			}
-			break;
-		case 'addfav':
-			$gid      = Filter::get('gid', WT_REGEX_XREF);
-			$favnote  = Filter::get('favnote');
-			$url      = Filter::getUrl('url');
-			$favtitle = Filter::get('favtitle');
+		    case 'deletefav':
+			    $favorite_id = Filter::getInteger('favorite_id');
+			    if ($favorite_id) {
+				    self::deleteFavorite($favorite_id);
+			    }
+			    break;
+		    case 'addfav':
+			    $gid      = Filter::get('gid', WT_REGEX_XREF);
+			    $favnote  = Filter::get('favnote');
+			    $url      = Filter::getUrl('url');
+			    $favtitle = Filter::get('favtitle');
 
-			if ($gid) {
-				$record = GedcomRecord::getInstance($gid, $WT_TREE);
-				if ($record && $record->canShow()) {
-					self::addFavorite(array(
-						'user_id'   => $ctype === 'user' ? Auth::id() : null,
-						'gedcom_id' => $WT_TREE->getTreeId(),
-						'gid'       => $record->getXref(),
-						'type'      => $record::RECORD_TYPE,
-						'url'       => null,
-						'note'      => $favnote,
-						'title'     => $favtitle,
-					));
-				}
-			} elseif ($url) {
-				self::addFavorite(array(
-					'user_id'   => $ctype === 'user' ? Auth::id() : null,
-					'gedcom_id' => $WT_TREE->getTreeId(),
-					'gid'       => null,
-					'type'      => 'URL',
-					'url'       => $url,
-					'note'      => $favnote,
-					'title'     => $favtitle ? $favtitle : $url,
-				));
-			}
-			break;
+			    if ($gid) {
+				    $record = GedcomRecord::getInstance($gid, $WT_TREE);
+				    if ($record && $record->canShow()) {
+					    self::addFavorite(array(
+						    'user_id'   => $ctype === 'user' ? Auth::id() : null,
+						    'gedcom_id' => $WT_TREE->getTreeId(),
+						    'gid'       => $record->getXref(),
+						    'type'      => $record::RECORD_TYPE,
+						    'url'       => null,
+						    'note'      => $favnote,
+						    'title'     => $favtitle,
+					    ));
+				    }
+			    } elseif ($url) {
+				    self::addFavorite(array(
+					    'user_id'   => $ctype === 'user' ? Auth::id() : null,
+					    'gedcom_id' => $WT_TREE->getTreeId(),
+					    'gid'       => null,
+					    'type'      => 'URL',
+					    'url'       => $url,
+					    'note'      => $favnote,
+					    'title'     => $favtitle ? $favtitle : $url,
+				    ));
+			    }
+			    break;
 		}
 
 		$block = $this->getBlockSetting($block_id, 'block', '0');
@@ -168,14 +168,14 @@ 
 						if ($record instanceof Individual) {
 							$content .= '<div id="box' . $favorite["gid"] . '.0" class="person_box action_header';
 							switch ($record->getSex()) {
-							case 'M':
-								break;
-							case 'F':
-								$content .= 'F';
-								break;
-							default:
-								$content .= 'NN';
-								break;
+							    case 'M':
+								    break;
+							    case 'F':
+								    $content .= 'F';
+								    break;
+							    default:
+								    $content .= 'NN';
+								    break;
 							}
 							$content .= '">';
 							if ($ctype == "user" || Auth::isManager($WT_TREE)) {

app/Module/ClippingsCartModule.php

Switch Indentation +131 added lines, -131 removed lines

@@ -75,37 +75,37 @@ 
 		}
 
 		switch ($mod_action) {
-		case 'ajax':
-			$html = $this->getSidebarAjaxContent();
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $html;
-			break;
-		case 'index':
-			global $controller, $WT_TREE;
-
-			$MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
-
-			$clip_ctrl = new ClippingsCartController;
-			$cart      = Session::get('cart');
-
-			$controller = new PageController;
-			$controller
-				->setPageTitle($this->getTitle())
-				->pageHeader()
-				->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-				->addInlineJavascript('autocomplete();');
-
-			echo '<script>';
-			echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
-			echo '</script>';
-
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
-			}
-
-			if ($clip_ctrl->action == 'add') {
-				$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
-				if ($clip_ctrl->type === 'FAM') { ?>
+		    case 'ajax':
+			    $html = $this->getSidebarAjaxContent();
+			    header('Content-Type: text/html; charset=UTF-8');
+			    echo $html;
+			    break;
+		    case 'index':
+			    global $controller, $WT_TREE;
+
+			    $MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
+
+			    $clip_ctrl = new ClippingsCartController;
+			    $cart      = Session::get('cart');
+
+			    $controller = new PageController;
+			    $controller
+				    ->setPageTitle($this->getTitle())
+				    ->pageHeader()
+				    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+				    ->addInlineJavascript('autocomplete();');
+
+			    echo '<script>';
+			    echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
+			    echo '</script>';
+
+			    if (!$cart[$WT_TREE->getTreeId()]) {
+				    echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
+			    }
+
+			    if ($clip_ctrl->action == 'add') {
+				    $record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
+				    if ($clip_ctrl->type === 'FAM') { ?>
 					<form action="module.php" method="get">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -131,14 +131,14 @@ 
 									<td class="optionbox">
 										<input type="radio" name="others" value="members" checked>
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their children', $record->getFullName()); ?>
+										    I18N::translate('%s and their children', $record->getFullName()); ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="optionbox">
 										<input type="radio" name="others" value="descendants">
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their descendants', $record->getFullName()); ?>
+										    I18N::translate('%s and their descendants', $record->getFullName()); ?>
 									</td>
 								</tr>
 							</tbody>
@@ -179,14 +179,14 @@ 
 										<label>
 											<input type="radio" name="others" value="parents">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her parents and siblings', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his parents and siblings', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her parents and siblings', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his parents and siblings', $record->getFullName());
+											    }
+											    ?>
 										</label>
 									</td>
 								</tr>
@@ -195,14 +195,14 @@ 
 										<label>
 											<input type="radio" name="others" value="members">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and children', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and children', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her spouses and children', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his spouses and children', $record->getFullName());
+											    }
+											    ?>
 										</label>
 									</td>
 								</tr>
@@ -211,18 +211,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestors" id="ancestors">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s and her ancestors', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s and his ancestors', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s and her ancestors', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s and his ancestors', $record->getFullName());
+											    }
+											    ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
+    										<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
 									</td>
 								</tr>
 								<tr>
@@ -230,18 +230,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her ancestors and their families', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his ancestors and their families', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her ancestors and their families', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his ancestors and their families', $record->getFullName());
+											    }
+											    ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
+    										<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
 									</td>
 								</tr>
 								<tr>
@@ -249,18 +249,18 @@ 
 										<label>
 											<input type="radio" name="others" value="descendants" id="descendants">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and descendants', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and descendants', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her spouses and descendants', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his spouses and descendants', $record->getFullName());
+											    }
+											    ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
+    										<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
 									</td>
 								</tr>
 							</tbody>
@@ -302,7 +302,7 @@ 
 										<label>
 											<input type="radio" name="others" value="linked">
 											<?php echo /* I18N: %s is the name of a source */
-											I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
+											    I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
 										</label>
 									</td>
 								</tr>
@@ -317,12 +317,12 @@ 
 						</table>
 					</form>
 				<?php }
-			}
+			    }
 
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				if ($clip_ctrl->action != 'add') {
-					echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
-					?>
+			    if (!$cart[$WT_TREE->getTreeId()]) {
+				    if ($clip_ctrl->action != 'add') {
+					    echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
+					    ?>
 					<form method="get" name="addin" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -342,25 +342,25 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+    										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+    										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
+    										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
 						</table>
 					</form>
 					<?php
-				}
+				    }
 
-				// -- end new lines
-				echo I18N::translate('Your clippings cart is empty.');
-			} else {
-				// Keep track of the INDI from the parent page, otherwise it will
-				// get lost after ajax updates
-				$pid = Filter::get('pid', WT_REGEX_XREF);
+				    // -- end new lines
+				    echo I18N::translate('Your clippings cart is empty.');
+			    } else {
+				    // Keep track of the INDI from the parent page, otherwise it will
+				    // get lost after ajax updates
+				    $pid = Filter::get('pid', WT_REGEX_XREF);
 
-				if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
+				    if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
 					<form method="get" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -468,9 +468,9 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+    										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+    										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
+    										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
@@ -500,32 +500,32 @@ 
 					</thead>
 					<tbody>
 						<?php
-						foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
-							$record = GedcomRecord::getInstance($xref, $WT_TREE);
-							if ($record) {
-								switch ($record::RECORD_TYPE) {
-								case 'INDI':
-									$icon = 'icon-indis';
-									break;
-								case 'FAM':
-									$icon = 'icon-sfamily';
-									break;
-								case 'SOUR':
-									$icon = 'icon-source';
-									break;
-								case 'REPO':
-									$icon = 'icon-repository';
-									break;
-								case 'NOTE':
-									$icon = 'icon-note';
-									break;
-								case 'OBJE':
-									$icon = 'icon-media';
-									break;
-								default:
-									$icon = 'icon-clippings';
-									break;
-								}
+						    foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
+							    $record = GedcomRecord::getInstance($xref, $WT_TREE);
+							    if ($record) {
+								    switch ($record::RECORD_TYPE) {
+								        case 'INDI':
+									        $icon = 'icon-indis';
+									        break;
+								        case 'FAM':
+									        $icon = 'icon-sfamily';
+									        break;
+								        case 'SOUR':
+									        $icon = 'icon-source';
+									        break;
+								        case 'REPO':
+									        $icon = 'icon-repository';
+									        break;
+								        case 'NOTE':
+									        $icon = 'icon-note';
+									        break;
+								        case 'OBJE':
+									        $icon = 'icon-media';
+									        break;
+								        default:
+									        $icon = 'icon-clippings';
+									        break;
+								    }
 								?>
 								<tr>
 									<td class="list_value">
@@ -544,9 +544,9 @@ 
 				<?php
 			}
 			break;
-		default:
-			http_response_code(404);
-			break;
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 
@@ -695,12 +695,12 @@ 
 				$record = GedcomRecord::getInstance($xref, $WT_TREE);
 				if ($record instanceof Individual || $record instanceof Family) {
 					switch ($record::RECORD_TYPE) {
-					case 'INDI':
-						$icon = 'icon-indis';
-						break;
-					case 'FAM':
-						$icon = 'icon-sfamily';
-						break;
+					    case 'INDI':
+						    $icon = 'icon-indis';
+						    break;
+					    case 'FAM':
+						    $icon = 'icon-sfamily';
+						    break;
 					}
 					$out .= '<li>';
 					if (!empty($icon)) {

app/Module/TopSurnamesModule.php

Switch Indentation +17 added lines, -17 removed lines

@@ -98,23 +98,23 @@
 		}
 
 		switch ($infoStyle) {
-		case 'tagcloud':
-			uksort($all_surnames, '\Fisharebest\Webtrees\I18N::strcasecmp');
-			$content = FunctionsPrintLists::surnameTagCloud($all_surnames, 'indilist.php', true, $WT_TREE);
-			break;
-		case 'list':
-			uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
-			$content = FunctionsPrintLists::surnameList($all_surnames, 1, true, 'indilist.php', $WT_TREE);
-			break;
-		case 'array':
-			uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
-			$content = FunctionsPrintLists::surnameList($all_surnames, 2, true, 'indilist.php', $WT_TREE);
-			break;
-		case 'table':
-		default:
-			uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
-			$content = FunctionsPrintLists::surnameTable($all_surnames, 'indilist.php', $WT_TREE);
-			break;
+		    case 'tagcloud':
+			    uksort($all_surnames, '\Fisharebest\Webtrees\I18N::strcasecmp');
+			    $content = FunctionsPrintLists::surnameTagCloud($all_surnames, 'indilist.php', true, $WT_TREE);
+			    break;
+		    case 'list':
+			    uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
+			    $content = FunctionsPrintLists::surnameList($all_surnames, 1, true, 'indilist.php', $WT_TREE);
+			    break;
+		    case 'array':
+			    uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
+			    $content = FunctionsPrintLists::surnameList($all_surnames, 2, true, 'indilist.php', $WT_TREE);
+			    break;
+		    case 'table':
+		    default:
+			    uasort($all_surnames, '\Fisharebest\Webtrees\Module\TopSurnamesModule::surnameCountSort');
+			    $content = FunctionsPrintLists::surnameTable($all_surnames, 'indilist.php', $WT_TREE);
+			    break;
 		}
 
 		if ($template) {

app/Module/SiteMapModule.php

Switch Indentation +88 added lines, -88 removed lines

@@ -52,14 +52,14 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin':
-			$this->admin();
-			break;
-		case 'generate':
-			$this->generate(Filter::get('file'));
-			break;
-		default:
-			http_response_code(404);
+		    case 'admin':
+			    $this->admin();
+			    break;
+		    case 'generate':
+			    $this->generate(Filter::get('file'));
+			    break;
+		    default:
+			    http_response_code(404);
 		}
 	}
 
@@ -160,86 +160,86 @@ 
 			$data    = '<url><loc>' . WT_BASE_URL . 'index.php?ctype=gedcom&amp;ged=' . $tree->getNameUrl() . '</loc></url>' . PHP_EOL;
 			$records = array();
 			switch ($rec_type) {
-			case 'i':
-				$rows = Database::prepare(
-					"SELECT i_id AS xref, i_gedcom AS gedcom" .
-					" FROM `##individuals`" .
-					" WHERE i_file = :tree_id" .
-					" ORDER BY i_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Individual::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 's':
-				$rows = Database::prepare(
-					"SELECT s_id AS xref, s_gedcom AS gedcom" .
-					" FROM `##sources`" .
-					" WHERE s_file = :tree_id" .
-					" ORDER BY s_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Source::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'r':
-				$rows = Database::prepare(
-					"SELECT o_id AS xref, o_gedcom AS gedcom" .
-					" FROM `##other`" .
-					" WHERE o_file = :tree_id AND o_type = 'REPO'" .
-					" ORDER BY o_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'n':
-				$rows = Database::prepare(
-					"SELECT o_id AS xref, o_gedcom AS gedcom" .
-					" FROM `##other`" .
-					" WHERE o_file = :tree_id AND o_type = 'NOTE'" .
-					" ORDER BY o_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Note::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'm':
-				$rows = Database::prepare(
-					"SELECT m_id AS xref, m_gedcom AS gedcom" .
-					" FROM `##media`" .
-					" WHERE m_file = :tree_id" .
-					" ORDER BY m_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Media::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
+			    case 'i':
+				    $rows = Database::prepare(
+					    "SELECT i_id AS xref, i_gedcom AS gedcom" .
+					    " FROM `##individuals`" .
+					    " WHERE i_file = :tree_id" .
+					    " ORDER BY i_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Individual::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 's':
+				    $rows = Database::prepare(
+					    "SELECT s_id AS xref, s_gedcom AS gedcom" .
+					    " FROM `##sources`" .
+					    " WHERE s_file = :tree_id" .
+					    " ORDER BY s_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Source::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 'r':
+				    $rows = Database::prepare(
+					    "SELECT o_id AS xref, o_gedcom AS gedcom" .
+					    " FROM `##other`" .
+					    " WHERE o_file = :tree_id AND o_type = 'REPO'" .
+					    " ORDER BY o_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 'n':
+				    $rows = Database::prepare(
+					    "SELECT o_id AS xref, o_gedcom AS gedcom" .
+					    " FROM `##other`" .
+					    " WHERE o_file = :tree_id AND o_type = 'NOTE'" .
+					    " ORDER BY o_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Note::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 'm':
+				    $rows = Database::prepare(
+					    "SELECT m_id AS xref, m_gedcom AS gedcom" .
+					    " FROM `##media`" .
+					    " WHERE m_file = :tree_id" .
+					    " ORDER BY m_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Media::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
 			}
 			foreach ($records as $record) {
 				if ($record->canShowName()) {

app/Module/FamilyTreeNewsModule.php

Switch Indentation +6 added lines, -6 removed lines

@@ -75,12 +75,12 @@
 		global $ctype, $WT_TREE;
 
 		switch (Filter::get('action')) {
-		case 'deletenews':
-			$news_id = Filter::get('news_id');
-			if ($news_id) {
-				Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
-			}
-			break;
+		    case 'deletenews':
+			    $news_id = Filter::get('news_id');
+			    if ($news_id) {
+				    Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
+			    }
+			    break;
 		}
 
 		$more_news = Filter::getInteger('more_news');

app/Module/FamiliesSidebarModule.php

Switch Indentation +19 added lines, -19 removed lines

@@ -45,13 +45,13 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'ajax':
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $this->getSidebarAjaxContent();
-			break;
-		default:
-			http_response_code(404);
-			break;
+		    case 'ajax':
+			    header('Content-Type: text/html; charset=UTF-8');
+			    echo $this->getSidebarAjaxContent();
+			    break;
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 
@@ -149,18 +149,18 @@ 
 		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="' . I18N::translate('Search') . '"><p>';
 		foreach ($initials as $letter => $count) {
 			switch ($letter) {
-			case '@':
-				$html = I18N::translateContext('Unknown surname', '…');
-				break;
-			case ',':
-				$html = I18N::translate('None');
-				break;
-			case ' ':
-				$html = '&nbsp;';
-				break;
-			default:
-				$html = $letter;
-				break;
+			    case '@':
+				    $html = I18N::translateContext('Unknown surname', '…');
+				    break;
+			    case ',':
+				    $html = I18N::translate('None');
+				    break;
+			    case ' ':
+				    $html = '&nbsp;';
+				    break;
+			    default:
+				    $html = $letter;
+				    break;
 			}
 			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_fam_letter">' . $html . '</a>';
 			$out .= $html . " ";