fisharebest / webtrees

login.php

Switch Indentation +341 added lines, -341 removed lines

@@ -68,89 +68,89 @@ 
 $message = '';
 
 switch ($action) {
-case 'login':
-	try {
-		if (!$_COOKIE) {
-			Log::addAuthenticationLog('Login failed (no session cookies): ' . $username);
-			throw new \Exception(I18N::translate('You cannot sign in because your browser does not accept cookies.'));
-		}
+	case 'login':
+		try {
+			if (!$_COOKIE) {
+				Log::addAuthenticationLog('Login failed (no session cookies): ' . $username);
+				throw new \Exception(I18N::translate('You cannot sign in because your browser does not accept cookies.'));
+			}
 
-		$user = User::findByIdentifier($username);
+			$user = User::findByIdentifier($username);
 
-		if (!$user) {
-			Log::addAuthenticationLog('Login failed (no such user/email): ' . $username);
-			throw new \Exception(I18N::translate('The username or password is incorrect.'));
-		}
+			if (!$user) {
+				Log::addAuthenticationLog('Login failed (no such user/email): ' . $username);
+				throw new \Exception(I18N::translate('The username or password is incorrect.'));
+			}
 
-		if (!$user->checkPassword($password)) {
-			Log::addAuthenticationLog('Login failed (incorrect password): ' . $username);
-			throw new \Exception(I18N::translate('The username or password is incorrect.'));
-		}
+			if (!$user->checkPassword($password)) {
+				Log::addAuthenticationLog('Login failed (incorrect password): ' . $username);
+				throw new \Exception(I18N::translate('The username or password is incorrect.'));
+			}
 
-		if (!$user->getPreference('verified')) {
-			Log::addAuthenticationLog('Login failed (not verified by user): ' . $username);
-			throw new \Exception(I18N::translate('This account has not been verified. Please check your email for a verification message.'));
-		}
+			if (!$user->getPreference('verified')) {
+				Log::addAuthenticationLog('Login failed (not verified by user): ' . $username);
+				throw new \Exception(I18N::translate('This account has not been verified. Please check your email for a verification message.'));
+			}
 
-		if (!$user->getPreference('verified_by_admin')) {
-			Log::addAuthenticationLog('Login failed (not approved by admin): ' . $username);
-			throw new \Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
-		}
+			if (!$user->getPreference('verified_by_admin')) {
+				Log::addAuthenticationLog('Login failed (not approved by admin): ' . $username);
+				throw new \Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
+			}
 
-		Auth::login($user);
-		Log::addAuthenticationLog('Login: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
-		Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
-
-		Session::put('locale', Auth::user()->getPreference('language'));
-		Session::put('theme_id', Auth::user()->getPreference('theme'));
-		I18N::init(Auth::user()->getPreference('language'));
-
-		// We're logging in as an administrator
-		if (Auth::isAdmin()) {
-			// Check for updates
-			$latest_version_txt = Functions::fetchLatestVersion();
-			if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-				list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
-				if (version_compare(WT_VERSION, $latest_version) < 0) {
-					FlashMessages::addMessage(
-						I18N::translate('A new version of webtrees is available.') .
-						' <a href="admin_site_upgrade.php"><b>' .
-						I18N::translate('Upgrade to webtrees %s.', '<span dir="ltr">' . $latest_version . '</span>') .
-						'</b></a>'
-					);
+			Auth::login($user);
+			Log::addAuthenticationLog('Login: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
+			Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
+
+			Session::put('locale', Auth::user()->getPreference('language'));
+			Session::put('theme_id', Auth::user()->getPreference('theme'));
+			I18N::init(Auth::user()->getPreference('language'));
+
+			// We're logging in as an administrator
+			if (Auth::isAdmin()) {
+				// Check for updates
+				$latest_version_txt = Functions::fetchLatestVersion();
+				if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
+					list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
+					if (version_compare(WT_VERSION, $latest_version) < 0) {
+						FlashMessages::addMessage(
+							I18N::translate('A new version of webtrees is available.') .
+							' <a href="admin_site_upgrade.php"><b>' .
+							I18N::translate('Upgrade to webtrees %s.', '<span dir="ltr">' . $latest_version . '</span>') .
+							'</b></a>'
+						);
+					}
 				}
 			}
-		}
 
-		// If we were on a "home page", redirect to "my page"
-		if ($url === '' || strpos($url, 'index.php?ctype=gedcom') === 0) {
-			$url = 'index.php?ctype=user';
-			// Switch to a tree where we have a genealogy record (or keep to the current/default).
-			$tree = Database::prepare(
-				"SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" .
-				" WHERE setting_name = 'gedcomid' AND user_id = :user_id" .
-				" ORDER BY gedcom_id = :tree_id DESC"
-			)->execute(array(
-				'user_id' => Auth::user()->getUserId(),
-				'tree_id' => $WT_TREE->getTreeId(),
-			))->fetchOne();
-			$url .= '&ged=' . Filter::escapeUrl($tree);
-		}
+			// If we were on a "home page", redirect to "my page"
+			if ($url === '' || strpos($url, 'index.php?ctype=gedcom') === 0) {
+				$url = 'index.php?ctype=user';
+				// Switch to a tree where we have a genealogy record (or keep to the current/default).
+				$tree = Database::prepare(
+					"SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" .
+					" WHERE setting_name = 'gedcomid' AND user_id = :user_id" .
+					" ORDER BY gedcom_id = :tree_id DESC"
+				)->execute(array(
+					'user_id' => Auth::user()->getUserId(),
+					'tree_id' => $WT_TREE->getTreeId(),
+				))->fetchOne();
+				$url .= '&ged=' . Filter::escapeUrl($tree);
+			}
 
-		// Redirect to the target URL
-		header('Location: ' . WT_BASE_URL . $url);
+			// Redirect to the target URL
+			header('Location: ' . WT_BASE_URL . $url);
 
-		return;
-	} catch (\Exception $ex) {
-		$message = $ex->getMessage();
-	}
-	// No break;
-
-default:
-	$controller
-		->setPageTitle(I18N::translate('Sign in'))
-		->pageHeader()
-		->addInlineJavascript('
+			return;
+		} catch (\Exception $ex) {
+			$message = $ex->getMessage();
+		}
+		// No break;
+
+	default:
+		$controller
+			->setPageTitle(I18N::translate('Sign in'))
+			->pageHeader()
+			->addInlineJavascript('
 			jQuery("#new_passwd_form").hide();
 			jQuery("#passwd_click").click(function() {
 				jQuery("#new_passwd_form").slideToggle(100, function() {
@@ -160,25 +160,25 @@ 
 			});
 		');
 
-	echo '<div id="login-page">';
-	echo '<div id="login-text">';
-
-	echo '<p class="center"><strong>' . I18N::translate('Welcome to this genealogy website') . '</strong></p>';
-
-	switch (Site::getPreference('WELCOME_TEXT_AUTH_MODE')) {
-	case 1:
-		echo '<p>' . I18N::translate('Anyone with a user account can access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 2:
-		echo '<p>' . I18N::translate('You need to be an authorized user to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 3:
-		echo '<p>' . I18N::translate('You need to be a family member to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 4:
-		echo '<p style="white-space: pre-wrap;">', Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE), '</p>';
-		break;
-	}
+		echo '<div id="login-page">';
+		echo '<div id="login-text">';
+
+		echo '<p class="center"><strong>' . I18N::translate('Welcome to this genealogy website') . '</strong></p>';
+
+		switch (Site::getPreference('WELCOME_TEXT_AUTH_MODE')) {
+			case 1:
+				echo '<p>' . I18N::translate('Anyone with a user account can access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+				break;
+			case 2:
+				echo '<p>' . I18N::translate('You need to be an authorized user to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+				break;
+			case 3:
+				echo '<p>' . I18N::translate('You need to be a family member to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+				break;
+			case 4:
+				echo '<p style="white-space: pre-wrap;">', Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE), '</p>';
+				break;
+		}
 
 	echo '</div>';
 	echo '<div id="login-box">';
@@ -233,181 +233,181 @@ 
 	echo '</div>';
 	break;
 
-case 'requestpw':
-	$user_name = Filter::post('new_passwd_username');
-	$user      = User::findByIdentifier($user_name);
-
-	if ($user) {
-		$passchars   = 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-		$user_new_pw = '';
-		$max         = strlen($passchars) - 1;
-		for ($i = 0; $i < 8; $i++) {
-			$index = rand(0, $max);
-			$user_new_pw .= $passchars{$index};
-		}
+	case 'requestpw':
+		$user_name = Filter::post('new_passwd_username');
+		$user      = User::findByIdentifier($user_name);
+
+		if ($user) {
+			$passchars   = 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+			$user_new_pw = '';
+			$max         = strlen($passchars) - 1;
+			for ($i = 0; $i < 8; $i++) {
+				$index = rand(0, $max);
+				$user_new_pw .= $passchars{$index};
+			}
 
-		$user->setPassword($user_new_pw);
-		Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
-
-		Mail::systemMessage(
-			$WT_TREE,
-			$user,
-			I18N::translate('Lost password request'),
-			I18N::translate('Hello %s…', $user->getRealNameHtml()) . Mail::EOL . Mail::EOL .
-			I18N::translate('A new password has been requested for your username.') . Mail::EOL . Mail::EOL .
-			I18N::translate('Username') . ": " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-			I18N::translate('Password') . ": " . $user_new_pw . Mail::EOL . Mail::EOL .
-			I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') . Mail::EOL . Mail::EOL .
-			'<a href="' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
-		);
-
-		FlashMessages::addMessage(I18N::translate('A new password has been created and emailed to %s. You can change this password after you sign in.', Filter::escapeHtml($user_name)), 'success');
-	} else {
-		FlashMessages::addMessage(I18N::translate('There is no account with the username or email “%s”.', Filter::escapeHtml($user_name)), 'danger');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+			$user->setPassword($user_new_pw);
+			Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
 
-	return;
-	break;
+			Mail::systemMessage(
+				$WT_TREE,
+				$user,
+				I18N::translate('Lost password request'),
+				I18N::translate('Hello %s…', $user->getRealNameHtml()) . Mail::EOL . Mail::EOL .
+				I18N::translate('A new password has been requested for your username.') . Mail::EOL . Mail::EOL .
+				I18N::translate('Username') . ": " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+				I18N::translate('Password') . ": " . $user_new_pw . Mail::EOL . Mail::EOL .
+				I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') . Mail::EOL . Mail::EOL .
+				'<a href="' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
+			);
 
-case 'register':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
+			FlashMessages::addMessage(I18N::translate('A new password has been created and emailed to %s. You can change this password after you sign in.', Filter::escapeHtml($user_name)), 'success');
+		} else {
+			FlashMessages::addMessage(I18N::translate('There is no account with the username or email “%s”.', Filter::escapeHtml($user_name)), 'danger');
+		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
 		return;
-	}
-
-	$controller->setPageTitle(I18N::translate('Request a new user account'));
-
-	// The form parameters are mandatory, and the validation errors are shown in the client.
-	if (Session::get('good_to_send') && $user_name && $user_password01 && $user_password01 == $user_password02 && $user_realname && $user_email && $user_comments) {
-
-		// These validation errors cannot be shown in the client.
-		if (User::findByUserName($user_name)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-		} elseif (User::findByEmail($user_email)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-		} elseif (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:ftp|http|https):\/\/)[a-zA-Z0-9.-]+)/', $user_comments, $match)) {
-			FlashMessages::addMessage(
-				I18N::translate('You are not allowed to send messages that contain external links.') . ' ' .
-				I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', $match[2], $match[1])
-			);
-			Log::addAuthenticationLog('Possible spam registration from "' . $user_name . '"/"' . $user_email . '" comments="' . $user_comments . '"');
-		} else {
-			// Everything looks good - create the user
-			$controller->pageHeader();
-			Log::addAuthenticationLog('User registration requested for: ' . $user_name);
+		break;
 
-			$user = User::create($user_name, $user_realname, $user_email, $user_password01);
-			$user
-				->setPreference('language', WT_LOCALE)
-				->setPreference('verified', '0')
-				->setPreference('verified_by_admin', 0)
-				->setPreference('reg_timestamp', date('U'))
-				->setPreference('reg_hashcode', md5(Uuid::uuid4()))
-				->setPreference('contactmethod', 'messaging2')
-				->setPreference('comment', $user_comments)
-				->setPreference('visibleonline', '1')
-				->setPreference('auto_accept', '0')
-				->setPreference('canadmin', '0')
-				->setPreference('sessiontime', '0');
-
-			// Generate an email in the admin’s language
-			$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
-			I18N::init($webmaster->getPreference('language'));
-
-			$mail1_body =
-				I18N::translate('Hello administrator…') . Mail::EOL . Mail::EOL .
-				/* I18N: %s is a server name/URL */
-				I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml()) . Mail::EOL . Mail::EOL .
-				I18N::translate('Username') . ' ' . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-				I18N::translate('Real name') . ' ' . $user->getRealNameHtml() . Mail::EOL .
-				I18N::translate('Email address') . ' ' . Filter::escapeHtml($user->getEmail()) . Mail::EOL .
-				I18N::translate('Comments') . ' ' . Filter::escapeHtml($user_comments) . Mail::EOL . Mail::EOL .
-				I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') . Mail::EOL . Mail::EOL .
-				I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.');
-
-			$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
-			I18N::init(WT_LOCALE);
-
-			echo '<div id="login-register-page">';
-
-			// Generate an email in the user’s language
-			$mail2_body =
-				I18N::translate('Hello %s…', $user->getRealNameHtml()) .
-				Mail::EOL . Mail::EOL .
-				/* I18N: %1$s is the site URL and %2$s is an email address */
-				I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml(), $user->getEmail()) .
-				Mail::EOL . Mail::EOL .
-				I18N::translate('Follow this link to verify your email address.') .
-				Mail::EOL . Mail::EOL .
-				'<a href="' . WT_LOGIN_URL . '?user_name=' . Filter::escapeUrl($user->getUserName()) . '&amp;user_hashcode=' . $user->getPreference('reg_hashcode') . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameUrl() . '">' .
-				WT_LOGIN_URL . "?user_name=" . Filter::escapeHtml($user->getUserName()) . "&amp;user_hashcode=" . urlencode($user->getPreference('reg_hashcode')) . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameHtml() .
-				'</a>' . Mail::EOL . Mail::EOL .
-				I18N::translate('Username') . " - " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-				I18N::translate('Comments') . " - " . $user->getPreference('comment') . Mail::EOL .
-				I18N::translate('If you didn’t request an account, you can just delete this message.') . Mail::EOL;
-			$mail2_subject = /* I18N: %s is a server name/URL */ I18N::translate('Your registration at %s', WT_BASE_URL);
-			$mail2_to      = $user->getEmail();
-			$mail2_from    = $WT_TREE->getPreference('WEBTREES_EMAIL');
-
-			// Send user message by email only
-			Mail::send(
-				// “From:” header
-				$WT_TREE,
-				// “To:” header
-				$mail2_to,
-				$mail2_to,
-				// “Reply-To:” header
-				$mail2_from,
-				$mail2_from,
-				// Message body
-				$mail2_subject,
-				$mail2_body
-			);
+	case 'register':
+		if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+			header('Location: ' . WT_BASE_URL);
 
-			// Send admin message by email and/or internal messaging
-			Mail::send(
-				// “From:” header
-				$WT_TREE,
-				// “To:” header
-				$webmaster->getEmail(),
-				$webmaster->getRealName(),
-				// “Reply-To:” header
-				$user->getEmail(),
-				$user->getRealName(),
-				// Message body
-				$mail1_subject,
-				$mail1_body
-			);
-			$mail1_method = $webmaster->getPreference('contact_method');
-			if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
-				Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
-					->execute(array($user->getEmail(), WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
-			}
+			return;
+		}
 
-			echo '<div class="confirm"><p>', I18N::translate('Hello %s…<br>Thank you for your registration.', $user->getRealNameHtml()), '</p>';
-			echo '<p>', I18N::translate('We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your username and password.', $user->getEmail()), '</p>';
-			echo '</div>';
-			echo '</div>';
+		$controller->setPageTitle(I18N::translate('Request a new user account'));
+
+		// The form parameters are mandatory, and the validation errors are shown in the client.
+		if (Session::get('good_to_send') && $user_name && $user_password01 && $user_password01 == $user_password02 && $user_realname && $user_email && $user_comments) {
+
+			// These validation errors cannot be shown in the client.
+			if (User::findByUserName($user_name)) {
+				FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+			} elseif (User::findByEmail($user_email)) {
+				FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+			} elseif (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:ftp|http|https):\/\/)[a-zA-Z0-9.-]+)/', $user_comments, $match)) {
+				FlashMessages::addMessage(
+					I18N::translate('You are not allowed to send messages that contain external links.') . ' ' .
+					I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', $match[2], $match[1])
+				);
+				Log::addAuthenticationLog('Possible spam registration from "' . $user_name . '"/"' . $user_email . '" comments="' . $user_comments . '"');
+			} else {
+				// Everything looks good - create the user
+				$controller->pageHeader();
+				Log::addAuthenticationLog('User registration requested for: ' . $user_name);
+
+				$user = User::create($user_name, $user_realname, $user_email, $user_password01);
+				$user
+					->setPreference('language', WT_LOCALE)
+					->setPreference('verified', '0')
+					->setPreference('verified_by_admin', 0)
+					->setPreference('reg_timestamp', date('U'))
+					->setPreference('reg_hashcode', md5(Uuid::uuid4()))
+					->setPreference('contactmethod', 'messaging2')
+					->setPreference('comment', $user_comments)
+					->setPreference('visibleonline', '1')
+					->setPreference('auto_accept', '0')
+					->setPreference('canadmin', '0')
+					->setPreference('sessiontime', '0');
+
+				// Generate an email in the admin’s language
+				$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
+				I18N::init($webmaster->getPreference('language'));
+
+				$mail1_body =
+					I18N::translate('Hello administrator…') . Mail::EOL . Mail::EOL .
+					/* I18N: %s is a server name/URL */
+					I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml()) . Mail::EOL . Mail::EOL .
+					I18N::translate('Username') . ' ' . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+					I18N::translate('Real name') . ' ' . $user->getRealNameHtml() . Mail::EOL .
+					I18N::translate('Email address') . ' ' . Filter::escapeHtml($user->getEmail()) . Mail::EOL .
+					I18N::translate('Comments') . ' ' . Filter::escapeHtml($user_comments) . Mail::EOL . Mail::EOL .
+					I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') . Mail::EOL . Mail::EOL .
+					I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.');
+
+				$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
+				I18N::init(WT_LOCALE);
+
+				echo '<div id="login-register-page">';
+
+				// Generate an email in the user’s language
+				$mail2_body =
+					I18N::translate('Hello %s…', $user->getRealNameHtml()) .
+					Mail::EOL . Mail::EOL .
+					/* I18N: %1$s is the site URL and %2$s is an email address */
+					I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml(), $user->getEmail()) .
+					Mail::EOL . Mail::EOL .
+					I18N::translate('Follow this link to verify your email address.') .
+					Mail::EOL . Mail::EOL .
+					'<a href="' . WT_LOGIN_URL . '?user_name=' . Filter::escapeUrl($user->getUserName()) . '&amp;user_hashcode=' . $user->getPreference('reg_hashcode') . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameUrl() . '">' .
+					WT_LOGIN_URL . "?user_name=" . Filter::escapeHtml($user->getUserName()) . "&amp;user_hashcode=" . urlencode($user->getPreference('reg_hashcode')) . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameHtml() .
+					'</a>' . Mail::EOL . Mail::EOL .
+					I18N::translate('Username') . " - " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+					I18N::translate('Comments') . " - " . $user->getPreference('comment') . Mail::EOL .
+					I18N::translate('If you didn’t request an account, you can just delete this message.') . Mail::EOL;
+				$mail2_subject = /* I18N: %s is a server name/URL */ I18N::translate('Your registration at %s', WT_BASE_URL);
+				$mail2_to      = $user->getEmail();
+				$mail2_from    = $WT_TREE->getPreference('WEBTREES_EMAIL');
+
+				// Send user message by email only
+				Mail::send(
+					// “From:” header
+					$WT_TREE,
+					// “To:” header
+					$mail2_to,
+					$mail2_to,
+					// “Reply-To:” header
+					$mail2_from,
+					$mail2_from,
+					// Message body
+					$mail2_subject,
+					$mail2_body
+				);
+
+				// Send admin message by email and/or internal messaging
+				Mail::send(
+					// “From:” header
+					$WT_TREE,
+					// “To:” header
+					$webmaster->getEmail(),
+					$webmaster->getRealName(),
+					// “Reply-To:” header
+					$user->getEmail(),
+					$user->getRealName(),
+					// Message body
+					$mail1_subject,
+					$mail1_body
+				);
+				$mail1_method = $webmaster->getPreference('contact_method');
+				if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
+					Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
+						->execute(array($user->getEmail(), WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
+				}
 
-			return;
+				echo '<div class="confirm"><p>', I18N::translate('Hello %s…<br>Thank you for your registration.', $user->getRealNameHtml()), '</p>';
+				echo '<p>', I18N::translate('We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your username and password.', $user->getEmail()), '</p>';
+				echo '</div>';
+				echo '</div>';
+
+				return;
+			}
 		}
-	}
 
-	Session::put('good_to_send', true);
-	$controller
-		->pageHeader()
-		->addInlineJavascript('function regex_quote(str) {return str.replace(/[\\\\.?+*()[\](){}|]/g, "\\\\$&");}');
+		Session::put('good_to_send', true);
+		$controller
+			->pageHeader()
+			->addInlineJavascript('function regex_quote(str) {return str.replace(/[\\\\.?+*()[\](){}|]/g, "\\\\$&");}');
 
-	?>
+		?>
 	<div id="login-register-page">
 		<h2><?php echo $controller->getPageTitle(); ?></h2>
 
 		<?php if (Site::getPreference('SHOW_REGISTER_CAUTION')): ?>
-		<div id="register-text">
+			<div id="register-text">
 			<?php echo I18N::translate('<div class="largeError">Notice:</div><div class="error">By completing and submitting this form, you agree:<ul><li>to protect the privacy of living individuals listed on our site;</li><li>and in the text box below, to explain to whom you are related, or to provide us with information on someone who should be listed on our website.</li></ul></div>'); ?>
-		</div>
+			</div>
 		<?php endif; ?>
 		<div id="register-box">
 			<form id="register-form" name="register-form" method="post" onsubmit="return checkform(this);" autocomplete="off">
@@ -418,7 +418,7 @@ 
 				<div>
 					<label for="user_realname">
 						<?php echo I18N::translate('Real name'); ?>
-						<input type="text" id="user_realname" name="user_realname" required maxlength="64" value="<?php echo Filter::escapeHtml($user_realname); ?>" autofocus>
+							<input type="text" id="user_realname" name="user_realname" required maxlength="64" value="<?php echo Filter::escapeHtml($user_realname); ?>" autofocus>
 					</label>
 					<p class="small text-muted">
 						<?php echo I18N::translate('This is your real name, as you would like it displayed on screen.'); ?>
@@ -428,7 +428,7 @@ 
 				<div>
 					<label for="user_email">
 						<?php echo I18N::translate('Email address'); ?>
-						<input type="email" id="user_email" name="user_email" required maxlength="64" value="<?php echo Filter::escapeHtml($user_email); ?>">
+							<input type="email" id="user_email" name="user_email" required maxlength="64" value="<?php echo Filter::escapeHtml($user_email); ?>">
 					</label>
 					<p class="small text-muted">
 						<?php echo I18N::translate('This email address will be used to send password reminders, website notifications, and messages from other family members who are registered on the website.'); ?>
@@ -438,7 +438,7 @@ 
 				<div>
 					<label for="username">
 						<?php echo I18N::translate('Username'); ?>
-						<input type="text" id="username" name="user_name" required maxlength="32" value="<?php Filter::escapeHtml($user_name); ?>">
+							<input type="text" id="username" name="user_name" required maxlength="32" value="<?php Filter::escapeHtml($user_name); ?>">
 					</label>
 					<p class="small text-muted">
 						<?php echo I18N::translate('Usernames are case-insensitive and ignore accented letters, so that “chloe”, “chloë”, and “Chloe” are considered to be the same.'); ?>
@@ -501,24 +501,24 @@ 
 		</div>
 	</div>
 	<?php
-	break;
+		break;
 
-case 'userverify':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
+	case 'userverify':
+		if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+			header('Location: ' . WT_BASE_URL);
 
-		return;
-	}
+			return;
+		}
 
-	// Change to the new user’s language
-	$user = User::findByUserName($user_name);
+		// Change to the new user’s language
+		$user = User::findByUserName($user_name);
 
-	I18N::init($user->getPreference('language'));
+		I18N::init($user->getPreference('language'));
 
-	$controller->setPageTitle(I18N::translate('User verification'));
-	$controller->pageHeader();
+		$controller->setPageTitle(I18N::translate('User verification'));
+		$controller->pageHeader();
 
-	echo '<div id="login-register-page">
+		echo '<div id="login-register-page">
 		<form id="verify-form" name="verify-form" method="post" action="', WT_LOGIN_URL, '">
 			<input type="hidden" name="action" value="verify_hash">
 			<h4>', I18N::translate('User verification'), '</h4>
@@ -539,87 +539,87 @@ 
 			</div>
 		</form>
 	</div>';
-	break;
+		break;
 
-case 'verify_hash':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
+	case 'verify_hash':
+		if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+			header('Location: ' . WT_BASE_URL);
 
-		return;
-	}
-
-	// switch language to webmaster settings
-	$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
-	I18N::init($webmaster->getPreference('language'));
-
-	$user          = User::findByUserName($user_name);
-	$edit_user_url = WT_BASE_URL . "admin_users.php?action=edit&amp;user_id=" . $user->getUserId();
-	$mail1_body    =
-		I18N::translate('Hello administrator…') .
-		Mail::EOL . Mail::EOL .
-		/* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
-			'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
-			$user->getRealNameHtml(),
-			Filter::escapeHtml($user->getUserName()),
-			Filter::escapeHtml($user->getEmail())
-		) .
-		Mail::EOL . Mail::EOL .
-		I18N::translate('You need to review the account details.') .
-		Mail::EOL . Mail::EOL .
-		'<a href="' . $edit_user_url . '">' . $edit_user_url . '</a>' .
-		Mail::EOL . Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Set the status to “approved”.') .
-		Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Set the access level for each tree.') .
-		Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Link the user account to an individual.');
-
-	$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New user at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
-
-	// Change to the new user’s language
-	I18N::init($user->getPreference('language'));
-
-	$controller->setPageTitle(I18N::translate('User verification'));
-	$controller->pageHeader();
-
-	echo '<div id="login-register-page">';
-	echo '<h2>' . I18N::translate('User verification') . '</h2>';
-	echo '<div id="user-verify">';
-	if ($user && $user->checkPassword($user_password) && $user->getPreference('reg_hashcode') === $user_hashcode) {
-		Mail::send(
-		// “From:” header
-			$WT_TREE,
-			// “To:” header
-			$webmaster->getEmail(),
-			$webmaster->getRealName(),
-			// “Reply-To:” header
-			$WT_TREE->getPreference('WEBTREES_EMAIL'),
-			$WT_TREE->getPreference('WEBTREES_EMAIL'),
-			// Message body
-			$mail1_subject,
-			$mail1_body
-		);
-		$mail1_method = $webmaster->getPreference('CONTACT_METHOD');
-		if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
-			Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
-				->execute(array($user_name, WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
+			return;
 		}
 
-		$user
-			->setPreference('verified', '1')
-			->setPreference('reg_timestamp', date('U'))
-			->deletePreference('reg_hashcode');
+		// switch language to webmaster settings
+		$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
+		I18N::init($webmaster->getPreference('language'));
+
+		$user          = User::findByUserName($user_name);
+		$edit_user_url = WT_BASE_URL . "admin_users.php?action=edit&amp;user_id=" . $user->getUserId();
+		$mail1_body    =
+			I18N::translate('Hello administrator…') .
+			Mail::EOL . Mail::EOL .
+			/* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
+				'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
+				$user->getRealNameHtml(),
+				Filter::escapeHtml($user->getUserName()),
+				Filter::escapeHtml($user->getEmail())
+			) .
+			Mail::EOL . Mail::EOL .
+			I18N::translate('You need to review the account details.') .
+			Mail::EOL . Mail::EOL .
+			'<a href="' . $edit_user_url . '">' . $edit_user_url . '</a>' .
+			Mail::EOL . Mail::EOL .
+			/* I18N: You need to: */ I18N::translate('Set the status to “approved”.') .
+			Mail::EOL .
+			/* I18N: You need to: */ I18N::translate('Set the access level for each tree.') .
+			Mail::EOL .
+			/* I18N: You need to: */ I18N::translate('Link the user account to an individual.');
+
+		$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New user at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
+
+		// Change to the new user’s language
+		I18N::init($user->getPreference('language'));
+
+		$controller->setPageTitle(I18N::translate('User verification'));
+		$controller->pageHeader();
+
+		echo '<div id="login-register-page">';
+		echo '<h2>' . I18N::translate('User verification') . '</h2>';
+		echo '<div id="user-verify">';
+		if ($user && $user->checkPassword($user_password) && $user->getPreference('reg_hashcode') === $user_hashcode) {
+			Mail::send(
+			// “From:” header
+				$WT_TREE,
+				// “To:” header
+				$webmaster->getEmail(),
+				$webmaster->getRealName(),
+				// “Reply-To:” header
+				$WT_TREE->getPreference('WEBTREES_EMAIL'),
+				$WT_TREE->getPreference('WEBTREES_EMAIL'),
+				// Message body
+				$mail1_subject,
+				$mail1_body
+			);
+			$mail1_method = $webmaster->getPreference('CONTACT_METHOD');
+			if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
+				Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
+					->execute(array($user_name, WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
+			}
 
-		Log::addAuthenticationLog('User ' . $user_name . ' verified their email address');
+			$user
+				->setPreference('verified', '1')
+				->setPreference('reg_timestamp', date('U'))
+				->deletePreference('reg_hashcode');
 
-		echo '<p>', I18N::translate('You have confirmed your request to become a registered user.'), '</p>';
-		echo '<p>', I18N::translate('The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your username and password.'), '</p>';
-	} else {
-		echo '<p class="warning">';
-		echo I18N::translate('Could not verify the information you entered. Please try again or contact the site administrator for more information.');
-		echo '</p>';
-	}
-	echo '</div>';
-	echo '</div>';
-	break;
+			Log::addAuthenticationLog('User ' . $user_name . ' verified their email address');
+
+			echo '<p>', I18N::translate('You have confirmed your request to become a registered user.'), '</p>';
+			echo '<p>', I18N::translate('The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your username and password.'), '</p>';
+		} else {
+			echo '<p class="warning">';
+			echo I18N::translate('Could not verify the information you entered. Please try again or contact the site administrator for more information.');
+			echo '</p>';
+		}
+		echo '</div>';
+		echo '</div>';
+		break;
 }

descendancy.php

Switch Indentation +19 added lines, -19 removed lines

@@ -96,25 +96,25 @@
 	echo '<p class="ui-state-error">', $controller->error_message, '</p>';
 } else {
 	switch ($controller->chart_style) {
-	case 0: // List
-		echo '<ul id="descendancy_chart" class="chart_common">';
-		$controller->printChildDescendancy($controller->root, $controller->generations);
-		echo '</ul>';
-		break;
-	case 1: // Booklet
-		$show_cousins = true;
-		echo '<div id="descendancy_booklet">';
-		$controller->printChildFamily($controller->root, $controller->generations);
-		echo '</div>';
-		break;
-	case 2: // Individual list
-		$descendants = $controller->individualDescendancy($controller->root, $controller->generations, array());
-		echo '<div id="descendancy-list">', FunctionsPrintLists::individualTable($descendants), '</div>';
-		break;
-	case 3: // Family list
-		$descendants = $controller->familyDescendancy($controller->root, $controller->generations, array());
-		echo '<div id="descendancy-list">', FunctionsPrintLists::familyTable($descendants), '</div>';
-		break;
+		case 0: // List
+			echo '<ul id="descendancy_chart" class="chart_common">';
+			$controller->printChildDescendancy($controller->root, $controller->generations);
+			echo '</ul>';
+			break;
+		case 1: // Booklet
+			$show_cousins = true;
+			echo '<div id="descendancy_booklet">';
+			$controller->printChildFamily($controller->root, $controller->generations);
+			echo '</div>';
+			break;
+		case 2: // Individual list
+			$descendants = $controller->individualDescendancy($controller->root, $controller->generations, array());
+			echo '<div id="descendancy-list">', FunctionsPrintLists::individualTable($descendants), '</div>';
+			break;
+		case 3: // Family list
+			$descendants = $controller->familyDescendancy($controller->root, $controller->generations, array());
+			echo '<div id="descendancy-list">', FunctionsPrintLists::familyTable($descendants), '</div>';
+			break;
 	}
 }
 ?>

placelist.php

Switch Indentation +142 added lines, -142 removed lines

@@ -51,170 +51,170 @@
 echo '<div id="place-hierarchy">';
 
 switch ($display) {
-case 'list':
-	echo '<h2>', $controller->getPageTitle(), '</h2>';
-	$list_places = Place::allPlaces($WT_TREE);
-	$numfound    = count($list_places);
+	case 'list':
+		echo '<h2>', $controller->getPageTitle(), '</h2>';
+		$list_places = Place::allPlaces($WT_TREE);
+		$numfound    = count($list_places);
 
-	$divisor = $numfound > 20 ? 3 : 2;
+		$divisor = $numfound > 20 ? 3 : 2;
 
-	if ($numfound === 0) {
-		echo '<b>', I18N::translate('No results found.'), '</b><br>';
-	} else {
-		$columns = array_chunk($list_places, ceil($numfound / $divisor));
-
-		$html = '<table class="list_table"><thead>';
-		$html .= '<tr><th class="list_label" colspan="' . $divisor . '">';
-		$html .= '<i class="icon-place"></i> ' . I18N::translate('Place list');
-		$html .= '</th></tr></thead>';
-		$html .= '<tbody><tr>';
-		foreach ($columns as $column) {
-			$html .= '<td class="list_value_wrap"><ul>';
-			foreach ($column as $item) {
-				$html .= '<li><a href="' . $item->getURL() . '">' . $item->getReverseName() . '</a></li>';
+		if ($numfound === 0) {
+			echo '<b>', I18N::translate('No results found.'), '</b><br>';
+		} else {
+			$columns = array_chunk($list_places, ceil($numfound / $divisor));
+
+			$html = '<table class="list_table"><thead>';
+			$html .= '<tr><th class="list_label" colspan="' . $divisor . '">';
+			$html .= '<i class="icon-place"></i> ' . I18N::translate('Place list');
+			$html .= '</th></tr></thead>';
+			$html .= '<tbody><tr>';
+			foreach ($columns as $column) {
+				$html .= '<td class="list_value_wrap"><ul>';
+				foreach ($column as $item) {
+					$html .= '<li><a href="' . $item->getURL() . '">' . $item->getReverseName() . '</a></li>';
+				}
+				$html .= '</ul></td>';
 			}
-			$html .= '</ul></td>';
+			$html .= '</tr></tbody></table>';
+			echo $html;
 		}
-		$html .= '</tr></tbody></table>';
-		echo $html;
-	}
-	echo '<h4><a href="placelist.php?display=hierarchy">', I18N::translate('Show places in hierarchy'), '</a></h4>';
-	break;
-case 'hierarchy':
-	$gm_module = Module::getModuleByName('googlemap');
+		echo '<h4><a href="placelist.php?display=hierarchy">', I18N::translate('Show places in hierarchy'), '</a></h4>';
+		break;
+	case 'hierarchy':
+		$gm_module = Module::getModuleByName('googlemap');
 
-	// Find this place and its ID
-	$place    = new Place(implode(', ', array_reverse($parent)), $WT_TREE);
-	$place_id = $place->getPlaceId();
+		// Find this place and its ID
+		$place    = new Place(implode(', ', array_reverse($parent)), $WT_TREE);
+		$place_id = $place->getPlaceId();
 
-	$child_places = $place->getChildPlaces();
+		$child_places = $place->getChildPlaces();
 
-	$numfound = count($child_places);
+		$numfound = count($child_places);
 
-	//-- if the number of places found is 0 then automatically redirect to search page
-	if ($numfound === 0) {
-		$action = 'show';
-	}
-
-	echo '<h2>', $controller->getPageTitle();
-	// Breadcrumbs
-	if ($place_id) {
-		$parent_place = $place->getParentPlace();
-		while ($parent_place->getPlaceId()) {
-			echo ', <a href="', $parent_place->getURL(), '" dir="auto">', $parent_place->getPlaceName(), '</a>';
-			$parent_place = $parent_place->getParentPlace();
+		//-- if the number of places found is 0 then automatically redirect to search page
+		if ($numfound === 0) {
+			$action = 'show';
 		}
-		echo ', <a href="', WT_SCRIPT_NAME, '">', I18N::translate('Top level'), '</a>';
-	}
-	echo '</h2>';
 
-	if ($gm_module && $gm_module->getSetting('GM_PLACE_HIERARCHY')) {
-		$linklevels  = '';
-		$place_names = array();
-		for ($j = 0; $j < $level; $j++) {
-			$linklevels .= '&amp;parent[' . $j . ']=' . rawurlencode($parent[$j]);
+		echo '<h2>', $controller->getPageTitle();
+		// Breadcrumbs
+		if ($place_id) {
+			$parent_place = $place->getParentPlace();
+			while ($parent_place->getPlaceId()) {
+				echo ', <a href="', $parent_place->getURL(), '" dir="auto">', $parent_place->getPlaceName(), '</a>';
+				$parent_place = $parent_place->getParentPlace();
+			}
+			echo ', <a href="', WT_SCRIPT_NAME, '">', I18N::translate('Top level'), '</a>';
 		}
+		echo '</h2>';
 
-		$gm_module->createMap();
-	} elseif (Module::getModuleByName('places_assistant')) {
-		// Places Assistant is a custom/add-on module that was once part of the core code.
-		\PlacesAssistantModule::display_map($level, $parent);
-	}
+		if ($gm_module && $gm_module->getSetting('GM_PLACE_HIERARCHY')) {
+			$linklevels  = '';
+			$place_names = array();
+			for ($j = 0; $j < $level; $j++) {
+				$linklevels .= '&amp;parent[' . $j . ']=' . rawurlencode($parent[$j]);
+			}
 
-	if ($numfound > 0) {
-		if ($numfound > 20) {
-			$divisor = 3;
-		} elseif ($numfound > 4) {
-			$divisor = 2;
-		} else {
-			$divisor = 1;
+			$gm_module->createMap();
+		} elseif (Module::getModuleByName('places_assistant')) {
+			// Places Assistant is a custom/add-on module that was once part of the core code.
+			\PlacesAssistantModule::display_map($level, $parent);
 		}
 
-		$columns = array_chunk($child_places, ceil($numfound / $divisor));
-		$html    = '<table id="place_hierarchy" class="list_table"><thead><tr><th class="list_label" colspan="' . $divisor . '">';
-		$html .= '<i class="icon-place"></i> ';
-		if ($place_id) {
-			$html .= I18N::translate('Places in %s', $place->getPlaceName());
-		} else {
-			$html .= I18N::translate('Place hierarchy');
-		}
-		$html .= '</th></tr></thead>';
-		$html .= '<tbody><tr>';
-		foreach ($columns as $column) {
-			$html .= '<td class="list_value"><ul>';
-			foreach ($column as $item) {
-				$html .= '<li><a href="' . $item->getURL() . '" class="list_item">' . $item->getPlaceName() . '</a></li>';
-				if ($gm_module && $gm_module->getSetting('GM_PLACE_HIERARCHY')) {
-					list($tmp)     = explode(', ', $item->getGedcomName(), 2);
-					$place_names[] = $tmp;
+		if ($numfound > 0) {
+			if ($numfound > 20) {
+				$divisor = 3;
+			} elseif ($numfound > 4) {
+				$divisor = 2;
+			} else {
+				$divisor = 1;
+			}
+
+			$columns = array_chunk($child_places, ceil($numfound / $divisor));
+			$html    = '<table id="place_hierarchy" class="list_table"><thead><tr><th class="list_label" colspan="' . $divisor . '">';
+			$html .= '<i class="icon-place"></i> ';
+			if ($place_id) {
+				$html .= I18N::translate('Places in %s', $place->getPlaceName());
+			} else {
+				$html .= I18N::translate('Place hierarchy');
+			}
+			$html .= '</th></tr></thead>';
+			$html .= '<tbody><tr>';
+			foreach ($columns as $column) {
+				$html .= '<td class="list_value"><ul>';
+				foreach ($column as $item) {
+					$html .= '<li><a href="' . $item->getURL() . '" class="list_item">' . $item->getPlaceName() . '</a></li>';
+					if ($gm_module && $gm_module->getSetting('GM_PLACE_HIERARCHY')) {
+						list($tmp)     = explode(', ', $item->getGedcomName(), 2);
+						$place_names[] = $tmp;
+					}
 				}
+				$html .= '</ul></td>';
 			}
-			$html .= '</ul></td>';
-		}
-		$html .= '</tr></tbody>';
-		if ($numfound > 0 && $action == 'find' && $place_id) {
-			$html .= '<tfoot><tr><td class="list_label" colspan="' . $divisor . '">';
-			$html .= I18N::translate('View all records found in this place');
-			$html .= '</td></tr><tr><td class="list_value" colspan="' . $divisor . '" style="text-align: center;">';
-			$html .= '<a href="' . $place->getURL() . '&amp;action=show" class="formField">' . $place->getPlaceName() . '</a>';
-			$html .= '</td></tr></tfoot>';
+			$html .= '</tr></tbody>';
+			if ($numfound > 0 && $action == 'find' && $place_id) {
+				$html .= '<tfoot><tr><td class="list_label" colspan="' . $divisor . '">';
+				$html .= I18N::translate('View all records found in this place');
+				$html .= '</td></tr><tr><td class="list_value" colspan="' . $divisor . '" style="text-align: center;">';
+				$html .= '<a href="' . $place->getURL() . '&amp;action=show" class="formField">' . $place->getPlaceName() . '</a>';
+				$html .= '</td></tr></tfoot>';
+			}
+			$html .= '</table>';
+			// -- echo the array
+			echo $html;
 		}
-		$html .= '</table>';
-		// -- echo the array
-		echo $html;
-	}
-	if ($place_id && $action == 'show') {
-		// -- array of names
-		$myindilist = array();
-		$myfamlist  = array();
-
-		$positions =
-			Database::prepare("SELECT DISTINCT pl_gid FROM `##placelinks` WHERE pl_p_id=? AND pl_file=?")
-			->execute(array($place_id, $WT_TREE->getTreeId()))
-			->fetchOneColumn();
-
-		foreach ($positions as $position) {
-			$record = GedcomRecord::getInstance($position, $WT_TREE);
-			if ($record && $record->canShow()) {
-				if ($record instanceof Individual) {
-					$myindilist[] = $record;
-				}
-				if ($record instanceof Family) {
-					$myfamlist[] = $record;
+		if ($place_id && $action == 'show') {
+			// -- array of names
+			$myindilist = array();
+			$myfamlist  = array();
+
+			$positions =
+				Database::prepare("SELECT DISTINCT pl_gid FROM `##placelinks` WHERE pl_p_id=? AND pl_file=?")
+				->execute(array($place_id, $WT_TREE->getTreeId()))
+				->fetchOneColumn();
+
+			foreach ($positions as $position) {
+				$record = GedcomRecord::getInstance($position, $WT_TREE);
+				if ($record && $record->canShow()) {
+					if ($record instanceof Individual) {
+						$myindilist[] = $record;
+					}
+					if ($record instanceof Family) {
+						$myfamlist[] = $record;
+					}
 				}
 			}
+			echo '<br>';
+
+			//-- display results
+			$controller
+				->addInlineJavascript('jQuery("#places-tabs").tabs();')
+				->addInlineJavascript('jQuery("#places-tabs").css("visibility", "visible");')
+				->addInlineJavascript('jQuery(".loading-image").css("display", "none");');
+
+			echo '<div class="loading-image"></div>';
+			echo '<div id="places-tabs"><ul>';
+			if (!empty($myindilist)) {
+				echo '<li><a href="#places-indi"><span id="indisource">', I18N::translate('Individuals'), '</span></a></li>';
+			}
+			if (!empty($myfamlist)) {
+				echo '<li><a href="#places-fam"><span id="famsource">', I18N::translate('Families'), '</span></a></li>';
+			}
+			echo '</ul>';
+			if (!empty($myindilist)) {
+				echo '<div id="places-indi">', FunctionsPrintLists::individualTable($myindilist), '</div>';
+			}
+			if (!empty($myfamlist)) {
+				echo '<div id="places-fam">', FunctionsPrintLists::familyTable($myfamlist), '</div>';
+			}
+			echo '</div>'; // <div id="places-tabs">
 		}
-		echo '<br>';
-
-		//-- display results
-		$controller
-			->addInlineJavascript('jQuery("#places-tabs").tabs();')
-			->addInlineJavascript('jQuery("#places-tabs").css("visibility", "visible");')
-			->addInlineJavascript('jQuery(".loading-image").css("display", "none");');
-
-		echo '<div class="loading-image"></div>';
-		echo '<div id="places-tabs"><ul>';
-		if (!empty($myindilist)) {
-			echo '<li><a href="#places-indi"><span id="indisource">', I18N::translate('Individuals'), '</span></a></li>';
-		}
-		if (!empty($myfamlist)) {
-			echo '<li><a href="#places-fam"><span id="famsource">', I18N::translate('Families'), '</span></a></li>';
-		}
-		echo '</ul>';
-		if (!empty($myindilist)) {
-			echo '<div id="places-indi">', FunctionsPrintLists::individualTable($myindilist), '</div>';
-		}
-		if (!empty($myfamlist)) {
-			echo '<div id="places-fam">', FunctionsPrintLists::familyTable($myfamlist), '</div>';
-		}
-		echo '</div>'; // <div id="places-tabs">
-	}
-	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
+		echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
 
-	if ($gm_module && $gm_module->getSetting('GM_PLACE_HIERARCHY')) {
-		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
-	}
-	break;
+		if ($gm_module && $gm_module->getSetting('GM_PLACE_HIERARCHY')) {
+			$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
+		}
+		break;
 }
 
 echo '</div>'; // <div id="place-hierarchy">

indilist.php

Switch Indentation +41 added lines, -41 removed lines

@@ -46,12 +46,12 @@ 
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
-case 'no':
-case 'yes':
-	Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
-	break;
-default:
-	$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
+	case 'no':
+	case 'yes':
+		Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
+		break;
+	default:
+		$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
 }
 
 // Make sure selections are consistent.
@@ -91,16 +91,16 @@ 
 	}
 	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
 	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
+		case '':
+			break;
+		case '@':
+			$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+			$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+			break;
+		default:
+			$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
+			$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+			break;
 	}
 	$show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
@@ -136,15 +136,15 @@ 
 $list = array();
 foreach (QueryName::surnameAlpha($WT_TREE, $show_marnm === 'yes', false) as $letter => $count) {
 	switch ($letter) {
-	case '@':
-		$html = I18N::translateContext('Unknown surname', '…');
-		break;
-	case ',':
-		$html = I18N::translate('None');
-		break;
-	default:
-		$html = Filter::escapeHtml($letter);
-		break;
+		case '@':
+			$html = I18N::translateContext('Unknown surname', '…');
+			break;
+		case ',':
+			$html = I18N::translate('None');
+			break;
+		default:
+			$html = Filter::escapeHtml($letter);
+			break;
 	}
 	if ($count) {
 		if ($letter == $alpha) {
@@ -194,16 +194,16 @@ 
 	if ($show === 'surn') {
 		// Show the surname list
 		switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
-			break;
+			case 'style1':
+				echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
+				break;
+			case 'style3':
+				echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
+				break;
+			case 'style2':
+			default:
+				echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
+				break;
 		}
 	} else {
 		// Show the list
@@ -226,12 +226,12 @@ 
 				$list = array();
 				foreach ($givn_initials as $givn_initial => $count) {
 					switch ($givn_initial) {
-					case '@':
-						$html = I18N::translateContext('Unknown given name', '…');
-						break;
-					default:
-						$html = Filter::escapeHtml($givn_initial);
-						break;
+						case '@':
+							$html = I18N::translateContext('Unknown given name', '…');
+							break;
+						default:
+							$html = Filter::escapeHtml($givn_initial);
+							break;
 					}
 					if ($count) {
 						if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {

find.php

Switch Indentation +54 added lines, -54 removed lines

@@ -47,60 +47,60 @@
 $embed = substr($choose, 0, 1) === '1';
 
 switch ($type) {
-case 'indi':
-	$controller->setPageTitle(I18N::translate('Find an individual'));
-	break;
-case 'fam':
-	$controller->setPageTitle(I18N::translate('Find a family'));
-	break;
-case 'media':
-	$controller->setPageTitle(I18N::translate('Find a media object'));
-	break;
-case 'place':
-	$controller->setPageTitle(I18N::translate('Find a place'));
-	break;
-case 'repo':
-	$controller->setPageTitle(I18N::translate('Find a repository'));
-	break;
-case 'note':
-	$controller->setPageTitle(I18N::translate('Find a shared note'));
-	break;
-case 'source':
-	$controller->setPageTitle(I18N::translate('Find a source'));
-	break;
-case 'specialchar':
-	$controller->setPageTitle(I18N::translate('Find a special character'));
-	break;
-case 'factINDI':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("INDI");');
-	break;
-case 'factFAM':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("FAM");');
-	break;
-case 'factSOUR':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("SOUR");');
-	break;
-case 'factREPO':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("REPO");');
-	break;
-case 'factNAME':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("NAME");');
-	break;
-case 'factPLAC':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("PLAC");');
-	break;
+	case 'indi':
+		$controller->setPageTitle(I18N::translate('Find an individual'));
+		break;
+	case 'fam':
+		$controller->setPageTitle(I18N::translate('Find a family'));
+		break;
+	case 'media':
+		$controller->setPageTitle(I18N::translate('Find a media object'));
+		break;
+	case 'place':
+		$controller->setPageTitle(I18N::translate('Find a place'));
+		break;
+	case 'repo':
+		$controller->setPageTitle(I18N::translate('Find a repository'));
+		break;
+	case 'note':
+		$controller->setPageTitle(I18N::translate('Find a shared note'));
+		break;
+	case 'source':
+		$controller->setPageTitle(I18N::translate('Find a source'));
+		break;
+	case 'specialchar':
+		$controller->setPageTitle(I18N::translate('Find a special character'));
+		break;
+	case 'factINDI':
+		$controller
+			->setPageTitle(I18N::translate('Find a fact or event'))
+			->addInlineJavascript('initPickFact("INDI");');
+		break;
+	case 'factFAM':
+		$controller
+			->setPageTitle(I18N::translate('Find a fact or event'))
+			->addInlineJavascript('initPickFact("FAM");');
+		break;
+	case 'factSOUR':
+		$controller
+			->setPageTitle(I18N::translate('Find a fact or event'))
+			->addInlineJavascript('initPickFact("SOUR");');
+		break;
+	case 'factREPO':
+		$controller
+			->setPageTitle(I18N::translate('Find a fact or event'))
+			->addInlineJavascript('initPickFact("REPO");');
+		break;
+	case 'factNAME':
+		$controller
+			->setPageTitle(I18N::translate('Find a fact or event'))
+			->addInlineJavascript('initPickFact("NAME");');
+		break;
+	case 'factPLAC':
+		$controller
+			->setPageTitle(I18N::translate('Find a fact or event'))
+			->addInlineJavascript('initPickFact("PLAC");');
+		break;
 }
 $controller->pageHeader();
 

admin_trees_renumber.php

Switch Indentation +137 added lines, -137 removed lines

@@ -86,143 +86,143 @@
 		);
 		$new_xref = $WT_TREE->getNewXref($type);
 		switch ($type) {
-		case 'INDI':
-			Database::prepare(
-				"UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'FAM':
-			Database::prepare(
-				"UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'SOUR':
-			Database::prepare(
-				"UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'REPO':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'NOTE':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'OBJE':
-			Database::prepare(
-				"UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		default:
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			break;
+			case 'INDI':
+				Database::prepare(
+					"UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
+				)->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+				)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+				)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
+				)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+				break;
+			case 'FAM':
+				Database::prepare(
+					"UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
+				)->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+				)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+				)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+				break;
+			case 'SOUR':
+				Database::prepare(
+					"UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
+				)->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+				)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+				)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+				break;
+			case 'REPO':
+				Database::prepare(
+					"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+				)->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+				)->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
+				break;
+			case 'NOTE':
+				Database::prepare(
+					"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
+				)->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+				)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+				)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+				)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+				break;
+			case 'OBJE':
+				Database::prepare(
+					"UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
+				)->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+				)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+				)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+				)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+				break;
+			default:
+				Database::prepare(
+					"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+				)->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+				)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+				)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+				)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+				)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+				Database::prepare(
+					"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+				)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+				break;
 		}
 		Database::prepare(
 			"UPDATE `##name` SET n_id = ? WHERE n_id = ? AND n_file = ?"

import.php

Switch Indentation +69 added lines, -69 removed lines

@@ -125,75 +125,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(array($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(array($gedcom_id));
-			break;
-		case 'ANSI': // ANSI could be anything. Most applications seem to treat it as latin1.
-			$controller->addInlineJavascript(
-				'jQuery("#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(array($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(array($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(array($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('jQuery("#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(array($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(array($gedcom_id));
+				break;
+			case 'ANSI': // ANSI could be anything. Most applications seem to treat it as latin1.
+				$controller->addInlineJavascript(
+					'jQuery("#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(array($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(array($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(array($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('jQuery("#actions' . $gedcom_id . '").removeClass("hidden");');
+
+				return;
 		}
 		$first_time = false;
 

statisticsplot.php

Switch Indentation +501 added lines, -501 removed lines

@@ -852,528 +852,528 @@
 echo '<div class="statistics_chart" title="', I18N::translate('Statistics chart'), '">';
 
 switch ($x_axis) {
-case '1':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), Filter::get('chart_type'), Filter::get('SURN')));
-	break;
-case '2':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'birth_distribution_chart'));
-	break;
-case '3':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'death_distribution_chart'));
-	break;
-case '4':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'marriage_distribution_chart'));
-	break;
-case '11':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of birth');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
+	case '1':
+		echo $stats->chartDistribution(array(Filter::get('chart_shows'), Filter::get('chart_type'), Filter::get('SURN')));
+		break;
+	case '2':
+		echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'birth_distribution_chart'));
+		break;
+	case '3':
+		echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'death_distribution_chart'));
+		break;
+	case '4':
+		echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'marriage_distribution_chart'));
+		break;
+	case '11':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of birth');
+		$xtitle            = I18N::translate('month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
+		}
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_birth($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '12':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of death');
+		$xtitle            = I18N::translate('month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = month_of_birth($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '12':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of death');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_death($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '13':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
 		}
-	}
-	$total = month_of_death($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '13':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
 
-	if ($z_axis === 301) {
-		$z_axis = 300;
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of marriage');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
+		if ($z_axis === 301) {
+			$z_axis = 300;
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of marriage');
+		$xtitle            = I18N::translate('month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
+		}
 		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Families');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_marriage($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '14':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of birth of first child in a relation');
+		$xtitle            = I18N::translate('month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = month_of_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '14':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of birth of first child in a relation');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Children');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Children');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_birth_of_first_child($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '15':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
 		}
-	}
-	$total = month_of_birth_of_first_child($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '15':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
 
-	if ($z_axis === 301) {
-		$z_axis = 300;
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of first marriage');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($z_axis === 301) {
+			$z_axis = 300;
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of first marriage');
+		$xtitle            = I18N::translate('month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = month_of_first_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '17':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age related to birth year');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Families');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_first_marriage($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '17':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Age related to birth year');
+		$xtitle            = I18N::translate('age');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = lifespan_by_birth_year($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '18':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age related to death year');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = lifespan_by_birth_year($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '18':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Age related to death year');
+		$xtitle            = I18N::translate('age');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = lifespan_by_death_year($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '19':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age in year of marriage');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female     = false;
-	$z_boundaries[0] = 100000;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = lifespan_by_death_year($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '19':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Age in year of marriage');
+		$xtitle            = I18N::translate('age');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = age_at_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '20':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age in year of first marriage');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female     = false;
 		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = age_at_marriage($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '20':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Age in year of first marriage');
+		$xtitle            = I18N::translate('age');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = age_at_first_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '21':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Number of children');
-	$xtitle            = I18N::translate('children');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
 		}
-	}
-	$total = number_of_children($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalChildren();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-default:
-	echo '<i class="icon-loading-large"></i>';
-	break;
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = age_at_first_marriage($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '21':
+		$monthdata = array();
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Number of children');
+		$xtitle            = I18N::translate('children');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
+		}
+		$percentage = false;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Families');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+			$xtitle      = $xtitle . I18N::translate(' per gender');
+		} elseif ($z_axis === 302) {
+			$xtitle = $xtitle . I18N::translate(' per time period');
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = number_of_children($z_axis, $z_boundaries, $stats);
+		$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalChildren();
+		my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	default:
+		echo '<i class="icon-loading-large"></i>';
+		break;
 }
 echo '</div>';

admin_pgv_to_wt.php

Switch Indentation +83 added lines, -83 removed lines

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