fisharebest / webtrees

app/Filter.php

Switch Indentation +4 added lines, -4 removed lines

@@ -117,10 +117,10 @@
 	 */
 	public static function formatText($text, Tree $WT_TREE) {
 		switch ($WT_TREE->getPreference('FORMAT_TEXT')) {
-		case 'markdown':
-			return '<div class="markdown" dir="auto">' . self::markdown($text) . '</div>';
-		default:
-			return '<div style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text) . '</div>';
+		    case 'markdown':
+			    return '<div class="markdown" dir="auto">' . self::markdown($text) . '</div>';
+		    default:
+			    return '<div style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text) . '</div>';
 		}
 	}
 

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;
 	}

admin_media.php

Switch Indentation +98 added lines, -98 removed lines

@@ -85,98 +85,98 @@ 
 ////////////////////////////////////////////////////////////////////////////////
 
 switch ($action) {
-case 'load_json':
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	switch ($files) {
-	case 'local':
-		// Filtered rows
-		$SELECT1 =
-			"SELECT SQL_CALC_FOUND_ROWS TRIM(LEADING :media_path_1 FROM m_filename) AS media_path, m_id AS xref, m_titl, m_file AS gedcom_id, m_gedcom AS gedcom" .
-			" FROM  `##media`" .
-			" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
-			" JOIN  `##gedcom` USING (gedcom_id)" .
-			" WHERE setting_value = :media_folder" .
-			" AND   m_filename LIKE CONCAT(:media_path_2, '%')" .
-			" AND   (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', :search_1, '%')" .
-			"  OR   m_titl LIKE CONCAT('%', :search_2, '%'))" .
-			" AND   m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'";
-		$ARGS1 = array(
-			'media_path_1' => $media_path,
-			'media_folder' => $media_folder,
-			'media_path_2' => Filter::escapeLike($media_path),
-			'search_1'     => Filter::escapeLike($search),
-			'search_2'     => Filter::escapeLike($search),
-		);
-		// Unfiltered rows
-		$SELECT2 =
-			"SELECT COUNT(*)" .
-			" FROM  `##media`" .
-			" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
-			" WHERE setting_value = :media_folder" .
-			" AND   m_filename LIKE CONCAT(:media_path_3, '%')" .
-			" AND   m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'";
-		$ARGS2 = array(
-			'media_folder' => $media_folder,
-			'media_path_3' => $media_path,
-		);
-
-		if ($subfolders == 'exclude') {
-			$SELECT1 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
-			$ARGS1['media_path_4'] = Filter::escapeLike($media_path);
-			$SELECT2 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
-			$ARGS2['media_path_4'] = Filter::escapeLike($media_path);
-		}
-
-		$order = Filter::getArray('order');
-		$SELECT1 .= " ORDER BY ";
-		if ($order) {
-			foreach ($order as $key => $value) {
-				if ($key > 0) {
-					$SELECT1 .= ',';
-				}
-				// Datatables numbers columns 0, 1, 2
-				// MySQL numbers columns 1, 2, 3
-				switch ($value['dir']) {
-				case 'asc':
-					$SELECT1 .= ":col_" . $key . " ASC";
-					break;
-				case 'desc':
-					$SELECT1 .= ":col_" . $key . " DESC";
-					break;
-				}
-				$ARGS1['col_' . $key] = 1 + $value['column'];
-			}
-		} else {
-			$SELECT1 = " 1 ASC";
-		}
-
-		if ($length > 0) {
-			$SELECT1 .= " LIMIT :length OFFSET :start";
-			$ARGS1['length'] = $length;
-			$ARGS1['start']  = $start;
-		}
-
-		$rows = Database::prepare($SELECT1)->execute($ARGS1)->fetchAll();
-		// Total filtered/unfiltered rows
-		$recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-		$recordsTotal    = Database::prepare($SELECT2)->execute($ARGS2)->fetchOne();
-
-		$data = array();
-		foreach ($rows as $row) {
-			$media  = Media::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			$data[] = array(
-				mediaFileInfo($media_folder, $media_path, $row->media_path),
-				$media->displayImage(),
-				mediaObjectInfo($media),
-			);
-		}
-		break;
+    case 'load_json':
+	    $search = Filter::get('search');
+	    $search = $search['value'];
+	    $start  = Filter::getInteger('start');
+	    $length = Filter::getInteger('length');
+
+	    switch ($files) {
+	        case 'local':
+		        // Filtered rows
+		        $SELECT1 =
+			        "SELECT SQL_CALC_FOUND_ROWS TRIM(LEADING :media_path_1 FROM m_filename) AS media_path, m_id AS xref, m_titl, m_file AS gedcom_id, m_gedcom AS gedcom" .
+			        " FROM  `##media`" .
+			        " JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
+			        " JOIN  `##gedcom` USING (gedcom_id)" .
+			        " WHERE setting_value = :media_folder" .
+			        " AND   m_filename LIKE CONCAT(:media_path_2, '%')" .
+			        " AND   (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', :search_1, '%')" .
+			        "  OR   m_titl LIKE CONCAT('%', :search_2, '%'))" .
+			        " AND   m_filename NOT LIKE 'http://%'" .
+			        " AND   m_filename NOT LIKE 'https://%'";
+		        $ARGS1 = array(
+			        'media_path_1' => $media_path,
+			        'media_folder' => $media_folder,
+			        'media_path_2' => Filter::escapeLike($media_path),
+			        'search_1'     => Filter::escapeLike($search),
+			        'search_2'     => Filter::escapeLike($search),
+		        );
+		        // Unfiltered rows
+		        $SELECT2 =
+			        "SELECT COUNT(*)" .
+			        " FROM  `##media`" .
+			        " JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
+			        " WHERE setting_value = :media_folder" .
+			        " AND   m_filename LIKE CONCAT(:media_path_3, '%')" .
+			        " AND   m_filename NOT LIKE 'http://%'" .
+			        " AND   m_filename NOT LIKE 'https://%'";
+		        $ARGS2 = array(
+			        'media_folder' => $media_folder,
+			        'media_path_3' => $media_path,
+		        );
+
+		        if ($subfolders == 'exclude') {
+			        $SELECT1 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
+			        $ARGS1['media_path_4'] = Filter::escapeLike($media_path);
+			        $SELECT2 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
+			        $ARGS2['media_path_4'] = Filter::escapeLike($media_path);
+		        }
+
+		        $order = Filter::getArray('order');
+		        $SELECT1 .= " ORDER BY ";
+		        if ($order) {
+			        foreach ($order as $key => $value) {
+				        if ($key > 0) {
+					        $SELECT1 .= ',';
+				        }
+				        // Datatables numbers columns 0, 1, 2
+				        // MySQL numbers columns 1, 2, 3
+				        switch ($value['dir']) {
+				            case 'asc':
+					            $SELECT1 .= ":col_" . $key . " ASC";
+					            break;
+				            case 'desc':
+					            $SELECT1 .= ":col_" . $key . " DESC";
+					            break;
+				        }
+				    $ARGS1['col_' . $key] = 1 + $value['column'];
+			    }
+		    } else {
+			    $SELECT1 = " 1 ASC";
+		    }
+
+		    if ($length > 0) {
+			    $SELECT1 .= " LIMIT :length OFFSET :start";
+			    $ARGS1['length'] = $length;
+			    $ARGS1['start']  = $start;
+		    }
+
+		    $rows = Database::prepare($SELECT1)->execute($ARGS1)->fetchAll();
+		    // Total filtered/unfiltered rows
+		    $recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+		    $recordsTotal    = Database::prepare($SELECT2)->execute($ARGS2)->fetchOne();
+
+		    $data = array();
+		    foreach ($rows as $row) {
+			    $media  = Media::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+			    $data[] = array(
+				    mediaFileInfo($media_folder, $media_path, $row->media_path),
+				    $media->displayImage(),
+				    mediaObjectInfo($media),
+			    );
+		    }
+		    break;
 
 	case 'external':
 		// Filtered rows
@@ -206,12 +206,12 @@ 
 				// Datatables numbers columns 0, 1, 2
 				// MySQL numbers columns 1, 2, 3
 				switch ($value['dir']) {
-				case 'asc':
-					$SELECT1 .= ":col_" . $key . " ASC";
-					break;
-				case 'desc':
-					$SELECT1 .= ":col_" . $key . " DESC";
-					break;
+				    case 'asc':
+					    $SELECT1 .= ":col_" . $key . " ASC";
+					    break;
+				    case 'desc':
+					    $SELECT1 .= ":col_" . $key . " DESC";
+					    break;
 				}
 				$ARGS1['col_' . $key] = 1 + $value['column'];
 			}

placelist.php

Switch Indentation +164 added lines, -164 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);
-
-	$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>';
-			}
-			$html .= '</ul></td>';
-		}
-		$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');
-
-	// Find this place and its ID
-	$place    = new Place(implode(', ', array_reverse($parent)), $WT_TREE);
-	$place_id = $place->getPlaceId();
-
-	$child_places = $place->getChildPlaces();
-
-	$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();
-		}
-		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]);
-		}
-
-		$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 ($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 .= '</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;
-	}
-	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 '<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;
+    case 'list':
+	    echo '<h2>', $controller->getPageTitle(), '</h2>';
+	    $list_places = Place::allPlaces($WT_TREE);
+	    $numfound    = count($list_places);
+
+	    $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>';
+			    }
+			    $html .= '</ul></td>';
+		    }
+		    $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');
+
+	    // Find this place and its ID
+	    $place    = new Place(implode(', ', array_reverse($parent)), $WT_TREE);
+	    $place_id = $place->getPlaceId();
+
+	    $child_places = $place->getChildPlaces();
+
+	    $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();
+		    }
+		    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]);
+		    }
+
+		    $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 ($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 .= '</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;
+	    }
+	    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 '<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;
 }
 
 echo '</div>'; // <div id="place-hierarchy">

calendar.php

Switch Indentation +105 added lines, -105 removed lines

@@ -118,15 +118,15 @@ 
 $controller->setPageTitle(I18N::translate('Anniversary calendar'));
 
 switch ($view) {
-case 'day':
-	$controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
-	break;
-case 'month':
-	$controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
-	break;
-case 'year':
-	$controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
-	break;
+    case 'day':
+	    $controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
+	    break;
+    case 'month':
+	    $controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
+	    break;
+    case 'year':
+	    $controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
+	    break;
 }
 
 $controller->pageHeader();
@@ -329,38 +329,38 @@ 
 $found_facts = array();
 
 switch ($view) {
-case 'day':
-	$found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
-	break;
-case 'month':
-	$cal_date->d = 0;
-	$cal_date->setJdFromYmd();
-	// Make a separate list for each day. Unspecified/invalid days go in day 0.
-	for ($d = 0; $d <= $days_in_month; ++$d) {
-		$found_facts[$d] = array();
-	}
-	// Fetch events for each day
-	for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
-		foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
-			$tmp = $fact->getDate()->minimumDate();
-			if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
-				// If the day is valid (for its own calendar), display it in the
-				// anniversary day (for the display calendar).
-				$found_facts[$jd - $cal_date->minJD + 1][] = $fact;
-			} else {
-				// Otherwise, display it in the "Day not set" box.
-				$found_facts[0][] = $fact;
-			}
-		}
-	}
-	break;
-case 'year':
-	$cal_date->m = 0;
-	$cal_date->setJdFromYmd();
-	$found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
-	// Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
-	$found_facts = array_unique($found_facts);
-	break;
+    case 'day':
+	    $found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
+	    break;
+    case 'month':
+	    $cal_date->d = 0;
+	    $cal_date->setJdFromYmd();
+	    // Make a separate list for each day. Unspecified/invalid days go in day 0.
+	    for ($d = 0; $d <= $days_in_month; ++$d) {
+		    $found_facts[$d] = array();
+	    }
+	    // Fetch events for each day
+	    for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
+		    foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
+			    $tmp = $fact->getDate()->minimumDate();
+			    if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
+				    // If the day is valid (for its own calendar), display it in the
+				    // anniversary day (for the display calendar).
+				    $found_facts[$jd - $cal_date->minJD + 1][] = $fact;
+			    } else {
+				    // Otherwise, display it in the "Day not set" box.
+				    $found_facts[0][] = $fact;
+			    }
+		    }
+	    }
+	    break;
+    case 'year':
+	    $cal_date->m = 0;
+	    $cal_date->setJdFromYmd();
+	    $found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
+	    // Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
+	    $found_facts = array_unique($found_facts);
+	    break;
 }
 
 // Group the facts by family/individual
@@ -369,39 +369,39 @@ 
 $cal_facts = array();
 
 switch ($view) {
-case 'year':
-case 'day':
-	foreach ($found_facts as $fact) {
-		$record = $fact->getParent();
-		$xref   = $record->getXref();
-		if ($record instanceof Individual) {
-			if (empty($indis[$xref])) {
-				$indis[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
-			}
-		} elseif ($record instanceof Family) {
-			if (empty($indis[$xref])) {
-				$fams[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
-			}
-		}
-	}
-	break;
-case 'month':
-	foreach ($found_facts as $d => $facts) {
-		$cal_facts[$d] = array();
-		foreach ($facts as $fact) {
-			$xref = $fact->getParent()->getXref();
-			if (empty($cal_facts[$d][$xref])) {
-				$cal_facts[$d][$xref] = calendar_fact_text($fact, false);
-			} else {
-				$cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
-			}
-		}
-	}
-	break;
+    case 'year':
+    case 'day':
+	    foreach ($found_facts as $fact) {
+		    $record = $fact->getParent();
+		    $xref   = $record->getXref();
+		    if ($record instanceof Individual) {
+			    if (empty($indis[$xref])) {
+				    $indis[$xref] = calendar_fact_text($fact, true);
+			    } else {
+				    $indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
+			    }
+		    } elseif ($record instanceof Family) {
+			    if (empty($indis[$xref])) {
+				    $fams[$xref] = calendar_fact_text($fact, true);
+			    } else {
+				    $fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
+			    }
+		    }
+	    }
+	    break;
+    case 'month':
+	    foreach ($found_facts as $d => $facts) {
+		    $cal_facts[$d] = array();
+		    foreach ($facts as $fact) {
+			    $xref = $fact->getParent()->getXref();
+			    if (empty($cal_facts[$d][$xref])) {
+				    $cal_facts[$d][$xref] = calendar_fact_text($fact, false);
+			    } else {
+				    $cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
+			    }
+		    }
+	    }
+	    break;
 }
 
 switch ($view) {
@@ -498,26 +498,26 @@ 
 			// Show a converted date
 			foreach (explode('_and_', $CALENDAR_FORMAT) as $convcal) {
 				switch ($convcal) {
-				case 'french':
-					$alt_date = new FrenchDate($cal_date->minJD + $d - 1);
-					break;
-				case 'gregorian':
-					$alt_date = new GregorianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jewish':
-					$alt_date = new JewishDate($cal_date->minJD + $d - 1);
-					break;
-				case 'julian':
-					$alt_date = new JulianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'hijri':
-					$alt_date = new HijriDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jalali':
-					$alt_date = new JalaliDate($cal_date->minJD + $d - 1);
-					break;
-				default:
-					break 2;
+				    case 'french':
+					    $alt_date = new FrenchDate($cal_date->minJD + $d - 1);
+					    break;
+				    case 'gregorian':
+					    $alt_date = new GregorianDate($cal_date->minJD + $d - 1);
+					    break;
+				    case 'jewish':
+					    $alt_date = new JewishDate($cal_date->minJD + $d - 1);
+					    break;
+				    case 'julian':
+					    $alt_date = new JulianDate($cal_date->minJD + $d - 1);
+					    break;
+				    case 'hijri':
+					    $alt_date = new HijriDate($cal_date->minJD + $d - 1);
+					    break;
+				    case 'jalali':
+					    $alt_date = new JalaliDate($cal_date->minJD + $d - 1);
+					    break;
+				    default:
+					    break 2;
 				}
 				if (get_class($alt_date) !== get_class($cal_date) && $alt_date->inValidRange()) {
 					echo '<span class="rtl_cal_day">' . $alt_date->format("%j %M") . '</span>';
@@ -627,17 +627,17 @@ 
 		$html .= $tag1 . '<a href="' . $tmp->getHtmlUrl() . '">' . $tmp->getFullName() . '</a> ';
 		if ($show_sex_symbols && $tmp instanceof Individual) {
 			switch ($tmp->getSex()) {
-			case 'M':
-				$html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
-				++$males;
-				break;
-			case 'F':
-				$html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
-				++$females;
-				break;
-			default:
-				$html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
-				break;
+			    case 'M':
+				    $html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
+				    ++$males;
+				    break;
+			    case 'F':
+				    $html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
+				    ++$females;
+				    break;
+			    default:
+				    $html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
+				    break;
 			}
 		}
 		$html .= '<div class="indent">' . $facts . '</div>' . $tag2;

search_advanced.php

Switch Indentation +12 added lines, -12 removed lines

@@ -185,18 +185,18 @@
 				$searchField  = $controller->getField($k);
 				$searchOption = substr($searchField, 20); // Assume we have something like "FAMC:HUSB:NAME:GIVN:foo"
 				switch (substr($searchField, 0, 20)) {
-				case 'FAMC:HUSB:NAME:GIVN:':
-					$fatherGivnOption = $searchOption;
-					break;
-				case 'FAMC:HUSB:NAME:SURN:':
-					$fatherSurnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:GIVN:':
-					$motherGivnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:SURN:':
-					$motherSurnOption = $searchOption;
-					break;
+				    case 'FAMC:HUSB:NAME:GIVN:':
+					    $fatherGivnOption = $searchOption;
+					    break;
+				    case 'FAMC:HUSB:NAME:SURN:':
+					    $fatherSurnOption = $searchOption;
+					    break;
+				    case 'FAMC:WIFE:NAME:GIVN:':
+					    $motherGivnOption = $searchOption;
+					    break;
+				    case 'FAMC:WIFE:NAME:SURN:':
+					    $motherSurnOption = $searchOption;
+					    break;
 				}
 			}
 			?>

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;
 

admin_trees_config.php

Switch Indentation +170 added lines, -170 removed lines

@@ -132,176 +132,176 @@
 $relatives_events = explode(',', $WT_TREE->getPreference('SHOW_RELATIVES_EVENTS'));
 
 switch (Filter::post('action')) {
-case 'privacy':
-	foreach (Filter::postArray('delete', WT_REGEX_INTEGER) as $delete_resn) {
-		Database::prepare(
-			"DELETE FROM `##default_resn` WHERE default_resn_id=?"
-		)->execute(array($delete_resn));
-	}
-
-	$xrefs     = Filter::postArray('xref', WT_REGEX_XREF);
-	$tag_types = Filter::postArray('tag_type', WT_REGEX_TAG);
-	$resns     = Filter::postArray('resn');
-
-	foreach ($xrefs as $n => $xref) {
-		$tag_type = $tag_types[$n];
-		$resn     = $resns[$n];
-
-		if ($tag_type || $xref) {
-			// Delete any existing data
-			if ($xref === '') {
-				Database::prepare(
-					"DELETE FROM `##default_resn` WHERE gedcom_id=? AND tag_type=? AND xref IS NULL"
-				)->execute(array($WT_TREE->getTreeId(), $tag_type));
-			}
-			if ($tag_type === '') {
-				Database::prepare(
-					"DELETE FROM `##default_resn` WHERE gedcom_id=? AND xref=? AND tag_type IS NULL"
-				)->execute(array($WT_TREE->getTreeId(), $xref));
-			}
-			// Add (or update) the new data
-			Database::prepare(
-				"REPLACE INTO `##default_resn` (gedcom_id, xref, tag_type, resn) VALUES (?, NULLIF(?, ''), NULLIF(?, ''), ?)"
-			)->execute(array($WT_TREE->getTreeId(), $xref, $tag_type, $resn));
-		}
-	}
-
-	$WT_TREE->setPreference('HIDE_LIVE_PEOPLE', Filter::postBool('HIDE_LIVE_PEOPLE'));
-	$WT_TREE->setPreference('KEEP_ALIVE_YEARS_BIRTH', Filter::post('KEEP_ALIVE_YEARS_BIRTH', WT_REGEX_INTEGER, 0));
-	$WT_TREE->setPreference('KEEP_ALIVE_YEARS_DEATH', Filter::post('KEEP_ALIVE_YEARS_DEATH', WT_REGEX_INTEGER, 0));
-	$WT_TREE->setPreference('MAX_ALIVE_AGE', Filter::post('MAX_ALIVE_AGE', WT_REGEX_INTEGER, 100));
-	$WT_TREE->setPreference('REQUIRE_AUTHENTICATION', Filter::postBool('REQUIRE_AUTHENTICATION'));
-	$WT_TREE->setPreference('SHOW_DEAD_PEOPLE', Filter::post('SHOW_DEAD_PEOPLE'));
-	$WT_TREE->setPreference('SHOW_LIVING_NAMES', Filter::post('SHOW_LIVING_NAMES'));
-	$WT_TREE->setPreference('SHOW_PRIVATE_RELATIONSHIPS', Filter::post('SHOW_PRIVATE_RELATIONSHIPS'));
-
-	FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php?ged=' . $WT_TREE->getNameUrl());
-
-	return;
-
-case 'general':
-	if (!Filter::checkCsrf()) {
-		break;
-	}
-
-	// Coming soon
-	if (Filter::postBool('all_trees')) {
-		FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	}
-	if (Filter::postBool('new_trees')) {
-		FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	}
-
-	$WT_TREE->setPreference('ADVANCED_NAME_FACTS', Filter::post('ADVANCED_NAME_FACTS'));
-	$WT_TREE->setPreference('ADVANCED_PLAC_FACTS', Filter::post('ADVANCED_PLAC_FACTS'));
-	$WT_TREE->setPreference('ALLOW_THEME_DROPDOWN', Filter::postBool('ALLOW_THEME_DROPDOWN'));
-	// For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
-	// e.g. "gregorian_and_jewish"
-	$WT_TREE->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique(array(
-		Filter::post('CALENDAR_FORMAT0', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
-		Filter::post('CALENDAR_FORMAT1', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
-	))));
-	$WT_TREE->setPreference('CHART_BOX_TAGS', Filter::post('CHART_BOX_TAGS'));
-	$WT_TREE->setPreference('CONTACT_USER_ID', Filter::post('CONTACT_USER_ID'));
-	$WT_TREE->setPreference('DEFAULT_PEDIGREE_GENERATIONS', Filter::post('DEFAULT_PEDIGREE_GENERATIONS'));
-	$WT_TREE->setPreference('EXPAND_NOTES', Filter::postBool('EXPAND_NOTES'));
-	$WT_TREE->setPreference('EXPAND_SOURCES', Filter::postBool('EXPAND_SOURCES'));
-	$WT_TREE->setPreference('FAM_FACTS_ADD', str_replace(' ', '', Filter::post('FAM_FACTS_ADD')));
-	$WT_TREE->setPreference('FAM_FACTS_QUICK', str_replace(' ', '', Filter::post('FAM_FACTS_QUICK')));
-	$WT_TREE->setPreference('FAM_FACTS_UNIQUE', str_replace(' ', '', Filter::post('FAM_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('FAM_ID_PREFIX', Filter::post('FAM_ID_PREFIX'));
-	$WT_TREE->setPreference('FULL_SOURCES', Filter::postBool('FULL_SOURCES'));
-	$WT_TREE->setPreference('FORMAT_TEXT', Filter::post('FORMAT_TEXT'));
-	$WT_TREE->setPreference('GEDCOM_ID_PREFIX', Filter::post('GEDCOM_ID_PREFIX'));
-	$WT_TREE->setPreference('GEDCOM_MEDIA_PATH', Filter::post('GEDCOM_MEDIA_PATH'));
-	$WT_TREE->setPreference('GENERATE_UIDS', Filter::postBool('GENERATE_UIDS'));
-	$WT_TREE->setPreference('GEONAMES_ACCOUNT', Filter::post('GEONAMES_ACCOUNT'));
-	$WT_TREE->setPreference('HIDE_GEDCOM_ERRORS', Filter::postBool('HIDE_GEDCOM_ERRORS'));
-	$WT_TREE->setPreference('INDI_FACTS_ADD', str_replace(' ', '', Filter::post('INDI_FACTS_ADD')));
-	$WT_TREE->setPreference('INDI_FACTS_QUICK', str_replace(' ', '', Filter::post('INDI_FACTS_QUICK')));
-	$WT_TREE->setPreference('INDI_FACTS_UNIQUE', str_replace(' ', '', Filter::post('INDI_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('LANGUAGE', Filter::post('LANGUAGE'));
-	$WT_TREE->setPreference('MAX_DESCENDANCY_GENERATIONS', Filter::post('MAX_DESCENDANCY_GENERATIONS'));
-	$WT_TREE->setPreference('MAX_PEDIGREE_GENERATIONS', Filter::post('MAX_PEDIGREE_GENERATIONS'));
-	$WT_TREE->setPreference('MEDIA_ID_PREFIX', Filter::post('MEDIA_ID_PREFIX'));
-	$WT_TREE->setPreference('MEDIA_UPLOAD', Filter::post('MEDIA_UPLOAD'));
-	$WT_TREE->setPreference('META_DESCRIPTION', Filter::post('META_DESCRIPTION'));
-	$WT_TREE->setPreference('META_TITLE', Filter::post('META_TITLE'));
-	$WT_TREE->setPreference('NOTE_ID_PREFIX', Filter::post('NOTE_ID_PREFIX'));
-	$WT_TREE->setPreference('NO_UPDATE_CHAN', Filter::postBool('NO_UPDATE_CHAN'));
-	$WT_TREE->setPreference('PEDIGREE_FULL_DETAILS', Filter::postBool('PEDIGREE_FULL_DETAILS'));
-	$WT_TREE->setPreference('PEDIGREE_LAYOUT', Filter::postBool('PEDIGREE_LAYOUT'));
-	$WT_TREE->setPreference('PEDIGREE_ROOT_ID', Filter::post('PEDIGREE_ROOT_ID', WT_REGEX_XREF));
-	$WT_TREE->setPreference('PEDIGREE_SHOW_GENDER', Filter::postBool('PEDIGREE_SHOW_GENDER'));
-	$WT_TREE->setPreference('PREFER_LEVEL2_SOURCES', Filter::post('PREFER_LEVEL2_SOURCES'));
-	$WT_TREE->setPreference('QUICK_REQUIRED_FACTS', Filter::post('QUICK_REQUIRED_FACTS'));
-	$WT_TREE->setPreference('QUICK_REQUIRED_FAMFACTS', Filter::post('QUICK_REQUIRED_FAMFACTS'));
-	$WT_TREE->setPreference('REPO_FACTS_ADD', str_replace(' ', '', Filter::post('REPO_FACTS_ADD')));
-	$WT_TREE->setPreference('REPO_FACTS_QUICK', str_replace(' ', '', Filter::post('REPO_FACTS_QUICK')));
-	$WT_TREE->setPreference('REPO_FACTS_UNIQUE', str_replace(' ', '', Filter::post('REPO_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('REPO_ID_PREFIX', Filter::post('REPO_ID_PREFIX'));
-	$WT_TREE->setPreference('SAVE_WATERMARK_IMAGE', Filter::postBool('SAVE_WATERMARK_IMAGE'));
-	$WT_TREE->setPreference('SAVE_WATERMARK_THUMB', Filter::postBool('SAVE_WATERMARK_THUMB'));
-	$WT_TREE->setPreference('SHOW_COUNTER', Filter::postBool('SHOW_COUNTER'));
-	$WT_TREE->setPreference('SHOW_EST_LIST_DATES', Filter::postBool('SHOW_EST_LIST_DATES'));
-	$WT_TREE->setPreference('SHOW_FACT_ICONS', Filter::postBool('SHOW_FACT_ICONS'));
-	$WT_TREE->setPreference('SHOW_GEDCOM_RECORD', Filter::postBool('SHOW_GEDCOM_RECORD'));
-	$WT_TREE->setPreference('SHOW_HIGHLIGHT_IMAGES', Filter::postBool('SHOW_HIGHLIGHT_IMAGES'));
-	$WT_TREE->setPreference('SHOW_LAST_CHANGE', Filter::postBool('SHOW_LAST_CHANGE'));
-	$WT_TREE->setPreference('SHOW_LDS_AT_GLANCE', Filter::postBool('SHOW_LDS_AT_GLANCE'));
-	$WT_TREE->setPreference('SHOW_MEDIA_DOWNLOAD', Filter::post('SHOW_MEDIA_DOWNLOAD'));
-	$WT_TREE->setPreference('SHOW_NO_WATERMARK', Filter::post('SHOW_NO_WATERMARK'));
-	$WT_TREE->setPreference('SHOW_PARENTS_AGE', Filter::postBool('SHOW_PARENTS_AGE'));
-	$WT_TREE->setPreference('SHOW_PEDIGREE_PLACES', Filter::post('SHOW_PEDIGREE_PLACES'));
-	$WT_TREE->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', Filter::postBool('SHOW_PEDIGREE_PLACES_SUFFIX'));
-	$WT_TREE->setPreference('SHOW_RELATIVES_EVENTS', implode(',', Filter::postArray('SHOW_RELATIVES_EVENTS')));
-	$WT_TREE->setPreference('SOURCE_ID_PREFIX', Filter::post('SOURCE_ID_PREFIX'));
-	$WT_TREE->setPreference('SOUR_FACTS_ADD', str_replace(' ', '', Filter::post('SOUR_FACTS_ADD')));
-	$WT_TREE->setPreference('SOUR_FACTS_QUICK', str_replace(' ', '', Filter::post('SOUR_FACTS_QUICK')));
-	$WT_TREE->setPreference('SOUR_FACTS_UNIQUE', str_replace(' ', '', Filter::post('SOUR_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('SUBLIST_TRIGGER_I', Filter::post('SUBLIST_TRIGGER_I', WT_REGEX_INTEGER, 200));
-	$WT_TREE->setPreference('SURNAME_LIST_STYLE', Filter::post('SURNAME_LIST_STYLE'));
-	$WT_TREE->setPreference('SURNAME_TRADITION', Filter::post('SURNAME_TRADITION'));
-	$WT_TREE->setPreference('THEME_DIR', Filter::post('THEME_DIR'));
-	$WT_TREE->setPreference('THUMBNAIL_WIDTH', Filter::post('THUMBNAIL_WIDTH'));
-	$WT_TREE->setPreference('USE_SILHOUETTE', Filter::postBool('USE_SILHOUETTE'));
-	$WT_TREE->setPreference('WATERMARK_THUMB', Filter::postBool('WATERMARK_THUMB'));
-	$WT_TREE->setPreference('WEBMASTER_USER_ID', Filter::post('WEBMASTER_USER_ID'));
-	$WT_TREE->setPreference('WEBTREES_EMAIL', Filter::post('WEBTREES_EMAIL'));
-	$WT_TREE->setPreference('title', Filter::post('title'));
-
-	// Only accept valid folders for MEDIA_DIRECTORY
-	$MEDIA_DIRECTORY = preg_replace('/[\/\\\\]+/', '/', Filter::post('MEDIA_DIRECTORY') . '/');
-	if (substr($MEDIA_DIRECTORY, 0, 1) === '/') {
-		$MEDIA_DIRECTORY = substr($MEDIA_DIRECTORY, 1);
-	}
-
-	if ($MEDIA_DIRECTORY) {
-		if (is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			$WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
-		} elseif (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			$WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'info');
-		} 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');
-		}
-	}
-
-	$gedcom = Filter::post('gedcom');
-	if ($gedcom && $gedcom !== $WT_TREE->getName()) {
-		try {
-			Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute(array($gedcom, $WT_TREE->getTreeId()));
-			Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute(array($gedcom, $WT_TREE->getName()));
-		} catch (\Exception $ex) {
-			// Probably a duplicate name.
-		}
-	}
-
-	FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php');
-
-	return;
+    case 'privacy':
+	    foreach (Filter::postArray('delete', WT_REGEX_INTEGER) as $delete_resn) {
+		    Database::prepare(
+			    "DELETE FROM `##default_resn` WHERE default_resn_id=?"
+		    )->execute(array($delete_resn));
+	    }
+
+	    $xrefs     = Filter::postArray('xref', WT_REGEX_XREF);
+	    $tag_types = Filter::postArray('tag_type', WT_REGEX_TAG);
+	    $resns     = Filter::postArray('resn');
+
+	    foreach ($xrefs as $n => $xref) {
+		    $tag_type = $tag_types[$n];
+		    $resn     = $resns[$n];
+
+		    if ($tag_type || $xref) {
+			    // Delete any existing data
+			    if ($xref === '') {
+				    Database::prepare(
+					    "DELETE FROM `##default_resn` WHERE gedcom_id=? AND tag_type=? AND xref IS NULL"
+				    )->execute(array($WT_TREE->getTreeId(), $tag_type));
+			    }
+			    if ($tag_type === '') {
+				    Database::prepare(
+					    "DELETE FROM `##default_resn` WHERE gedcom_id=? AND xref=? AND tag_type IS NULL"
+				    )->execute(array($WT_TREE->getTreeId(), $xref));
+			    }
+			    // Add (or update) the new data
+			    Database::prepare(
+				    "REPLACE INTO `##default_resn` (gedcom_id, xref, tag_type, resn) VALUES (?, NULLIF(?, ''), NULLIF(?, ''), ?)"
+			    )->execute(array($WT_TREE->getTreeId(), $xref, $tag_type, $resn));
+		    }
+	    }
+
+	    $WT_TREE->setPreference('HIDE_LIVE_PEOPLE', Filter::postBool('HIDE_LIVE_PEOPLE'));
+	    $WT_TREE->setPreference('KEEP_ALIVE_YEARS_BIRTH', Filter::post('KEEP_ALIVE_YEARS_BIRTH', WT_REGEX_INTEGER, 0));
+	    $WT_TREE->setPreference('KEEP_ALIVE_YEARS_DEATH', Filter::post('KEEP_ALIVE_YEARS_DEATH', WT_REGEX_INTEGER, 0));
+	    $WT_TREE->setPreference('MAX_ALIVE_AGE', Filter::post('MAX_ALIVE_AGE', WT_REGEX_INTEGER, 100));
+	    $WT_TREE->setPreference('REQUIRE_AUTHENTICATION', Filter::postBool('REQUIRE_AUTHENTICATION'));
+	    $WT_TREE->setPreference('SHOW_DEAD_PEOPLE', Filter::post('SHOW_DEAD_PEOPLE'));
+	    $WT_TREE->setPreference('SHOW_LIVING_NAMES', Filter::post('SHOW_LIVING_NAMES'));
+	    $WT_TREE->setPreference('SHOW_PRIVATE_RELATIONSHIPS', Filter::post('SHOW_PRIVATE_RELATIONSHIPS'));
+
+	    FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
+	    header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php?ged=' . $WT_TREE->getNameUrl());
+
+	    return;
+
+    case 'general':
+	    if (!Filter::checkCsrf()) {
+		    break;
+	    }
+
+	    // Coming soon
+	    if (Filter::postBool('all_trees')) {
+		    FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
+	    }
+	    if (Filter::postBool('new_trees')) {
+		    FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
+	    }
+
+	    $WT_TREE->setPreference('ADVANCED_NAME_FACTS', Filter::post('ADVANCED_NAME_FACTS'));
+	    $WT_TREE->setPreference('ADVANCED_PLAC_FACTS', Filter::post('ADVANCED_PLAC_FACTS'));
+	    $WT_TREE->setPreference('ALLOW_THEME_DROPDOWN', Filter::postBool('ALLOW_THEME_DROPDOWN'));
+	    // For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
+	    // e.g. "gregorian_and_jewish"
+	    $WT_TREE->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique(array(
+		    Filter::post('CALENDAR_FORMAT0', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
+		    Filter::post('CALENDAR_FORMAT1', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
+	    ))));
+	    $WT_TREE->setPreference('CHART_BOX_TAGS', Filter::post('CHART_BOX_TAGS'));
+	    $WT_TREE->setPreference('CONTACT_USER_ID', Filter::post('CONTACT_USER_ID'));
+	    $WT_TREE->setPreference('DEFAULT_PEDIGREE_GENERATIONS', Filter::post('DEFAULT_PEDIGREE_GENERATIONS'));
+	    $WT_TREE->setPreference('EXPAND_NOTES', Filter::postBool('EXPAND_NOTES'));
+	    $WT_TREE->setPreference('EXPAND_SOURCES', Filter::postBool('EXPAND_SOURCES'));
+	    $WT_TREE->setPreference('FAM_FACTS_ADD', str_replace(' ', '', Filter::post('FAM_FACTS_ADD')));
+	    $WT_TREE->setPreference('FAM_FACTS_QUICK', str_replace(' ', '', Filter::post('FAM_FACTS_QUICK')));
+	    $WT_TREE->setPreference('FAM_FACTS_UNIQUE', str_replace(' ', '', Filter::post('FAM_FACTS_UNIQUE')));
+	    $WT_TREE->setPreference('FAM_ID_PREFIX', Filter::post('FAM_ID_PREFIX'));
+	    $WT_TREE->setPreference('FULL_SOURCES', Filter::postBool('FULL_SOURCES'));
+	    $WT_TREE->setPreference('FORMAT_TEXT', Filter::post('FORMAT_TEXT'));
+	    $WT_TREE->setPreference('GEDCOM_ID_PREFIX', Filter::post('GEDCOM_ID_PREFIX'));
+	    $WT_TREE->setPreference('GEDCOM_MEDIA_PATH', Filter::post('GEDCOM_MEDIA_PATH'));
+	    $WT_TREE->setPreference('GENERATE_UIDS', Filter::postBool('GENERATE_UIDS'));
+	    $WT_TREE->setPreference('GEONAMES_ACCOUNT', Filter::post('GEONAMES_ACCOUNT'));
+	    $WT_TREE->setPreference('HIDE_GEDCOM_ERRORS', Filter::postBool('HIDE_GEDCOM_ERRORS'));
+	    $WT_TREE->setPreference('INDI_FACTS_ADD', str_replace(' ', '', Filter::post('INDI_FACTS_ADD')));
+	    $WT_TREE->setPreference('INDI_FACTS_QUICK', str_replace(' ', '', Filter::post('INDI_FACTS_QUICK')));
+	    $WT_TREE->setPreference('INDI_FACTS_UNIQUE', str_replace(' ', '', Filter::post('INDI_FACTS_UNIQUE')));
+	    $WT_TREE->setPreference('LANGUAGE', Filter::post('LANGUAGE'));
+	    $WT_TREE->setPreference('MAX_DESCENDANCY_GENERATIONS', Filter::post('MAX_DESCENDANCY_GENERATIONS'));
+	    $WT_TREE->setPreference('MAX_PEDIGREE_GENERATIONS', Filter::post('MAX_PEDIGREE_GENERATIONS'));
+	    $WT_TREE->setPreference('MEDIA_ID_PREFIX', Filter::post('MEDIA_ID_PREFIX'));
+	    $WT_TREE->setPreference('MEDIA_UPLOAD', Filter::post('MEDIA_UPLOAD'));
+	    $WT_TREE->setPreference('META_DESCRIPTION', Filter::post('META_DESCRIPTION'));
+	    $WT_TREE->setPreference('META_TITLE', Filter::post('META_TITLE'));
+	    $WT_TREE->setPreference('NOTE_ID_PREFIX', Filter::post('NOTE_ID_PREFIX'));
+	    $WT_TREE->setPreference('NO_UPDATE_CHAN', Filter::postBool('NO_UPDATE_CHAN'));
+	    $WT_TREE->setPreference('PEDIGREE_FULL_DETAILS', Filter::postBool('PEDIGREE_FULL_DETAILS'));
+	    $WT_TREE->setPreference('PEDIGREE_LAYOUT', Filter::postBool('PEDIGREE_LAYOUT'));
+	    $WT_TREE->setPreference('PEDIGREE_ROOT_ID', Filter::post('PEDIGREE_ROOT_ID', WT_REGEX_XREF));
+	    $WT_TREE->setPreference('PEDIGREE_SHOW_GENDER', Filter::postBool('PEDIGREE_SHOW_GENDER'));
+	    $WT_TREE->setPreference('PREFER_LEVEL2_SOURCES', Filter::post('PREFER_LEVEL2_SOURCES'));
+	    $WT_TREE->setPreference('QUICK_REQUIRED_FACTS', Filter::post('QUICK_REQUIRED_FACTS'));
+	    $WT_TREE->setPreference('QUICK_REQUIRED_FAMFACTS', Filter::post('QUICK_REQUIRED_FAMFACTS'));
+	    $WT_TREE->setPreference('REPO_FACTS_ADD', str_replace(' ', '', Filter::post('REPO_FACTS_ADD')));
+	    $WT_TREE->setPreference('REPO_FACTS_QUICK', str_replace(' ', '', Filter::post('REPO_FACTS_QUICK')));
+	    $WT_TREE->setPreference('REPO_FACTS_UNIQUE', str_replace(' ', '', Filter::post('REPO_FACTS_UNIQUE')));
+	    $WT_TREE->setPreference('REPO_ID_PREFIX', Filter::post('REPO_ID_PREFIX'));
+	    $WT_TREE->setPreference('SAVE_WATERMARK_IMAGE', Filter::postBool('SAVE_WATERMARK_IMAGE'));
+	    $WT_TREE->setPreference('SAVE_WATERMARK_THUMB', Filter::postBool('SAVE_WATERMARK_THUMB'));
+	    $WT_TREE->setPreference('SHOW_COUNTER', Filter::postBool('SHOW_COUNTER'));
+	    $WT_TREE->setPreference('SHOW_EST_LIST_DATES', Filter::postBool('SHOW_EST_LIST_DATES'));
+	    $WT_TREE->setPreference('SHOW_FACT_ICONS', Filter::postBool('SHOW_FACT_ICONS'));
+	    $WT_TREE->setPreference('SHOW_GEDCOM_RECORD', Filter::postBool('SHOW_GEDCOM_RECORD'));
+	    $WT_TREE->setPreference('SHOW_HIGHLIGHT_IMAGES', Filter::postBool('SHOW_HIGHLIGHT_IMAGES'));
+	    $WT_TREE->setPreference('SHOW_LAST_CHANGE', Filter::postBool('SHOW_LAST_CHANGE'));
+	    $WT_TREE->setPreference('SHOW_LDS_AT_GLANCE', Filter::postBool('SHOW_LDS_AT_GLANCE'));
+	    $WT_TREE->setPreference('SHOW_MEDIA_DOWNLOAD', Filter::post('SHOW_MEDIA_DOWNLOAD'));
+	    $WT_TREE->setPreference('SHOW_NO_WATERMARK', Filter::post('SHOW_NO_WATERMARK'));
+	    $WT_TREE->setPreference('SHOW_PARENTS_AGE', Filter::postBool('SHOW_PARENTS_AGE'));
+	    $WT_TREE->setPreference('SHOW_PEDIGREE_PLACES', Filter::post('SHOW_PEDIGREE_PLACES'));
+	    $WT_TREE->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', Filter::postBool('SHOW_PEDIGREE_PLACES_SUFFIX'));
+	    $WT_TREE->setPreference('SHOW_RELATIVES_EVENTS', implode(',', Filter::postArray('SHOW_RELATIVES_EVENTS')));
+	    $WT_TREE->setPreference('SOURCE_ID_PREFIX', Filter::post('SOURCE_ID_PREFIX'));
+	    $WT_TREE->setPreference('SOUR_FACTS_ADD', str_replace(' ', '', Filter::post('SOUR_FACTS_ADD')));
+	    $WT_TREE->setPreference('SOUR_FACTS_QUICK', str_replace(' ', '', Filter::post('SOUR_FACTS_QUICK')));
+	    $WT_TREE->setPreference('SOUR_FACTS_UNIQUE', str_replace(' ', '', Filter::post('SOUR_FACTS_UNIQUE')));
+	    $WT_TREE->setPreference('SUBLIST_TRIGGER_I', Filter::post('SUBLIST_TRIGGER_I', WT_REGEX_INTEGER, 200));
+	    $WT_TREE->setPreference('SURNAME_LIST_STYLE', Filter::post('SURNAME_LIST_STYLE'));
+	    $WT_TREE->setPreference('SURNAME_TRADITION', Filter::post('SURNAME_TRADITION'));
+	    $WT_TREE->setPreference('THEME_DIR', Filter::post('THEME_DIR'));
+	    $WT_TREE->setPreference('THUMBNAIL_WIDTH', Filter::post('THUMBNAIL_WIDTH'));
+	    $WT_TREE->setPreference('USE_SILHOUETTE', Filter::postBool('USE_SILHOUETTE'));
+	    $WT_TREE->setPreference('WATERMARK_THUMB', Filter::postBool('WATERMARK_THUMB'));
+	    $WT_TREE->setPreference('WEBMASTER_USER_ID', Filter::post('WEBMASTER_USER_ID'));
+	    $WT_TREE->setPreference('WEBTREES_EMAIL', Filter::post('WEBTREES_EMAIL'));
+	    $WT_TREE->setPreference('title', Filter::post('title'));
+
+	    // Only accept valid folders for MEDIA_DIRECTORY
+	    $MEDIA_DIRECTORY = preg_replace('/[\/\\\\]+/', '/', Filter::post('MEDIA_DIRECTORY') . '/');
+	    if (substr($MEDIA_DIRECTORY, 0, 1) === '/') {
+		    $MEDIA_DIRECTORY = substr($MEDIA_DIRECTORY, 1);
+	    }
+
+	    if ($MEDIA_DIRECTORY) {
+		    if (is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			    $WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
+		    } elseif (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			    $WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
+			    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'info');
+		    } 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');
+		    }
+	    }
+
+	    $gedcom = Filter::post('gedcom');
+	    if ($gedcom && $gedcom !== $WT_TREE->getName()) {
+		    try {
+			    Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute(array($gedcom, $WT_TREE->getTreeId()));
+			    Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute(array($gedcom, $WT_TREE->getName()));
+		    } catch (\Exception $ex) {
+			    // Probably a duplicate name.
+		    }
+	    }
+
+	    FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
+	    header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php');
+
+	    return;
 }
 
 switch (Filter::get('action')) {

admin_pgv_to_wt.php

Switch Indentation +83 added lines, -83 removed lines

@@ -778,69 +778,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));
@@ -900,26 +900,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));