fisharebest / webtrees

app/SurnameTradition.php

Switch Indentation +18 added lines, -18 removed lines

@@ -39,24 +39,24 @@
 	 */
 	public static function create($name) {
 		switch ($name) {
-		case 'paternal':
-			return new PaternalSurnameTradition;
-		case 'patrilineal':
-			return new PatrilinealSurnameTradition;
-		case 'matrilineal':
-			return new MatrilinealSurnameTradition;
-		case 'portuguese':
-			return new PortugueseSurnameTradition;
-		case 'spanish':
-			return new SpanishSurnameTradition;
-		case 'polish':
-			return new PolishSurnameTradition;
-		case 'lithuanian':
-			return new LithuanianSurnameTradition;
-		case 'icelandic':
-			return new IcelandicSurnameTradition;
-		default:
-			return new DefaultSurnameTradition;
+			case 'paternal':
+				return new PaternalSurnameTradition;
+			case 'patrilineal':
+				return new PatrilinealSurnameTradition;
+			case 'matrilineal':
+				return new MatrilinealSurnameTradition;
+			case 'portuguese':
+				return new PortugueseSurnameTradition;
+			case 'spanish':
+				return new SpanishSurnameTradition;
+			case 'polish':
+				return new PolishSurnameTradition;
+			case 'lithuanian':
+				return new LithuanianSurnameTradition;
+			case 'icelandic':
+				return new IcelandicSurnameTradition;
+			default:
+				return new DefaultSurnameTradition;
 		}
 	}
 

app/SurnameTradition/SpanishSurnameTradition.php

Switch Indentation +10 added lines, -10 removed lines

@@ -62,16 +62,16 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return [
-					'NAME' => '/' . $match['SURN1'] . '/ //',
-					'SURN' => $match['SURN1'],
-				];
-			case 'F':
-				return [
-					'NAME' => '/' . $match['SURN2'] . '/ //',
-					'SURN' => $match['SURN2'],
-				];
+				case 'M':
+					return [
+						'NAME' => '/' . $match['SURN1'] . '/ //',
+						'SURN' => $match['SURN1'],
+					];
+				case 'F':
+					return [
+						'NAME' => '/' . $match['SURN2'] . '/ //',
+						'SURN' => $match['SURN2'],
+					];
 			}
 		}
 

app/SurnameTradition/PortugueseSurnameTradition.php

Switch Indentation +10 added lines, -10 removed lines

@@ -62,16 +62,16 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return [
-					'NAME' => '// /' . $match['SURN1'] . '/',
-					'SURN' => $match['SURN1'],
-				];
-			case 'F':
-				return [
-					'NAME' => '// /' . $match['SURN2'] . '/',
-					'SURN' => $match['SURN2'],
-				];
+				case 'M':
+					return [
+						'NAME' => '// /' . $match['SURN1'] . '/',
+						'SURN' => $match['SURN1'],
+					];
+				case 'F':
+					return [
+						'NAME' => '// /' . $match['SURN2'] . '/',
+						'SURN' => $match['SURN2'],
+					];
 			}
 		}
 

app/SurnameTradition/PaternalSurnameTradition.php

Switch Indentation +11 added lines, -11 removed lines

@@ -39,17 +39,17 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SPFX_SURN, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return array_filter([
-					'NAME' => $match['NAME'],
-					'SPFX' => $match['SPFX'],
-					'SURN' => $match['SURN'],
-				]);
-			case 'F':
-				return [
-					'NAME'   => '//',
-					'_MARNM' => '/' . trim($match['SPFX'] . ' ' . $match['SURN']) . '/',
-				];
+				case 'M':
+					return array_filter([
+						'NAME' => $match['NAME'],
+						'SPFX' => $match['SPFX'],
+						'SURN' => $match['SURN'],
+					]);
+				case 'F':
+					return [
+						'NAME'   => '//',
+						'_MARNM' => '/' . trim($match['SPFX'] . ' ' . $match['SURN']) . '/',
+					];
 			}
 		}
 

app/SurnameTradition/IcelandicSurnameTradition.php

Switch Indentation +8 added lines, -8 removed lines

@@ -43,14 +43,14 @@
 	public function newChildNames($father_name, $mother_name, $child_sex) {
 		if (preg_match(self::REGEX_GIVN, $father_name, $father_match)) {
 			switch ($child_sex) {
-			case 'M':
-				return [
-					'NAME' => $father_match['GIVN'] . 'sson',
-				];
-			case 'F':
-				return [
-					'NAME' => $father_match['GIVN'] . 'sdottir',
-				];
+				case 'M':
+					return [
+						'NAME' => $father_match['GIVN'] . 'sson',
+					];
+				case 'F':
+					return [
+						'NAME' => $father_match['GIVN'] . 'sdottir',
+					];
 			}
 		}
 

app/Module/FamilyTreeFavoritesModule.php

Switch Indentation +38 added lines, -38 removed lines

@@ -84,43 +84,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()) {
+				if ($gid) {
+					$record = GedcomRecord::getInstance($gid, $WT_TREE);
+					if ($record && $record->canShow()) {
+						self::addFavorite([
+							'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([
 						'user_id'   => $ctype === 'user' ? Auth::id() : null,
 						'gedcom_id' => $WT_TREE->getTreeId(),
-						'gid'       => $record->getXref(),
-						'type'      => $record::RECORD_TYPE,
-						'url'       => null,
+						'gid'       => null,
+						'type'      => 'URL',
+						'url'       => $url,
 						'note'      => $favnote,
-						'title'     => $favtitle,
+						'title'     => $favtitle ? $favtitle : $url,
 					]);
 				}
-			} elseif ($url) {
-				self::addFavorite([
-					'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;
+				break;
 		}
 
 		$userfavs = $this->getFavorites($ctype === 'user' ? Auth::id() : $WT_TREE->getTreeId());
@@ -149,14 +149,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/ChartsBlockModule.php

Switch Indentation +51 added lines, -51 removed lines

@@ -77,57 +77,57 @@
 		if ($person) {
 			$content = '';
 			switch ($type) {
-			case 'pedigree':
-				$title           = I18N::translate('Pedigree of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref());
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
-				$content .= '<td class="myCharts">';
-				ob_start();
-				FunctionsPrint::printPedigreePerson($person);
-				$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());
-				$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());
-				$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>$("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());
+					$controller->addInlineJavascript($chartController->setupJavascript());
+					$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
+					$content .= '<td class="myCharts">';
+					ob_start();
+					FunctionsPrint::printPedigreePerson($person);
+					$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());
+					$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());
+					$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>$("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/IndividualFactsTabModule.php

Switch Indentation +64 added lines, -64 removed lines

@@ -59,19 +59,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;
 			}
 		}
 
@@ -79,19 +79,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);
@@ -233,27 +233,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;
+			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;
-					}
 				}
 			}
 			break;
@@ -418,24 +418,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/RecentChangesModule.php

Switch Indentation +46 added lines, -46 removed lines

@@ -75,12 +75,12 @@ 
 			$content .= I18N::plural('There have been no changes within the last %s day.', 'There have been no changes within the last %s days.', $days, I18N::number($days));
 		} else {
 			switch ($infoStyle) {
-			case 'list':
-				$content .= $this->changesList($records, $sortStyle, $show_user);
-				break;
-			case 'table':
-				$content .= $this->changesTable($records, $sortStyle, $show_user);
-				break;
+				case 'list':
+					$content .= $this->changesList($records, $sortStyle, $show_user);
+					break;
+				case 'table':
+					$content .= $this->changesTable($records, $sortStyle, $show_user);
+					break;
 			}
 		}
 
@@ -206,15 +206,15 @@ 
 	 */
 	private function changesList(array $records, $sort, $show_user) {
 		switch ($sort) {
-		case 'name':
-			uasort($records, ['self', 'sortByNameAndChangeDate']);
-			break;
-		case 'date_asc':
-			uasort($records, ['self', 'sortByChangeDateAndName']);
-			$records = array_reverse($records);
-			break;
-		case 'date_desc':
-			uasort($records, ['self', 'sortByChangeDateAndName']);
+			case 'name':
+				uasort($records, ['self', 'sortByNameAndChangeDate']);
+				break;
+			case 'date_asc':
+				uasort($records, ['self', 'sortByChangeDateAndName']);
+				$records = array_reverse($records);
+				break;
+			case 'date_desc':
+				uasort($records, ['self', 'sortByChangeDateAndName']);
 		}
 
 		$html = '';
@@ -259,16 +259,16 @@ 
 		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
 
 		switch ($sort) {
-		case 'name':
-		default:
-			$aaSorting = "[1,'asc'], [2,'desc']";
-			break;
-		case 'date_asc':
-			$aaSorting = "[2,'asc'], [1,'asc']";
-			break;
-		case 'date_desc':
-			$aaSorting = "[2,'desc'], [1,'asc']";
-			break;
+			case 'name':
+			default:
+				$aaSorting = "[1,'asc'], [2,'desc']";
+				break;
+			case 'date_asc':
+				$aaSorting = "[2,'asc'], [1,'asc']";
+				break;
+			case 'date_desc':
+				$aaSorting = "[2,'desc'], [1,'asc']";
+				break;
 		}
 
 		$html = '';
@@ -302,27 +302,27 @@ 
 		foreach ($records as $record) {
 			$html .= '<tr><td>';
 			switch ($record::RECORD_TYPE) {
-			case 'INDI':
-				$html .= FontAwesome::semanticIcon('individual', I18N::translate('Individual'));
-				break;
-			case 'FAM':
-				$html .= FontAwesome::semanticicon('family', I18N::translate('Family'));
-				break;
-			case 'OBJE':
-				$html .= FontAwesome::semanticIcon('media', I18N::translate('Media'));
-				break;
-			case 'NOTE':
-				$html .= FontAwesome::semanticIcon('note', I18N::translate('Note'));
-				break;
-			case 'SOUR':
-				$html .= FontAwesome::semanticIcon('source', I18N::translate('Source'));
-				break;
-			case 'SUBM':
-				$html .= FontAwesome::semanticIcon('submitter', I18N::translate('Submitter'));
-				break;
-			case 'REPO':
-				$html .= FontAwesome::semanticIcon('repository', I18N::translate('Repository'));
-				break;
+				case 'INDI':
+					$html .= FontAwesome::semanticIcon('individual', I18N::translate('Individual'));
+					break;
+				case 'FAM':
+					$html .= FontAwesome::semanticicon('family', I18N::translate('Family'));
+					break;
+				case 'OBJE':
+					$html .= FontAwesome::semanticIcon('media', I18N::translate('Media'));
+					break;
+				case 'NOTE':
+					$html .= FontAwesome::semanticIcon('note', I18N::translate('Note'));
+					break;
+				case 'SOUR':
+					$html .= FontAwesome::semanticIcon('source', I18N::translate('Source'));
+					break;
+				case 'SUBM':
+					$html .= FontAwesome::semanticIcon('submitter', I18N::translate('Submitter'));
+					break;
+				case 'REPO':
+					$html .= FontAwesome::semanticIcon('repository', I18N::translate('Repository'));
+					break;
 			}
 			$html .= '</td>';
 			$html .= '<td data-sort="' . Html::escape($record->getSortName()) . '">';