fisharebest / webtrees

indilist.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('indilist.php_show_marnm', $show_marnm);
-	break;
-default:
-	$show_marnm = Auth::user()->getPreference('indilist.php_show_marnm');
+	case 'no':
+	case 'yes':
+		Auth::user()->setPreference('indilist.php_show_marnm', $show_marnm);
+		break;
+	default:
+		$show_marnm = Auth::user()->getPreference('indilist.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, 'indilist.php', $controller->tree());
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, 'indilist.php', true, $controller->tree());
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, 'indilist.php', $controller->tree());
-			break;
+			case 'style1':
+				echo FunctionsPrintLists::surnameList($surns, 3, true, 'indilist.php', $controller->tree());
+				break;
+			case 'style3':
+				echo FunctionsPrintLists::surnameTagCloud($surns, 'indilist.php', true, $controller->tree());
+				break;
+			case 'style2':
+			default:
+				echo FunctionsPrintLists::surnameTable($surns, 'indilist.php', $controller->tree());
+				break;
 		}
 	} else {
 		// Show the list

admin_site_config.php

Switch Indentation +72 added lines, -72 removed lines

@@ -24,84 +24,84 @@
 $controller->restrictAccess(Auth::isAdmin());
 
 switch (Filter::post('action')) {
-case 'site':
-	if (Filter::checkCsrf()) {
-		$INDEX_DIRECTORY = Filter::post('INDEX_DIRECTORY');
-		if (substr($INDEX_DIRECTORY, -1) !== '/') {
-			$INDEX_DIRECTORY .= '/';
+	case 'site':
+		if (Filter::checkCsrf()) {
+			$INDEX_DIRECTORY = Filter::post('INDEX_DIRECTORY');
+			if (substr($INDEX_DIRECTORY, -1) !== '/') {
+				$INDEX_DIRECTORY .= '/';
+			}
+			if (File::mkdir($INDEX_DIRECTORY)) {
+				Site::setPreference('INDEX_DIRECTORY', $INDEX_DIRECTORY);
+			} else {
+				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::escape($INDEX_DIRECTORY)), 'danger');
+			}
+			Site::setPreference('MEMORY_LIMIT', Filter::post('MEMORY_LIMIT'));
+			Site::setPreference('MAX_EXECUTION_TIME', Filter::post('MAX_EXECUTION_TIME'));
+			Site::setPreference('ALLOW_USER_THEMES', Filter::postBool('ALLOW_USER_THEMES'));
+			Site::setPreference('THEME_DIR', Filter::post('THEME_DIR'));
+			Site::setPreference('ALLOW_CHANGE_GEDCOM', Filter::postBool('ALLOW_CHANGE_GEDCOM'));
+			Site::setPreference('SESSION_TIME', Filter::post('SESSION_TIME'));
+			Site::setPreference('TIMEZONE', Filter::post('TIMEZONE'));
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 		}
-		if (File::mkdir($INDEX_DIRECTORY)) {
-			Site::setPreference('INDEX_DIRECTORY', $INDEX_DIRECTORY);
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::escape($INDEX_DIRECTORY)), 'danger');
+		header('Location: ' . route('admin-control-panel'));
+
+		return;
+
+	case 'email':
+		if (Filter::checkCsrf()) {
+			Site::setPreference('SMTP_ACTIVE', Filter::post('SMTP_ACTIVE'));
+			Site::setPreference('SMTP_FROM_NAME', Filter::post('SMTP_FROM_NAME'));
+			Site::setPreference('SMTP_HOST', Filter::post('SMTP_HOST'));
+			Site::setPreference('SMTP_PORT', Filter::post('SMTP_PORT'));
+			Site::setPreference('SMTP_AUTH', Filter::post('SMTP_AUTH'));
+			Site::setPreference('SMTP_AUTH_USER', Filter::post('SMTP_AUTH_USER'));
+			Site::setPreference('SMTP_SSL', Filter::post('SMTP_SSL'));
+			Site::setPreference('SMTP_HELO', Filter::post('SMTP_HELO'));
+			if (Filter::post('SMTP_AUTH_PASS')) {
+				Site::setPreference('SMTP_AUTH_PASS', Filter::post('SMTP_AUTH_PASS'));
+			}
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 		}
-		Site::setPreference('MEMORY_LIMIT', Filter::post('MEMORY_LIMIT'));
-		Site::setPreference('MAX_EXECUTION_TIME', Filter::post('MAX_EXECUTION_TIME'));
-		Site::setPreference('ALLOW_USER_THEMES', Filter::postBool('ALLOW_USER_THEMES'));
-		Site::setPreference('THEME_DIR', Filter::post('THEME_DIR'));
-		Site::setPreference('ALLOW_CHANGE_GEDCOM', Filter::postBool('ALLOW_CHANGE_GEDCOM'));
-		Site::setPreference('SESSION_TIME', Filter::post('SESSION_TIME'));
-		Site::setPreference('TIMEZONE', Filter::post('TIMEZONE'));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . route('admin-control-panel'));
-
-	return;
-
-case 'email':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('SMTP_ACTIVE', Filter::post('SMTP_ACTIVE'));
-		Site::setPreference('SMTP_FROM_NAME', Filter::post('SMTP_FROM_NAME'));
-		Site::setPreference('SMTP_HOST', Filter::post('SMTP_HOST'));
-		Site::setPreference('SMTP_PORT', Filter::post('SMTP_PORT'));
-		Site::setPreference('SMTP_AUTH', Filter::post('SMTP_AUTH'));
-		Site::setPreference('SMTP_AUTH_USER', Filter::post('SMTP_AUTH_USER'));
-		Site::setPreference('SMTP_SSL', Filter::post('SMTP_SSL'));
-		Site::setPreference('SMTP_HELO', Filter::post('SMTP_HELO'));
-		if (Filter::post('SMTP_AUTH_PASS')) {
-			Site::setPreference('SMTP_AUTH_PASS', Filter::post('SMTP_AUTH_PASS'));
+		header('Location: ' . route('admin-control-panel'));
+
+		return;
+	case 'login':
+		if (Filter::checkCsrf()) {
+			Site::setPreference('LOGIN_URL', Filter::post('LOGIN_URL'));
+			Site::setPreference('WELCOME_TEXT_AUTH_MODE', Filter::post('WELCOME_TEXT_AUTH_MODE'));
+			Site::setPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE, Filter::post('WELCOME_TEXT_AUTH_MODE_4'));
+			Site::setPreference('USE_REGISTRATION_MODULE', Filter::postBool('USE_REGISTRATION_MODULE'));
+			Site::setPreference('SHOW_REGISTER_CAUTION', Filter::postBool('SHOW_REGISTER_CAUTION'));
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 		}
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . route('admin-control-panel'));
-
-	return;
-case 'login':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('LOGIN_URL', Filter::post('LOGIN_URL'));
-		Site::setPreference('WELCOME_TEXT_AUTH_MODE', Filter::post('WELCOME_TEXT_AUTH_MODE'));
-		Site::setPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE, Filter::post('WELCOME_TEXT_AUTH_MODE_4'));
-		Site::setPreference('USE_REGISTRATION_MODULE', Filter::postBool('USE_REGISTRATION_MODULE'));
-		Site::setPreference('SHOW_REGISTER_CAUTION', Filter::postBool('SHOW_REGISTER_CAUTION'));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . route('admin-control-panel'));
-
-	return;
+		header('Location: ' . route('admin-control-panel'));
+
+		return;
+
+	case 'tracking':
+		if (Filter::checkCsrf()) {
+			Site::setPreference('BING_WEBMASTER_ID', Filter::post('BING_WEBMASTER_ID'));
+			Site::setPreference('GOOGLE_WEBMASTER_ID', Filter::post('GOOGLE_WEBMASTER_ID'));
+			Site::setPreference('GOOGLE_ANALYTICS_ID', Filter::post('GOOGLE_ANALYTICS_ID'));
+			Site::setPreference('PIWIK_URL', Filter::post('PIWIK_URL'));
+			Site::setPreference('PIWIK_SITE_ID', Filter::post('PIWIK_SITE_ID'));
+			Site::setPreference('STATCOUNTER_PROJECT_ID', Filter::post('STATCOUNTER_PROJECT_ID'));
+			Site::setPreference('STATCOUNTER_SECURITY_ID', Filter::post('STATCOUNTER_SECURITY_ID'));
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
+		}
+		header('Location: ' . route('admin-control-panel'));
 
-case 'tracking':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('BING_WEBMASTER_ID', Filter::post('BING_WEBMASTER_ID'));
-		Site::setPreference('GOOGLE_WEBMASTER_ID', Filter::post('GOOGLE_WEBMASTER_ID'));
-		Site::setPreference('GOOGLE_ANALYTICS_ID', Filter::post('GOOGLE_ANALYTICS_ID'));
-		Site::setPreference('PIWIK_URL', Filter::post('PIWIK_URL'));
-		Site::setPreference('PIWIK_SITE_ID', Filter::post('PIWIK_SITE_ID'));
-		Site::setPreference('STATCOUNTER_PROJECT_ID', Filter::post('STATCOUNTER_PROJECT_ID'));
-		Site::setPreference('STATCOUNTER_SECURITY_ID', Filter::post('STATCOUNTER_SECURITY_ID'));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . route('admin-control-panel'));
+		return;
 
-	return;
-
-case 'languages':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('LANGUAGES', implode(',', Filter::postArray('LANGUAGES')));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . route('admin-control-panel'));
+	case 'languages':
+		if (Filter::checkCsrf()) {
+			Site::setPreference('LANGUAGES', implode(',', Filter::postArray('LANGUAGES')));
+			FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
+		}
+		header('Location: ' . route('admin-control-panel'));
 
-	return;
+		return;
 }
 
 // Lists of options for <select> controls.

admin_site_logs.php

Switch Indentation +6 added lines, -6 removed lines

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

reportengine.php

Switch Indentation +81 added lines, -81 removed lines

@@ -54,32 +54,32 @@ 
 	$newvars[$name]['id'] = $var;
 	if (!empty($type[$name])) {
 		switch ($type[$name]) {
-		case 'INDI':
-			$record = Individual::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		case 'FAM':
-			$record = Family::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		case 'SOUR':
-			$record = Source::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		default:
-			break;
+			case 'INDI':
+				$record = Individual::getInstance($var, $WT_TREE);
+				if ($record && $record->canShowName()) {
+					$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+				} else {
+					$action = 'setup';
+				}
+				break;
+			case 'FAM':
+				$record = Family::getInstance($var, $WT_TREE);
+				if ($record && $record->canShowName()) {
+					$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+				} else {
+					$action = 'setup';
+				}
+				break;
+			case 'SOUR':
+				$record = Source::getInstance($var, $WT_TREE);
+				if ($record && $record->canShowName()) {
+					$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+				} else {
+					$action = 'setup';
+				}
+				break;
+			default:
+				break;
 		}
 	}
 }
@@ -142,61 +142,61 @@ 
 		];
 
 		switch ($input['lookup']) {
-		case 'INDI':
-			$individual       = Individual::getInstance($pid, $WT_TREE) ?: $controller->getSignificantIndividual();
-			$input['control'] = FunctionsEdit::formControlIndividual($individual, $attributes);
-			break;
-		case 'FAM':
-			$family           = Family::getInstance($pid, $WT_TREE) ?: $controller->getSignificantFamily();
-			$input['control'] = FunctionsEdit::formControlFamily($family, $attributes);
-			break;
-		case 'SOUR':
-			$source           = Source::getInstance($pid, $WT_TREE);
-			$input['control'] = FunctionsEdit::formControlSource($source, $attributes);
-			break;
-		case 'DATE':
-			$attributes += [
-				'type'  => 'text',
-				'value' => $input['default'],
-			];
-			$input['control'] = '<input ' . Html::attributes($attributes) . '>';
-			$input['extra']   = FontAwesome::linkIcon('calendar', I18N::translate('Select a date'), [
-				'class'   => 'btn btn-link',
-				'href'    => '#',
-				'onclick' => 'return calendarWidget("calendar-widget-' . $n . '", "input-' . $n . '");',
-			]) . '<div id="calendar-widget-' . $n . '" style="position:absolute;visibility:hidden;background-color:white;z-index:1000;"></div>';
-			break;
-		default:
-			switch ($input['type']) {
-			case 'text':
+			case 'INDI':
+				$individual       = Individual::getInstance($pid, $WT_TREE) ?: $controller->getSignificantIndividual();
+				$input['control'] = FunctionsEdit::formControlIndividual($individual, $attributes);
+				break;
+			case 'FAM':
+				$family           = Family::getInstance($pid, $WT_TREE) ?: $controller->getSignificantFamily();
+				$input['control'] = FunctionsEdit::formControlFamily($family, $attributes);
+				break;
+			case 'SOUR':
+				$source           = Source::getInstance($pid, $WT_TREE);
+				$input['control'] = FunctionsEdit::formControlSource($source, $attributes);
+				break;
+			case 'DATE':
 				$attributes += [
 					'type'  => 'text',
 					'value' => $input['default'],
 				];
 				$input['control'] = '<input ' . Html::attributes($attributes) . '>';
+				$input['extra']   = FontAwesome::linkIcon('calendar', I18N::translate('Select a date'), [
+					'class'   => 'btn btn-link',
+					'href'    => '#',
+					'onclick' => 'return calendarWidget("calendar-widget-' . $n . '", "input-' . $n . '");',
+				]) . '<div id="calendar-widget-' . $n . '" style="position:absolute;visibility:hidden;background-color:white;z-index:1000;"></div>';
 				break;
-			case 'checkbox':
-				$attributes += [
-					'type'    => 'checkbox',
-					'checked' => (bool) $input['default'],
-				];
-				$input['control'] = '<input ' . Html::attributes($attributes) . '>';
-				break;
-			case 'select':
-				$options = [];
-				foreach (preg_split('/[|]+/', $input['options']) as $option) {
-					list($key, $value) = explode('=>', $option);
-					if (preg_match('/^I18N::number\((.+?)(,([\d+]))?\)$/', $value, $match)) {
-						$options[$key] = I18N::number($match[1], isset($match[3]) ? $match[3] : 0);
-					} elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $value, $match)) {
-						$options[$key] = I18N::translate($match[1]);
-					} elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) {
-						$options[$key] = I18N::translateContext($match[1], $match[2]);
-					}
+			default:
+				switch ($input['type']) {
+					case 'text':
+						$attributes += [
+							'type'  => 'text',
+							'value' => $input['default'],
+						];
+						$input['control'] = '<input ' . Html::attributes($attributes) . '>';
+						break;
+					case 'checkbox':
+						$attributes += [
+							'type'    => 'checkbox',
+							'checked' => (bool) $input['default'],
+						];
+						$input['control'] = '<input ' . Html::attributes($attributes) . '>';
+						break;
+					case 'select':
+						$options = [];
+						foreach (preg_split('/[|]+/', $input['options']) as $option) {
+							list($key, $value) = explode('=>', $option);
+							if (preg_match('/^I18N::number\((.+?)(,([\d+]))?\)$/', $value, $match)) {
+								$options[$key] = I18N::number($match[1], isset($match[3]) ? $match[3] : 0);
+							} elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $value, $match)) {
+								$options[$key] = I18N::translate($match[1]);
+							} elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) {
+								$options[$key] = I18N::translateContext($match[1], $match[2]);
+							}
+						}
+						$input['control'] = Bootstrap4::select($options, $input['default'], $attributes);
+						break;
 				}
-				$input['control'] = Bootstrap4::select($options, $input['default'], $attributes);
-				break;
-			}
 		}
 
 		$inputs[] = $input;
@@ -221,13 +221,13 @@ 
 		}
 
 		switch ($output) {
-		case 'HTML':
-			header('Content-type: text/html; charset=UTF-8');
-			new ReportParserGenerate($report, new ReportHtml, $vars);
-			break;
-		case 'PDF':
-			new ReportParserGenerate($report, new ReportPdf, $vars);
-			break;
+			case 'HTML':
+				header('Content-type: text/html; charset=UTF-8');
+				new ReportParserGenerate($report, new ReportHtml, $vars);
+				break;
+			case 'PDF':
+				new ReportParserGenerate($report, new ReportPdf, $vars);
+				break;
 		}
 	}
 }

admin_trees_download.php

Switch Indentation +13 added lines, -13 removed lines

@@ -37,19 +37,19 @@
 
 if ($action === 'download') {
 	switch ($privatize_export) {
-	default:
-	case 'gedadmin':
-		$access_level = Auth::PRIV_NONE;
-		break;
-	case 'user':
-		$access_level = Auth::PRIV_USER;
-		break;
-	case 'visitor':
-		$access_level = Auth::PRIV_PRIVATE;
-		break;
-	case 'none':
-		$access_level = Auth::PRIV_HIDE;
-		break;
+		default:
+		case 'gedadmin':
+			$access_level = Auth::PRIV_NONE;
+			break;
+		case 'user':
+			$access_level = Auth::PRIV_USER;
+			break;
+		case 'visitor':
+			$access_level = Auth::PRIV_PRIVATE;
+			break;
+		case 'none':
+			$access_level = Auth::PRIV_HIDE;
+			break;
 	}
 
 	$exportOptions = [

action.php

Switch Indentation +8 added lines, -8 removed lines

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

admin_pgv_to_wt.php

Switch Indentation +83 added lines, -83 removed lines

@@ -777,69 +777,69 @@ 
 	$stmt_gedcom_setting->execute([$GED_DATA['id'], 'INDI_FACTS_QUICK', $INDI_FACTS_QUICK]);
 	$stmt_gedcom_setting->execute([$GED_DATA['id'], 'INDI_FACTS_UNIQUE', $INDI_FACTS_UNIQUE]);
 	switch ($LANGUAGE) {
-	case 'catalan':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'ca']);
-		break;
-	case 'english-uk':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'en-GB']);
-		break;
-	case 'polish':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'pl']);
-		break;
-	case 'italian':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'it']);
-		break;
-	case 'spanish':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'es']);
-		break;
-	case 'finnish':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'fi']);
-		break;
-	case 'french':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'fr']);
-		break;
-	case 'german':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'de']);
-		break;
-	case 'danish':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'da']);
-		break;
-	case 'portuguese':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'pt']);
-		break;
-	case 'hebrew':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'he']);
-		break;
-	case 'estonian':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'et']);
-		break;
-	case 'turkish':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'tr']);
-		break;
-	case 'dutch':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'nl']);
-		break;
-	case 'slovak':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'sk']);
-		break;
-	case 'norwegian':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'nn']);
-		break;
-	case 'slovenian':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'sl']);
-		break;
-	case 'hungarian':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'hu']);
-		break;
-	case 'swedish':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'sv']);
-		break;
-	case 'russian':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'ru']);
-		break;
-	default:
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'en-US']);
-		break;
+		case 'catalan':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'ca']);
+			break;
+		case 'english-uk':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'en-GB']);
+			break;
+		case 'polish':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'pl']);
+			break;
+		case 'italian':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'it']);
+			break;
+		case 'spanish':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'es']);
+			break;
+		case 'finnish':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'fi']);
+			break;
+		case 'french':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'fr']);
+			break;
+		case 'german':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'de']);
+			break;
+		case 'danish':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'da']);
+			break;
+		case 'portuguese':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'pt']);
+			break;
+		case 'hebrew':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'he']);
+			break;
+		case 'estonian':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'et']);
+			break;
+		case 'turkish':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'tr']);
+			break;
+		case 'dutch':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'nl']);
+			break;
+		case 'slovak':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'sk']);
+			break;
+		case 'norwegian':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'nn']);
+			break;
+		case 'slovenian':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'sl']);
+			break;
+		case 'hungarian':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'hu']);
+			break;
+		case 'swedish':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'sv']);
+			break;
+		case 'russian':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'ru']);
+			break;
+		default:
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'LANGUAGE', 'en-US']);
+			break;
 	}
 	$stmt_gedcom_setting->execute([$GED_DATA['id'], 'MAX_ALIVE_AGE', $MAX_ALIVE_AGE]);
 	$stmt_gedcom_setting->execute([$GED_DATA['id'], 'MAX_DESCENDANCY_GENERATIONS', $MAX_DESCENDANCY_GENERATIONS]);
@@ -892,26 +892,26 @@ 
 	$stmt_gedcom_setting->execute([$GED_DATA['id'], 'SURNAME_LIST_STYLE', $SURNAME_LIST_STYLE]);
 	$stmt_gedcom_setting->execute([$GED_DATA['id'], 'SURNAME_TRADITION', $SURNAME_TRADITION]);
 	switch ($THEME_DIR) {
-	case '':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', '']);
-		break;
-	case 'themes/cloudy/':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'clouds']);
-		break;
-	case 'themes/minimal/':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'minimal']);
-		break;
-	case 'themes/simplyblue/':
-	case 'themes/simplygreen/':
-	case 'themes/simplyred/':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'colors']);
-		break;
-	case 'themes/xenea/':
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'xenea']);
-		break;
-	default:
-		$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'webtrees']);
-		break;
+		case '':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', '']);
+			break;
+		case 'themes/cloudy/':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'clouds']);
+			break;
+		case 'themes/minimal/':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'minimal']);
+			break;
+		case 'themes/simplyblue/':
+		case 'themes/simplygreen/':
+		case 'themes/simplyred/':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'colors']);
+			break;
+		case 'themes/xenea/':
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'xenea']);
+			break;
+		default:
+			$stmt_gedcom_setting->execute([$GED_DATA['id'], 'THEME_DIR', 'webtrees']);
+			break;
 	}
 	$stmt_gedcom_setting->execute([$GED_DATA['id'], 'USE_RELATIONSHIP_PRIVACY', $USE_RELATIONSHIP_PRIVACY]);
 	$user = User::findByIdentifier($WEBMASTER_EMAIL);

import.php

Switch Indentation +69 added lines, -69 removed lines

@@ -124,75 +124,75 @@
 		// MySQL supports a wide range of collation conversions. These are ones that
 		// have been encountered "in the wild".
 		switch ($charset) {
-		case 'ASCII':
-			Database::prepare(
-				"UPDATE `##gedcom_chunk`" .
-				" SET chunk_data=CONVERT(CONVERT(chunk_data USING ascii) USING utf8)" .
-				" WHERE gedcom_id=?"
-			)->execute([$gedcom_id]);
-			break;
-		case 'IBMPC':   // IBMPC, IBM WINDOWS and MS-DOS could be anything. Mostly it means CP850.
-		case 'IBM WINDOWS':
-		case 'MS-DOS':
-		case 'CP437':
-		case 'CP850':
-			// CP850 has extra letters with diacritics to replace box-drawing chars in CP437.
-			Database::prepare(
-				"UPDATE `##gedcom_chunk`" .
-				" SET chunk_data=CONVERT(CONVERT(chunk_data USING cp850) USING utf8)" .
-				" WHERE gedcom_id=?"
-			)->execute([$gedcom_id]);
-			break;
-		case 'ANSI': // ANSI could be anything. Most applications seem to treat it as latin1.
-			$controller->addInlineJavascript(
-				'$("#import' . $gedcom_id . '").parent().prepend("<div class=\"bg-info\">' . /* I18N: %1$s and %2$s are the names of character encodings, such as ISO-8859-1 or ASCII */
-					I18N::translate('This GEDCOM file is encoded using %1$s. Assume this to mean %2$s.', $charset, 'ISO-8859-1') . '</div>");'
-				);
-			// no break;
-		case 'WINDOWS':
-		case 'CP1252':
-		case 'ISO8859-1':
-		case 'ISO-8859-1':
-		case 'LATIN1':
-		case 'LATIN-1':
-			// Convert from ISO-8859-1 (western european) to UTF8.
-			Database::prepare(
-				"UPDATE `##gedcom_chunk`" .
-				" SET chunk_data=CONVERT(CONVERT(chunk_data USING latin1) USING utf8)" .
-				" WHERE gedcom_id=?"
-			)->execute([$gedcom_id]);
-			break;
-		case 'CP1250':
-		case 'ISO8859-2':
-		case 'ISO-8859-2':
-		case 'LATIN2':
-		case 'LATIN-2':
-			// Convert from ISO-8859-2 (eastern european) to UTF8.
-			Database::prepare(
-				"UPDATE `##gedcom_chunk`" .
-				" SET chunk_data=CONVERT(CONVERT(chunk_data USING latin2) USING utf8)" .
-				" WHERE gedcom_id=?"
-			)->execute([$gedcom_id]);
-			break;
-		case 'MACINTOSH':
-			// Convert from MAC Roman to UTF8.
-			Database::prepare(
-				"UPDATE `##gedcom_chunk`" .
-				" SET chunk_data=CONVERT(CONVERT(chunk_data USING macroman) USING utf8)" .
-				" WHERE gedcom_id=?"
-			)->execute([$gedcom_id]);
-			break;
-		case 'UTF8':
-		case 'UTF-8':
-			// Already UTF-8 so nothing to do!
-			break;
-		case 'ANSEL':
-		default:
-			Database::rollBack();
-			echo '<span class="error">', I18N::translate('Error: converting GEDCOM files from %s encoding to UTF-8 encoding not currently supported.', $charset), '</span>';
-			$controller->addInlineJavascript('$("#actions' . $gedcom_id . '").removeClass("hidden");');
-
-			return;
+			case 'ASCII':
+				Database::prepare(
+					"UPDATE `##gedcom_chunk`" .
+					" SET chunk_data=CONVERT(CONVERT(chunk_data USING ascii) USING utf8)" .
+					" WHERE gedcom_id=?"
+				)->execute([$gedcom_id]);
+				break;
+			case 'IBMPC':   // IBMPC, IBM WINDOWS and MS-DOS could be anything. Mostly it means CP850.
+			case 'IBM WINDOWS':
+			case 'MS-DOS':
+			case 'CP437':
+			case 'CP850':
+				// CP850 has extra letters with diacritics to replace box-drawing chars in CP437.
+				Database::prepare(
+					"UPDATE `##gedcom_chunk`" .
+					" SET chunk_data=CONVERT(CONVERT(chunk_data USING cp850) USING utf8)" .
+					" WHERE gedcom_id=?"
+				)->execute([$gedcom_id]);
+				break;
+			case 'ANSI': // ANSI could be anything. Most applications seem to treat it as latin1.
+				$controller->addInlineJavascript(
+					'$("#import' . $gedcom_id . '").parent().prepend("<div class=\"bg-info\">' . /* I18N: %1$s and %2$s are the names of character encodings, such as ISO-8859-1 or ASCII */
+						I18N::translate('This GEDCOM file is encoded using %1$s. Assume this to mean %2$s.', $charset, 'ISO-8859-1') . '</div>");'
+					);
+				// no break;
+			case 'WINDOWS':
+			case 'CP1252':
+			case 'ISO8859-1':
+			case 'ISO-8859-1':
+			case 'LATIN1':
+			case 'LATIN-1':
+				// Convert from ISO-8859-1 (western european) to UTF8.
+				Database::prepare(
+					"UPDATE `##gedcom_chunk`" .
+					" SET chunk_data=CONVERT(CONVERT(chunk_data USING latin1) USING utf8)" .
+					" WHERE gedcom_id=?"
+				)->execute([$gedcom_id]);
+				break;
+			case 'CP1250':
+			case 'ISO8859-2':
+			case 'ISO-8859-2':
+			case 'LATIN2':
+			case 'LATIN-2':
+				// Convert from ISO-8859-2 (eastern european) to UTF8.
+				Database::prepare(
+					"UPDATE `##gedcom_chunk`" .
+					" SET chunk_data=CONVERT(CONVERT(chunk_data USING latin2) USING utf8)" .
+					" WHERE gedcom_id=?"
+				)->execute([$gedcom_id]);
+				break;
+			case 'MACINTOSH':
+				// Convert from MAC Roman to UTF8.
+				Database::prepare(
+					"UPDATE `##gedcom_chunk`" .
+					" SET chunk_data=CONVERT(CONVERT(chunk_data USING macroman) USING utf8)" .
+					" WHERE gedcom_id=?"
+				)->execute([$gedcom_id]);
+				break;
+			case 'UTF8':
+			case 'UTF-8':
+				// Already UTF-8 so nothing to do!
+				break;
+			case 'ANSEL':
+			default:
+				Database::rollBack();
+				echo '<span class="error">', I18N::translate('Error: converting GEDCOM files from %s encoding to UTF-8 encoding not currently supported.', $charset), '</span>';
+				$controller->addInlineJavascript('$("#actions' . $gedcom_id . '").removeClass("hidden");');
+
+				return;
 		}
 		$first_time = false;
 

includes/session.php

Switch Indentation +23 added lines, -23 removed lines

@@ -156,29 +156,29 @@
 		$frame += ['args' => [], 'file' => 'unknown', 'line' => 'unknown'];
 		array_walk($frame['args'], function (&$arg) {
 			switch (gettype($arg)) {
-			case 'boolean':
-			case 'integer':
-			case 'double':
-			case 'null':
-				$arg = var_export($arg, true);
-				break;
-			case 'string':
-				if (mb_strlen($arg) > 30) {
-					$arg = mb_substr($arg, 0, 30) . '…';
-				}
-				$arg = var_export($arg, true);
-				break;
-			case 'object':
-				$reflection = new \ReflectionClass($arg);
-				if (is_object($arg) && method_exists($arg, '__toString')) {
-					$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
-				} else {
-					$arg = '[' . $reflection->getShortName() . ']';
-				}
-				break;
-			default:
-				$arg = '[' . gettype($arg) . ']';
-				break;
+				case 'boolean':
+				case 'integer':
+				case 'double':
+				case 'null':
+					$arg = var_export($arg, true);
+					break;
+				case 'string':
+					if (mb_strlen($arg) > 30) {
+						$arg = mb_substr($arg, 0, 30) . '…';
+					}
+					$arg = var_export($arg, true);
+					break;
+				case 'object':
+					$reflection = new \ReflectionClass($arg);
+					if (is_object($arg) && method_exists($arg, '__toString')) {
+						$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
+					} else {
+						$arg = '[' . $reflection->getShortName() . ']';
+					}
+					break;
+				default:
+					$arg = '[' . gettype($arg) . ']';
+					break;
 			}
 		});
 		$frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);