fisharebest / webtrees

includes/session.php

Switch Indentation +42 added lines, -42 removed lines

@@ -200,29 +200,29 @@ 
 		$frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
 		array_walk($frame['args'], function (&$arg) {
 			switch (gettype($arg)) {
-			case 'boolean':
-			case 'integer':
-			case 'double':
-			case 'null':
-				$arg = var_export($arg, true);
-				break;
-			case 'string':
-				if (mb_strlen($arg) > 30) {
-					$arg = substr($arg, 0, 30) . '…';
-				}
-				$arg = var_export($arg, true);
-				break;
-			case 'object':
-				$reflection = new \ReflectionClass($arg);
-				if (is_object($arg) && method_exists($arg, '__toString')) {
-					$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
-				} else {
-					$arg = '[' . $reflection->getShortName() . ']';
-				}
-				break;
-			default:
-				$arg = '[' . gettype($arg) . ']';
-				break;
+				case 'boolean':
+				case 'integer':
+				case 'double':
+				case 'null':
+					$arg = var_export($arg, true);
+					break;
+				case 'string':
+					if (mb_strlen($arg) > 30) {
+						$arg = substr($arg, 0, 30) . '…';
+					}
+					$arg = var_export($arg, true);
+					break;
+				case 'object':
+					$reflection = new \ReflectionClass($arg);
+					if (is_object($arg) && method_exists($arg, '__toString')) {
+						$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
+					} else {
+						$arg = '[' . $reflection->getShortName() . ']';
+					}
+					break;
+				default:
+					$arg = '[' . gettype($arg) . ']';
+					break;
 			}
 		});
 		$frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);
@@ -319,25 +319,25 @@ 
 )->execute(array(WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')))->fetchOne();
 
 switch ($rule) {
-case 'allow':
-	$SEARCH_SPIDER = false;
-	break;
-case 'deny':
-	http_response_code(403);
-	exit;
-case 'robot':
-case 'unknown':
-	// Search engines don’t send cookies, and so create a new session with every visit.
-	// Make sure they always use the same one
-	Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
-	$SEARCH_SPIDER = true;
-	break;
-case '':
-	Database::prepare(
-		"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
-	)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
-	$SEARCH_SPIDER = true;
-	break;
+	case 'allow':
+		$SEARCH_SPIDER = false;
+		break;
+	case 'deny':
+		http_response_code(403);
+		exit;
+	case 'robot':
+	case 'unknown':
+		// Search engines don’t send cookies, and so create a new session with every visit.
+		// Make sure they always use the same one
+		Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
+		$SEARCH_SPIDER = true;
+		break;
+	case '':
+		Database::prepare(
+			"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
+		)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
+		$SEARCH_SPIDER = true;
+		break;
 }
 
 // Store our session data in the database.

admin_site_config.php

Switch Indentation +73 added lines, -73 removed lines

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

admin_site_upgrade.php

Switch Indentation +46 added lines, -46 removed lines

@@ -117,18 +117,18 @@ 
 foreach (Module::getInstalledModules('disabled') as $module) {
 	if (!in_array($module->getName(), Module::getCoreModuleNames())) {
 		switch ($modules_action) {
-		case 'disable':
-			Database::prepare(
-				"UPDATE `##module` SET status = 'disabled' WHERE module_name = ?"
-			)->execute(array($module->getName()));
-			break;
-		case 'ignore':
-			echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_success;
-			break;
-		default:
-			echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_failure;
-			$custom_modules = true;
-			break;
+			case 'disable':
+				Database::prepare(
+					"UPDATE `##module` SET status = 'disabled' WHERE module_name = ?"
+				)->execute(array($module->getName()));
+				break;
+			case 'ignore':
+				echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_success;
+				break;
+			default:
+				echo '<br>', I18N::translate('Custom module'), ' — ', WT_MODULES_DIR, $module->getName(), ' — ', $module->getTitle(), $icon_failure;
+				$custom_modules = true;
+				break;
 		}
 	}
 }
@@ -157,40 +157,40 @@ 
 $custom_themes = false;
 foreach (Theme::themeNames() as $theme_id => $theme_name) {
 	switch ($theme_id) {
-	case 'clouds':
-	case 'colors':
-	case 'fab':
-	case 'minimal':
-	case 'webtrees':
-	case 'xenea':
-		break;
-	default:
-		$theme_used = Database::prepare(
-			"SELECT EXISTS (SELECT 1 FROM `##site_setting`   WHERE setting_name='THEME_DIR' AND setting_value=?)" .
-			" OR    EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
-			" OR    EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
-		)->execute(array($theme_id, $theme_id, $theme_id))->fetchOne();
-		if ($theme_used) {
-			switch ($themes_action) {
-			case 'disable':
-				Database::prepare(
-					"DELETE FROM `##site_setting`   WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
-				)->execute(array($theme_id));
-				Database::prepare(
-					"DELETE FROM `##gedcom_setting` WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
-				)->execute(array($theme_id));
-				Database::prepare(
-					"DELETE FROM `##user_setting`   WHERE setting_name = 'theme'     AND setting_value = ?"
-				)->execute(array($theme_id));
-				break;
-			case 'ignore':
-				echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_success;
-				break;
-			default:
-				echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_failure;
-				$custom_themes = true;
-				break;
-			}
+		case 'clouds':
+		case 'colors':
+		case 'fab':
+		case 'minimal':
+		case 'webtrees':
+		case 'xenea':
+			break;
+		default:
+			$theme_used = Database::prepare(
+				"SELECT EXISTS (SELECT 1 FROM `##site_setting`   WHERE setting_name='THEME_DIR' AND setting_value=?)" .
+				" OR    EXISTS (SELECT 1 FROM `##gedcom_setting` WHERE setting_name='THEME_DIR' AND setting_value=?)" .
+				" OR    EXISTS (SELECT 1 FROM `##user_setting`   WHERE setting_name='theme'     AND setting_value=?)"
+			)->execute(array($theme_id, $theme_id, $theme_id))->fetchOne();
+			if ($theme_used) {
+				switch ($themes_action) {
+					case 'disable':
+						Database::prepare(
+							"DELETE FROM `##site_setting`   WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
+						)->execute(array($theme_id));
+						Database::prepare(
+							"DELETE FROM `##gedcom_setting` WHERE setting_name = 'THEME_DIR' AND setting_value = ?"
+						)->execute(array($theme_id));
+						Database::prepare(
+							"DELETE FROM `##user_setting`   WHERE setting_name = 'theme'     AND setting_value = ?"
+						)->execute(array($theme_id));
+						break;
+					case 'ignore':
+						echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_success;
+						break;
+					default:
+						echo '<br>', I18N::translate('Custom theme'), ' — ', $theme_id, ' — ', $theme_name, $icon_failure;
+						$custom_themes = true;
+						break;
+				}
 		}
 		break;
 	}

edit_interface.php

Switch Indentation +79 added lines, -79 removed lines

@@ -278,40 +278,40 @@ 
 
 	$level1type = $edit_fact->getTag();
 	switch ($record::RECORD_TYPE) {
-	case 'REPO':
-		// REPO:NAME facts may take a NOTE (but the REPO record may not).
-		if ($level1type === 'NAME') {
-			FunctionsEdit::printAddLayer('NOTE');
-			FunctionsEdit::printAddLayer('SHARED_NOTE');
-		}
-		break;
-	case 'FAM':
-	case 'INDI':
-		// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
-		if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
-			if ($level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('SOUR');
-			}
-			if ($level1type !== 'OBJE') {
-				FunctionsEdit::printAddLayer('OBJE');
-			}
-			FunctionsEdit::printAddLayer('NOTE');
-			FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
-			if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('ASSO');
-			}
-			// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
-			if (in_array($level1type, Config::twoAssociates())) {
-				FunctionsEdit::printAddLayer('ASSO2');
+		case 'REPO':
+			// REPO:NAME facts may take a NOTE (but the REPO record may not).
+			if ($level1type === 'NAME') {
+				FunctionsEdit::printAddLayer('NOTE');
+				FunctionsEdit::printAddLayer('SHARED_NOTE');
 			}
-			if ($level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('RESN');
+			break;
+		case 'FAM':
+		case 'INDI':
+			// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
+			if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
+				if ($level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('SOUR');
+				}
+				if ($level1type !== 'OBJE') {
+					FunctionsEdit::printAddLayer('OBJE');
+				}
+				FunctionsEdit::printAddLayer('NOTE');
+				FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
+				if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('ASSO');
+				}
+				// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
+				if (in_array($level1type, Config::twoAssociates())) {
+					FunctionsEdit::printAddLayer('ASSO2');
+				}
+				if ($level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('RESN');
+				}
 			}
-		}
-		break;
-	default:
-		// Other types of record do not have these lower-level records
-		break;
+			break;
+		default:
+			// Other types of record do not have these lower-level records
+			break;
 	}
 	if (Auth::isAdmin() || $WT_TREE->getPreference('SHOW_GEDCOM_RECORD')) {
 		echo
@@ -1905,9 +1905,9 @@ 
 							<b>
 								<?php
 								switch ($father->getSex()) {
-								case 'M': echo I18N::translate('husband'); break;
-								case 'F': echo I18N::translate('wife'); break;
-								default:  echo I18N::translate('spouse'); break;
+									case 'M': echo I18N::translate('husband'); break;
+									case 'F': echo I18N::translate('wife'); break;
+									default:  echo I18N::translate('spouse'); break;
 								}
 								?>
 							</b>
@@ -1940,9 +1940,9 @@ 
 							<b>
 								<?php
 								switch ($mother->getSex()) {
-								case 'M': echo I18N::translate('husband'); break;
-								case 'F': echo I18N::translate('wife'); break;
-								default:  echo I18N::translate('spouse'); break;
+									case 'M': echo I18N::translate('husband'); break;
+									case 'F': echo I18N::translate('wife'); break;
+									default:  echo I18N::translate('spouse'); break;
 								}
 								?>
 							</b>
@@ -1976,9 +1976,9 @@ 
 							<b>
 								<?php
 								switch ($child->getSex()) {
-								case 'M': echo I18N::translate('son'); break;
-								case 'F': echo I18N::translate('daughter'); break;
-								default:  echo I18N::translate('child'); break;
+									case 'M': echo I18N::translate('son'); break;
+									case 'F': echo I18N::translate('daughter'); break;
+									default:  echo I18N::translate('child'); break;
 								}
 								?>
 							</b>
@@ -2354,35 +2354,35 @@ 
 		}
 
 		switch ($nextaction) {
-		case 'add_child_to_family_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
-			break;
-		case 'add_child_to_individual_action':
-			if ($person->getSex() === 'F') {
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
-			} else {
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
-			}
-			break;
-		case 'add_parent_to_individual_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
-			break;
-		case 'add_spouse_to_family_action':
-			if ($father) {
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
-			} else {
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
-			}
-			break;
-		case 'add_spouse_to_individual_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
-			break;
-		case 'add_unlinked_indi_action':
-		case 'update':
-			if ($surname_tradition->hasSurnames()) {
-				$name_fields['NAME'] = '//';
-			}
-			break;
+			case 'add_child_to_family_action':
+				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
+				break;
+			case 'add_child_to_individual_action':
+				if ($person->getSex() === 'F') {
+					$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
+				} else {
+					$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
+				}
+				break;
+			case 'add_parent_to_individual_action':
+				$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
+				break;
+			case 'add_spouse_to_family_action':
+				if ($father) {
+					$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
+				} else {
+					$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
+				}
+				break;
+			case 'add_spouse_to_individual_action':
+				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
+				break;
+			case 'add_unlinked_indi_action':
+			case 'update':
+				if ($surname_tradition->hasSurnames()) {
+					$name_fields['NAME'] = '//';
+				}
+				break;
 		}
 	}
 
@@ -2403,15 +2403,15 @@ 
 	echo '<table class="facts_table">';
 
 	switch ($nextaction) {
-	case 'add_child_to_family_action':
-	case 'add_child_to_individual_action':
-		// When adding a new child, specify the pedigree
-		FunctionsEdit::addSimpleTag('0 PEDI');
-		break;
-	case 'update':
-		// When adding/editing a name, specify the type
-		FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
-		break;
+		case 'add_child_to_family_action':
+		case 'add_child_to_individual_action':
+			// When adding a new child, specify the pedigree
+			FunctionsEdit::addSimpleTag('0 PEDI');
+			break;
+		case 'update':
+			// When adding/editing a name, specify the type
+			FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
+			break;
 	}
 
 	// First - new/existing standard name fields

admin_site_change.php

Switch Indentation +14 added lines, -14 removed lines

@@ -151,12 +151,12 @@ 
 			// Datatables numbers columns 0, 1, 2
 			// MySQL numbers columns 1, 2, 3
 			switch ($value['dir']) {
-			case 'asc':
-				$order_by .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$order_by .= (1 + $value['column']) . " DESC ";
-				break;
+				case 'asc':
+					$order_by .= (1 + $value['column']) . " ASC ";
+					break;
+				case 'desc':
+					$order_by .= (1 + $value['column']) . " DESC ";
+					break;
 			}
 		}
 	} else {
@@ -190,14 +190,14 @@ 
 
 		foreach ($differences as $difference) {
 			switch ($difference[1]) {
-			case MyersDiff::DELETE:
-				$diff_lines[] = '<del>' . $difference[0] . '</del>';
-				break;
-			case MyersDiff::INSERT:
-				$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
-				break;
-			default:
-				$diff_lines[] = $difference[0];
+				case MyersDiff::DELETE:
+					$diff_lines[] = '<del>' . $difference[0] . '</del>';
+					break;
+				case MyersDiff::INSERT:
+					$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
+					break;
+				default:
+					$diff_lines[] = $difference[0];
 			}
 		}
 

mediafirewall.php

Switch Indentation +41 added lines, -41 removed lines

@@ -126,53 +126,53 @@
 
 	// vertical and horizontal position of the text
 	switch ($vpos) {
-	default:
-	case 'top':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = $height * 0.15 + $taille;
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'middle':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = ($height + $taille) / 2;
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'bottom':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = ($height * .85 - $taille);
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'across':
-		switch ($hpos) {
 		default:
-		case 'left':
-			$taille   = textlength($maxsize, $hypoth, $text);
-			$pos_y    = ($height * .85 - $taille);
+		case 'top':
+			$taille   = textlength($maxsize, $width, $text);
+			$pos_y    = $height * 0.15 + $taille;
 			$pos_x    = $width * 0.15;
-			$rotation = $calc_angle;
+			$rotation = 0;
 			break;
-		case 'right':
-			$taille   = textlength($maxsize, $hypoth, $text);
-			$pos_y    = ($height * .15 - $taille);
-			$pos_x    = $width * 0.85;
-			$rotation = $calc_angle + 180;
-			break;
-		case 'top2bottom':
-			$taille   = textlength($maxsize, $height, $text);
-			$pos_y    = ($height * .15 - $taille);
-			$pos_x    = ($width * .90 - $taille);
-			$rotation = -90;
+		case 'middle':
+			$taille   = textlength($maxsize, $width, $text);
+			$pos_y    = ($height + $taille) / 2;
+			$pos_x    = $width * 0.15;
+			$rotation = 0;
 			break;
-		case 'bottom2top':
-			$taille   = textlength($maxsize, $height, $text);
-			$pos_y    = $height * 0.85;
+		case 'bottom':
+			$taille   = textlength($maxsize, $width, $text);
+			$pos_y    = ($height * .85 - $taille);
 			$pos_x    = $width * 0.15;
-			$rotation = 90;
+			$rotation = 0;
 			break;
-		}
+		case 'across':
+			switch ($hpos) {
+				default:
+				case 'left':
+					$taille   = textlength($maxsize, $hypoth, $text);
+					$pos_y    = ($height * .85 - $taille);
+					$pos_x    = $width * 0.15;
+					$rotation = $calc_angle;
+					break;
+				case 'right':
+					$taille   = textlength($maxsize, $hypoth, $text);
+					$pos_y    = ($height * .15 - $taille);
+					$pos_x    = $width * 0.85;
+					$rotation = $calc_angle + 180;
+					break;
+				case 'top2bottom':
+					$taille   = textlength($maxsize, $height, $text);
+					$pos_y    = ($height * .15 - $taille);
+					$pos_x    = ($width * .90 - $taille);
+					$rotation = -90;
+					break;
+				case 'bottom2top':
+					$taille   = textlength($maxsize, $height, $text);
+					$pos_y    = $height * 0.85;
+					$pos_x    = $width * 0.15;
+					$rotation = 90;
+					break;
+			}
 		break;
 	}
 

reportengine.php

Switch Indentation +106 added lines, -106 removed lines

@@ -58,32 +58,32 @@ 
 	$newvars[$name]['id'] = $var;
 	if (!empty($type[$name])) {
 		switch ($type[$name]) {
-		case 'INDI':
-			$record = Individual::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		case 'FAM':
-			$record = Family::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		case 'SOUR':
-			$record = Source::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		default:
-			break;
+			case 'INDI':
+				$record = Individual::getInstance($var, $WT_TREE);
+				if ($record && $record->canShowName()) {
+					$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+				} else {
+					$action = 'setup';
+				}
+				break;
+			case 'FAM':
+				$record = Family::getInstance($var, $WT_TREE);
+				if ($record && $record->canShowName()) {
+					$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+				} else {
+					$action = 'setup';
+				}
+				break;
+			case 'SOUR':
+				$record = Source::getInstance($var, $WT_TREE);
+				if ($record && $record->canShowName()) {
+					$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+				} else {
+					$action = 'setup';
+				}
+				break;
+			default:
+				break;
 		}
 	}
 }
@@ -111,12 +111,12 @@ 
 
 //-- choose a report to run
 switch ($action) {
-case 'choose':
-	$controller
-		->setPageTitle(I18N::translate('Choose a report to run'))
-		->pageHeader();
+	case 'choose':
+		$controller
+			->setPageTitle(I18N::translate('Choose a report to run'))
+			->pageHeader();
 
-	echo '<div id="reportengine-page">
+		echo '<div id="reportengine-page">
 		<h2 class="center">', I18N::translate('Choose a report to run'), '</h2>
 		<form name="choosereport" method="get" action="reportengine.php">
 		<input type="hidden" name="action" value="setup">
@@ -124,27 +124,27 @@ 
 		<table class="facts_table width40">
 		<tr><td class="descriptionbox wrap width33 vmiddle">', I18N::translate('Report'), '</td>
 		<td class="optionbox"><select name="report">';
-	foreach ($reports as $file => $report) {
-		echo '<option value="', Filter::escapeHtml($file), '">', Filter::escapeHtml($report), '</option>';
-	}
-	echo '</select></td></tr>
+		foreach ($reports as $file => $report) {
+			echo '<option value="', Filter::escapeHtml($file), '">', Filter::escapeHtml($report), '</option>';
+		}
+		echo '</select></td></tr>
 		<tr><td class="topbottombar" colspan="2"><input type="submit" value="', I18N::translate('continue'), '"></td></tr>
 		</table></form></div>';
-	break;
+		break;
 
-case 'setup':
-	$report_setup = new ReportParserSetup($report);
-	$report_array = $report_setup->reportProperties();
+	case 'setup':
+		$report_setup = new ReportParserSetup($report);
+		$report_array = $report_setup->reportProperties();
 
-	$controller
-		->setPageTitle($report_array['title'])
-		->pageHeader()
-		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-		->addInlineJavascript('autocomplete();');
+		$controller
+			->setPageTitle($report_array['title'])
+			->pageHeader()
+			->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+			->addInlineJavascript('autocomplete();');
 
-	FunctionsPrint::initializeCalendarPopup();
+		FunctionsPrint::initializeCalendarPopup();
 
-	echo '<div id="reportengine-page">
+		echo '<div id="reportengine-page">
 		<h2 class="center">', $report_array['title'], '</h2>
 		<form name="setupreport" method="get" action="reportengine.php">
 		<input type="hidden" name="action" value="run">
@@ -152,55 +152,55 @@ 
 		<table class="facts_table width50">
 		<tr><td class="descriptionbox width30 wrap">', I18N::translate('Report'), '</td><td class="optionbox">', $report_array['description'], '</td></tr>';
 
-	if (!isset($report_array['inputs'])) {
-		$report_array['inputs'] = array();
-	}
-	foreach ($report_array['inputs'] as $input) {
-		echo '<tr><td class="descriptionbox wrap">';
-		echo '<input type="hidden" name="varnames[]" value="', Filter::escapeHtml($input["name"]), '">';
-		echo I18N::translate($input['value']), '</td><td class="optionbox">';
-		if (!isset($input['type'])) {
-			$input['type'] = 'text';
-		}
-		if (!isset($input['default'])) {
-			$input['default'] = '';
-		}
-		if (!isset($input['lookup'])) {
-			$input['lookup'] = '';
+		if (!isset($report_array['inputs'])) {
+			$report_array['inputs'] = array();
 		}
+		foreach ($report_array['inputs'] as $input) {
+			echo '<tr><td class="descriptionbox wrap">';
+			echo '<input type="hidden" name="varnames[]" value="', Filter::escapeHtml($input["name"]), '">';
+			echo I18N::translate($input['value']), '</td><td class="optionbox">';
+			if (!isset($input['type'])) {
+				$input['type'] = 'text';
+			}
+			if (!isset($input['default'])) {
+				$input['default'] = '';
+			}
+			if (!isset($input['lookup'])) {
+				$input['lookup'] = '';
+			}
 
-		if ($input['type'] == 'text') {
-			echo '<input';
+			if ($input['type'] == 'text') {
+				echo '<input';
 
-			switch ($input['lookup']) {
-			case 'INDI':
-				echo ' data-autocomplete-type="INDI"';
-				if (!empty($pid)) {
-					$input['default'] = $pid;
-				} else {
-					$input['default'] = $controller->getSignificantIndividual()->getXref();
-				}
-				break;
-			case 'FAM':
-				echo ' data-autocomplete-type="FAM"';
-				if (!empty($famid)) {
-					$input['default'] = $famid;
-				} else {
-					$input['default'] = $controller->getSignificantFamily()->getXref();
-				}
-				break;
-			case 'SOUR':
-				echo ' data-autocomplete-type="SOUR"';
-				if (!empty($sid)) {
-					$input['default'] = $sid;
-				}
-				break;
-			case 'DATE':
-				if (isset($input['default'])) {
-					$input['default'] = strtoupper($input['default']);
+				switch ($input['lookup']) {
+					case 'INDI':
+						echo ' data-autocomplete-type="INDI"';
+						if (!empty($pid)) {
+							$input['default'] = $pid;
+						} else {
+							$input['default'] = $controller->getSignificantIndividual()->getXref();
+						}
+						break;
+					case 'FAM':
+						echo ' data-autocomplete-type="FAM"';
+						if (!empty($famid)) {
+							$input['default'] = $famid;
+						} else {
+							$input['default'] = $controller->getSignificantFamily()->getXref();
+						}
+						break;
+					case 'SOUR':
+						echo ' data-autocomplete-type="SOUR"';
+						if (!empty($sid)) {
+							$input['default'] = $sid;
+						}
+						break;
+					case 'DATE':
+						if (isset($input['default'])) {
+							$input['default'] = strtoupper($input['default']);
+						}
+						break;
 				}
-				break;
-			}
 
 			echo ' type="text" name="vars[', Filter::escapeHtml($input['name']), ']" id="', Filter::escapeHtml($input['name']), '" value="', Filter::escapeHtml($input['default']), '" style="direction: ltr;">';
 		}
@@ -266,20 +266,20 @@ 
 		</td></tr></table></form></div>';
 	break;
 
-case 'run':
-	if (strstr($report, 'report_singlepage.xml') !== false) {
-		// This is a custom module?
-		new \ReportPedigree;
-		break;
-	}
+	case 'run':
+		if (strstr($report, 'report_singlepage.xml') !== false) {
+			// This is a custom module?
+			new \ReportPedigree;
+			break;
+		}
 
-	switch ($output) {
-	case 'HTML':
-		header('Content-type: text/html; charset=UTF-8');
-		new ReportParserGenerate($report, new ReportHtml, $vars);
-		break;
-	case 'PDF':
-		new ReportParserGenerate($report, new ReportPdf, $vars);
-		break;
-	}
+		switch ($output) {
+			case 'HTML':
+				header('Content-type: text/html; charset=UTF-8');
+				new ReportParserGenerate($report, new ReportHtml, $vars);
+				break;
+			case 'PDF':
+				new ReportParserGenerate($report, new ReportPdf, $vars);
+				break;
+		}
 }

addmedia.php

Switch Indentation +281 added lines, -281 removed lines

@@ -76,338 +76,338 @@
 // …and also in the admin_media_upload.php script
 
 switch ($action) {
-case 'create': // Save the information from the “showcreateform” action
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
+	case 'create': // Save the information from the “showcreateform” action
+		$controller->setPageTitle(I18N::translate('Create a media object'));
+
+		// Validate the media folder
+		$folderName = str_replace('\\', '/', $folder);
+		$folderName = trim($folderName, '/');
+		if ($folderName == '.') {
+			$folderName = '';
 		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
+		if ($folderName) {
+			$folderName .= '/';
+			// Not allowed to use “../”
+			if (strpos('/' . $folderName, '/../') !== false) {
+				FlashMessages::addMessage('Folder names are not allowed to include “../”');
+				break;
+			}
 		}
-	}
 
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+		// Make sure the media folder exists
+		if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
 			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
 				break;
 			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
 		}
-	}
 
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
+		// Managers can create new media paths (subfolders). Users must use existing folders.
+		if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+			if (Auth::isManager($WT_TREE)) {
+				if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+					FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+				} else {
+					FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+					break;
+				}
+			} else {
+				// Regular users should not have seen this option - so no need for an error message.
+				break;
+			}
 		}
-	}
 
-	// A thumbnail file with no main image?
-	if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
-		// Assume the user used the wrong field, and treat this as a main image
-		$_FILES['mediafile'] = $_FILES['thumbnail'];
-		unset($_FILES['thumbnail']);
-	}
+		// The media folder exists. Now create a thumbnail folder to match it.
+		if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+			if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+				break;
+			}
+		}
 
-	// Thumbnail files must contain images.
-	if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
-		FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
-		break;
-	}
+		// A thumbnail file with no main image?
+		if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
+			// Assume the user used the wrong field, and treat this as a main image
+			$_FILES['mediafile'] = $_FILES['thumbnail'];
+			unset($_FILES['thumbnail']);
+		}
 
-	// User-specified filename?
-	if ($tag[0] == 'FILE' && $text[0]) {
-		$filename = $text[0];
-	}
-	// Use the name of the uploaded file?
-	// If no filename specified, use the name of the uploaded file?
-	if (!$filename && !empty($_FILES['mediafile']['name'])) {
-		$filename = $_FILES['mediafile']['name'];
-	}
+		// Thumbnail files must contain images.
+		if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
+			FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
+			break;
+		}
 
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $text[0], $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
+		// User-specified filename?
+		if ($tag[0] == 'FILE' && $text[0]) {
+			$filename = $text[0];
+		}
+		// Use the name of the uploaded file?
+		// If no filename specified, use the name of the uploaded file?
+		if (!$filename && !empty($_FILES['mediafile']['name'])) {
+			$filename = $_FILES['mediafile']['name'];
+		}
 
-	// Now copy the file to the correct location.
-	if (!empty($_FILES['mediafile']['name'])) {
-		$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
-		if (file_exists($serverFileName)) {
-			FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
+		// Validate the media path and filename
+		if (preg_match('/^https?:\/\//i', $text[0], $match)) {
+			// External media needs no further validation
+			$fileName   = $filename;
+			$folderName = '';
+			unset($_FILES['mediafile'], $_FILES['thumbnail']);
+		} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+			// Local media files cannot contain certain special characters
+			FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
 			break;
-		}
-		if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
-			Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
-		} else {
-			FlashMessages::addMessage(
-				I18N::translate('There was an error uploading your file.') .
-				'<br>' .
-				Functions::fileUploadErrorText($_FILES['mediafile']['error'])
-			);
+		} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+			// Do not allow obvious script files.
+			FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+			break;
+		} elseif (!$filename) {
+			FlashMessages::addMessage(I18N::translate('No media file was provided.'));
 			break;
+		} else {
+			$fileName = $filename;
 		}
 
-		// Now copy the (optional) thumbnail
-		if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
-			// Thumbnails have either
-			// (a) the same filename as the main image
-			// (b) the same filename as the main image - but with a .png extension
-			if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
-				$thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
+		// Now copy the file to the correct location.
+		if (!empty($_FILES['mediafile']['name'])) {
+			$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
+			if (file_exists($serverFileName)) {
+				FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
+				break;
+			}
+			if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
+				Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
 			} else {
-				$thumbFile = $fileName;
+				FlashMessages::addMessage(
+					I18N::translate('There was an error uploading your file.') .
+					'<br>' .
+					Functions::fileUploadErrorText($_FILES['mediafile']['error'])
+				);
+				break;
 			}
-			$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
-			if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
-				Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
+
+			// Now copy the (optional) thumbnail
+			if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
+				// Thumbnails have either
+				// (a) the same filename as the main image
+				// (b) the same filename as the main image - but with a .png extension
+				if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
+					$thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
+				} else {
+					$thumbFile = $fileName;
+				}
+				$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
+				if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
+					Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
+				}
 			}
 		}
-	}
 
-	$controller->pageHeader();
-	// Build the gedcom record
-	$newged = "0 @new@ OBJE";
-	if ($tag[0] == 'FILE') {
-		// The admin has an edit field to change the filename
-		$text[0] = $folderName . $fileName;
-	} else {
-		// Users keep the original filename
-		$newged .= "\n1 FILE " . $folderName . $fileName;
-	}
+		$controller->pageHeader();
+		// Build the gedcom record
+		$newged = "0 @new@ OBJE";
+		if ($tag[0] == 'FILE') {
+			// The admin has an edit field to change the filename
+			$text[0] = $folderName . $fileName;
+		} else {
+			// Users keep the original filename
+			$newged .= "\n1 FILE " . $folderName . $fileName;
+		}
 
-	$newged = FunctionsEdit::handleUpdates($newged);
+		$newged = FunctionsEdit::handleUpdates($newged);
 
-	$new_media = $WT_TREE->createRecord($newged);
-	if ($linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
-		Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	} else {
-		Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
-		$controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
-	}
-	echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+		$new_media = $WT_TREE->createRecord($newged);
+		if ($linktoid) {
+			$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+			$record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
+			Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
+			$controller->addInlineJavascript('closePopupAndReloadParent();');
+		} else {
+			Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
+			$controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
+		}
+		echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
 
-	return;
+		return;
 
-case 'update': // Save the information from the “editmedia” action
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
+	case 'update': // Save the information from the “editmedia” action
+		$controller->setPageTitle(I18N::translate('Edit the media object'));
 
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
+		// Validate the media folder
+		$folderName = str_replace('\\', '/', $folder);
+		$folderName = trim($folderName, '/');
+		if ($folderName == '.') {
+			$folderName = '';
 		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
+		if ($folderName) {
+			$folderName .= '/';
+			// Not allowed to use “../”
+			if (strpos('/' . $folderName, '/../') !== false) {
+				FlashMessages::addMessage('Folder names are not allowed to include “../”');
+				break;
+			}
 		}
-	}
 
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+		// Make sure the media folder exists
+		if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
 			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
 				break;
 			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
 		}
-	}
 
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
+		// Managers can create new media paths (subfolders). Users must use existing folders.
+		if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+			if (Auth::isManager($WT_TREE)) {
+				if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+					FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+				} else {
+					FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+					break;
+				}
+			} else {
+				// Regular users should not have seen this option - so no need for an error message.
+				break;
+			}
 		}
-	}
-
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $filename, $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
 
-	$oldFilename = $media->getFilename();
-	$newFilename = $folderName . $fileName;
-
-	// Cannot rename local to external or vice-versa
-	if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
-		FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-		break;
-	}
+		// The media folder exists. Now create a thumbnail folder to match it.
+		if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+			if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+				break;
+			}
+		}
 
-	$messages  = false;
-	$move_file = false;
+		// Validate the media path and filename
+		if (preg_match('/^https?:\/\//i', $filename, $match)) {
+			// External media needs no further validation
+			$fileName   = $filename;
+			$folderName = '';
+			unset($_FILES['mediafile'], $_FILES['thumbnail']);
+		} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+			// Local media files cannot contain certain special characters
+			FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
+			break;
+		} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+			// Do not allow obvious script files.
+			FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+			break;
+		} elseif (!$filename) {
+			FlashMessages::addMessage(I18N::translate('No media file was provided.'));
+			break;
+		} else {
+			$fileName = $filename;
+		}
 
-	// Move files on disk (if we can) to reflect the change to the GEDCOM data
-	if (!$media->isExternal()) {
-		$oldServerFile  = $media->getServerFilename('main');
-		$oldServerThumb = $media->getServerFilename('thumb');
+		$oldFilename = $media->getFilename();
+		$newFilename = $folderName . $fileName;
 
-		$newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
-		$newServerFile  = $newmedia->getServerFilename('main');
-		$newServerThumb = $newmedia->getServerFilename('thumb');
+		// Cannot rename local to external or vice-versa
+		if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
+			FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+			break;
+		}
 
-		// We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
-		if ($oldServerFile !== $newServerFile) {
-			//-- check if the file is used in more than one gedcom
-			//-- do not allow it to be moved or renamed if it is
-			if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
-				FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
-				break;
-			}
+		$messages  = false;
+		$move_file = false;
+
+		// Move files on disk (if we can) to reflect the change to the GEDCOM data
+		if (!$media->isExternal()) {
+			$oldServerFile  = $media->getServerFilename('main');
+			$oldServerThumb = $media->getServerFilename('thumb');
+
+			$newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
+			$newServerFile  = $newmedia->getServerFilename('main');
+			$newServerThumb = $newmedia->getServerFilename('thumb');
+
+			// We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
+			if ($oldServerFile !== $newServerFile) {
+				//-- check if the file is used in more than one gedcom
+				//-- do not allow it to be moved or renamed if it is
+				if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
+					FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
+					break;
+				}
 
-			$move_file = true;
-			if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
-				try {
-					rename($oldServerFile, $newServerFile);
-					FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				$move_file = true;
+				if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
+					try {
+						rename($oldServerFile, $newServerFile);
+						FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+					} catch (\ErrorException $ex) {
+						FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+					}
+					$messages = true;
 				}
-				$messages = true;
-			}
-			if (!file_exists($newServerFile)) {
-				FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
-			}
-		}
-		if ($oldServerThumb != $newServerThumb) {
-			$move_file = true;
-			if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
-				try {
-					rename($oldServerThumb, $newServerThumb);
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				if (!file_exists($newServerFile)) {
+					FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
+					$messages = true;
 				}
-				$messages = true;
 			}
-			if (!file_exists($newServerThumb)) {
-				FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
+			if ($oldServerThumb != $newServerThumb) {
+				$move_file = true;
+				if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
+					try {
+						rename($oldServerThumb, $newServerThumb);
+						FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+					} catch (\ErrorException $ex) {
+						FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+					}
+					$messages = true;
+				}
+				if (!file_exists($newServerThumb)) {
+					FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
+					$messages = true;
+				}
 			}
 		}
-	}
 
-	// Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
-	$glevels = array_merge(array('1'), $glevels);
-	$tag     = array_merge(array('FILE'), $tag);
-	$islink  = array_merge(array(0), $islink);
-	$text    = array_merge(array($newFilename), $text);
-
-	$record = GedcomRecord::getInstance($pid, $WT_TREE);
-	$newrec = "0 @$pid@ OBJE\n";
-	$newrec = FunctionsEdit::handleUpdates($newrec);
-	$record->updateRecord($newrec, $update_CHAN);
-
-	if ($move_file) {
-		// We've moved a file. Therefore we must approve the change, as rejecting
-		// the change will create broken references.
-		FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
-	}
+		// Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
+		$glevels = array_merge(array('1'), $glevels);
+		$tag     = array_merge(array('FILE'), $tag);
+		$islink  = array_merge(array(0), $islink);
+		$text    = array_merge(array($newFilename), $text);
+
+		$record = GedcomRecord::getInstance($pid, $WT_TREE);
+		$newrec = "0 @$pid@ OBJE\n";
+		$newrec = FunctionsEdit::handleUpdates($newrec);
+		$record->updateRecord($newrec, $update_CHAN);
+
+		if ($move_file) {
+			// We've moved a file. Therefore we must approve the change, as rejecting
+			// the change will create broken references.
+			FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
+		}
 
-	if ($pid && $linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $pid . '@', true);
-		Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
-	}
-	$controller->pageHeader();
-	if ($messages) {
-		echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
-	} else {
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	}
+		if ($pid && $linktoid) {
+			$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+			$record->createFact('1 OBJE @' . $pid . '@', true);
+			Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
+		}
+		$controller->pageHeader();
+		if ($messages) {
+			echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+		} else {
+			$controller->addInlineJavascript('closePopupAndReloadParent();');
+		}
 
-	return;
-case 'showmediaform':
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-	$action = 'create';
-	break;
-case 'editmedia':
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-	$action = 'update';
-	break;
-default:
-	throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
+		return;
+	case 'showmediaform':
+		$controller->setPageTitle(I18N::translate('Create a media object'));
+		$action = 'create';
+		break;
+	case 'editmedia':
+		$controller->setPageTitle(I18N::translate('Edit the media object'));
+		$action = 'update';
+		break;
+	default:
+		throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
 }
 
 $controller->pageHeader();

editnews.php

Switch Indentation +38 added lines, -38 removed lines

@@ -44,44 +44,44 @@
 $text      = Filter::post('text');
 
 switch ($action) {
-case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+	case 'compose':
+		if (Module::getModuleByName('ckeditor')) {
+			CkeditorModule::enableEditor($controller);
+		}
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT SQL_CACHE news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
-case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+		echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+		echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+		if ($news_id) {
+			$news = Database::prepare("SELECT SQL_CACHE news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+		} else {
+			$news              = array();
+			$news['user_id']   = $user_id;
+			$news['gedcom_id'] = $gedcom_id;
+			$news['date']      = WT_TIMESTAMP;
+			$news['subject']   = '';
+			$news['body']      = '';
+		}
+		echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+		echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+		echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+		echo '<table>';
+		echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+		echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+		echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+		echo '<tr><td>';
+		echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+		echo '</td></tr>';
+		echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+		echo '</table>';
+		echo '</form>';
+		break;
+	case 'save':
+		if ($news_id) {
+			Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+		} else {
+			Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+		}
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+		$controller->addInlineJavascript('window.opener.location.reload();window.close();');
+		break;
 }