fisharebest / webtrees

import.php

Switch Indentation +69 added lines, -69 removed lines

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

statisticsplot.php

Switch Indentation +501 added lines, -501 removed lines

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

admin_pgv_to_wt.php

Switch Indentation +83 added lines, -83 removed lines

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

autocomplete.php

Switch Indentation +424 added lines, -424 removed lines

@@ -31,471 +31,471 @@
 $type = Filter::get('field');
 
 switch ($type) {
-case 'ASSO': // Associates of an individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collate"
-	)->execute(array(
-		'term_1'  => $term,
-		'term_2'  => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-		'collate' => I18N::collation(),
-	))->fetchAll();
-
-	// Filter for privacy and whether they could be alive at the right time
-	$event_date = Filter::get('extra');
-	$date       = new Date($event_date);
-	$event_jd   = $date->julianDay();
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShow()) {
-			if ($event_jd) {
-				// Exclude individuals who were born after the event.
-				$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
-				if ($person_birth_jd && $person_birth_jd > $event_jd) {
-					continue;
+	case 'ASSO': // Associates of an individuals, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collate"
+		)->execute(array(
+			'term_1'  => $term,
+			'term_2'  => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+			'collate' => I18N::collation(),
+		))->fetchAll();
+
+		// Filter for privacy and whether they could be alive at the right time
+		$event_date = Filter::get('extra');
+		$date       = new Date($event_date);
+		$event_jd   = $date->julianDay();
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShow()) {
+				if ($event_jd) {
+					// Exclude individuals who were born after the event.
+					$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
+					if ($person_birth_jd && $person_birth_jd > $event_jd) {
+						continue;
+					}
+					// Exclude individuals who died before the event.
+					$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
+					if ($person_death_jd && $person_death_jd < $event_jd) {
+						continue;
+					}
 				}
-				// Exclude individuals who died before the event.
-				$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
-				if ($person_death_jd && $person_death_jd < $event_jd) {
-					continue;
+				// Add the age (if we have it) or the lifespan (if we do not).
+				$label = $person->getFullName();
+				if ($event_jd && $person->getBirthDate()->isOK()) {
+					$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
+				} else {
+					$label .= ', <i>' . $person->getLifeSpan() . '</i>';
 				}
-			}
-			// Add the age (if we have it) or the lifespan (if we do not).
-			$label = $person->getFullName();
-			if ($event_jd && $person->getBirthDate()->isOK()) {
-				$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
-			} else {
-				$label .= ', <i>' . $person->getLifeSpan() . '</i>';
-			}
-			$data[$row->xref] = array('value' => $row->xref, 'label' => $label);
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'CEME': // Cemetery fields, that contain the search term
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
-		" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
-	)->execute(array(
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
-			if (!in_array($match[1], $data)) {
-				$data[] = $match[1];
+				$data[$row->xref] = array('value' => $row->xref, 'label' => $label);
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'FAM': // Families, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'GIVN': // Given names, that start with the search term
-	// Do not filter by privacy. Given names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT SQL_CACHE DISTINCT n_givn" .
-			" FROM `##name`" .
-			" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_givn COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'CEME': // Cemetery fields, that contain the search term
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
+			" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
 		)->execute(array(
-			'term'      => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'INDI': // Individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collation"
-	)->execute(array(
-		'term_1'    => $term,
-		'term_2'    => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'NOTE': // Notes which contain the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'OBJE':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC': // Place names (with hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	$data = array();
-	foreach (Place::findPlaces($term, $WT_TREE) as $place) {
-		$data[] = $place->getGedcomName();
-	}
-	if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
-		// No place found? Use an external gazetteer
-		$url =
-			"http://api.geonames.org/searchJSON" .
-			"?name_startsWith=" . urlencode($term) .
-			"&lang=" . WT_LOCALE .
-			"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
-			"&style=full" .
-			"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
-		// try to use curl when file_get_contents not allowed
-		if (ini_get('allow_url_fopen')) {
-			$json = file_get_contents($url);
-		} elseif (function_exists('curl_init')) {
-			$ch = curl_init();
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			$json = curl_exec($ch);
-			curl_close($ch);
-		} else {
-			return $data;
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
+				if (!in_array($match[1], $data)) {
+					$data[] = $match[1];
+				}
+			}
 		}
-		$places = json_decode($json, true);
-		if (isset($places['geonames']) && is_array($places['geonames'])) {
-			foreach ($places['geonames'] as $k => $place) {
-				$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+		echo json_encode($data);
+
+		return;
+
+	case 'FAM': // Families, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC2': // Place names (without hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT SQL_CACHE p_place" .
-			" FROM `##places`" .
-			" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
-			" ORDER BY p_place COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'GIVN': // Given names, that start with the search term
+		// Do not filter by privacy. Given names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT SQL_CACHE DISTINCT n_givn" .
+				" FROM `##name`" .
+				" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_givn COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'INDI': // Individuals, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collation"
 		)->execute(array(
-			'term'      => $term,
+			'term_1'    => $term,
+			'term_2'    => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'REPO': // Repositories, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('NAME') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'REPO_NAME': // Repository names, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			$data[] = strip_tags($record->getFullName());
+		echo json_encode($data);
+
+		return;
+
+	case 'NOTE': // Notes which contain the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR': // Sources, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('TITL') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+		echo json_encode($data);
+
+		return;
+
+	case 'OBJE':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'PAGE': // Citation details, for a given source, that contain the search term
-	$data = array();
-	$sid  = Filter::get('extra', WT_REGEX_XREF);
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+	case 'PLAC': // Place names (with hierarchy), that include the search term
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		$data = array();
+		foreach (Place::findPlaces($term, $WT_TREE) as $place) {
+			$data[] = $place->getGedcomName();
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+		if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
+			// No place found? Use an external gazetteer
+			$url =
+				"http://api.geonames.org/searchJSON" .
+				"?name_startsWith=" . urlencode($term) .
+				"&lang=" . WT_LOCALE .
+				"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
+				"&style=full" .
+				"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
+			// try to use curl when file_get_contents not allowed
+			if (ini_get('allow_url_fopen')) {
+				$json = file_get_contents($url);
+			} elseif (function_exists('curl_init')) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				$json = curl_exec($ch);
+				curl_close($ch);
+			} else {
+				return $data;
+			}
+			$places = json_decode($json, true);
+			if (isset($places['geonames']) && is_array($places['geonames'])) {
+				foreach ($places['geonames'] as $k => $place) {
+					$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+				}
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT SQL_CACHE f_id AS xref, f_gedcom AS gedcom" .
-		" FROM `##families`" .
-		" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'PLAC2': // Place names (without hierarchy), that include the search term
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT SQL_CACHE p_place" .
+				" FROM `##places`" .
+				" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
+				" ORDER BY p_place COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'REPO': // Repositories, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('NAME') as $fact) {
+					$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+				}
+			}
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'REPO_NAME': // Repository names, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				$data[] = strip_tags($record->getFullName());
+			}
 		}
-	}
-	// array_unique() converts the keys from integer to string, which breaks
-	// the JSON encoding - so need to call array_values() to convert them
-	// back into integers.
-	$data = array_values(array_unique($data));
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR_TITL': // Source titles, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
-		" FROM `##sources`" .
-		" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
-		" ORDER BY s_name COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = $row->s_name;
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR': // Sources, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('TITL') as $fact) {
+					$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+				}
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SURN': // Surnames, that start with the search term
-	// Do not filter by privacy. Surnames on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT SQL_CACHE DISTINCT n_surname" .
-			" FROM `##name`" .
-			" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_surname COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'PAGE': // Citation details, for a given source, that contain the search term
+		$data = array();
+		$sid  = Filter::get('extra', WT_REGEX_XREF);
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
+		)->execute(array(
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT SQL_CACHE f_id AS xref, f_gedcom AS gedcom" .
+			" FROM `##families`" .
+			" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
+		)->execute(array(
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// array_unique() converts the keys from integer to string, which breaks
+		// the JSON encoding - so need to call array_values() to convert them
+		// back into integers.
+		$data = array_values(array_unique($data));
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR_TITL': // Source titles, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
+			" FROM `##sources`" .
+			" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
+			" ORDER BY s_name COLLATE :collation"
 		)->execute(array(
 			'term'      => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'IFSRO':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = $row->s_name;
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		echo json_encode($data);
+
+		return;
+
+	case 'SURN': // Surnames, that start with the search term
+		// Do not filter by privacy. Surnames on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT SQL_CACHE DISTINCT n_surname" .
+				" FROM `##name`" .
+				" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_surname COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'IFSRO':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($repository->canShowName()) {
-			$data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($repository->canShowName()) {
+				$data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'IFS':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		echo json_encode($data);
+
+		return;
+
+	case 'IFS':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 }
 
 /**

admin_site_access.php

Switch Indentation +134 added lines, -134 removed lines

@@ -38,75 +38,75 @@ 
 
 // Form actions
 switch (Filter::post('action')) {
-case 'save':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
-		$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
-		$user_agent_pattern  = Filter::post('user_agent_pattern');
-		$rule                = Filter::post('rule', 'allow|deny|robot');
-		$comment             = Filter::post('comment');
-		$user_agent_string   = Filter::server('HTTP_USER_AGENT');
-		$ip_address          = WT_CLIENT_IP;
-
-		if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
-			// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
-			$oops = $rule !== 'allow' && Database::prepare(
-				"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
-				" AND :user_agent_string LIKE :user_agent_pattern"
-			)->execute(array(
-				'ip_address'         => $ip_address,
-				'ip_address_start'   => $ip_address_start,
-				'ip_address_end'     => $ip_address_end,
-				'user_agent_string'  => $user_agent_string,
-				'user_agent_pattern' => $user_agent_pattern,
-			))->fetchOne();
-
-			if ($oops) {
-				FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
-			} elseif ($site_access_rule_id === null) {
-				Database::prepare(
-					"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
-				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
-			} else {
-				Database::prepare(
-					"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+	case 'save':
+		if (Filter::checkCsrf()) {
+			$site_access_rule_id = Filter::postInteger('site_access_rule_id');
+			$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
+			$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
+			$user_agent_pattern  = Filter::post('user_agent_pattern');
+			$rule                = Filter::post('rule', 'allow|deny|robot');
+			$comment             = Filter::post('comment');
+			$user_agent_string   = Filter::server('HTTP_USER_AGENT');
+			$ip_address          = WT_CLIENT_IP;
+
+			if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
+				// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
+				$oops = $rule !== 'allow' && Database::prepare(
+					"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
+					" AND :user_agent_string LIKE :user_agent_pattern"
 				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-					'site_access_rule_id' => $site_access_rule_id,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+					'ip_address'         => $ip_address,
+					'ip_address_start'   => $ip_address_start,
+					'ip_address_end'     => $ip_address_end,
+					'user_agent_string'  => $user_agent_string,
+					'user_agent_pattern' => $user_agent_pattern,
+				))->fetchOne();
+
+				if ($oops) {
+					FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
+				} elseif ($site_access_rule_id === null) {
+					Database::prepare(
+						"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
+					)->execute(array(
+						'ip_address_start'    => $ip_address_start,
+						'ip_address_end'      => $ip_address_end,
+						'user_agent_pattern'  => $user_agent_pattern,
+						'rule'                => $rule,
+						'comment'             => $comment,
+					));
+					FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
+				} else {
+					Database::prepare(
+						"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+					)->execute(array(
+						'ip_address_start'    => $ip_address_start,
+						'ip_address_end'      => $ip_address_end,
+						'user_agent_pattern'  => $user_agent_pattern,
+						'rule'                => $rule,
+						'comment'             => $comment,
+						'site_access_rule_id' => $site_access_rule_id,
+					));
+					FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+				}
 			}
 		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 
-case 'delete':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		Database::prepare(
-			"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-		)->execute(array(
-			'site_access_rule_id' => $site_access_rule_id,
-		));
-		FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+	case 'delete':
+		if (Filter::checkCsrf()) {
+			$site_access_rule_id = Filter::postInteger('site_access_rule_id');
+			Database::prepare(
+				"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+			)->execute(array(
+				'site_access_rule_id' => $site_access_rule_id,
+			));
+			FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
+		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 }
 
 // Delete any "unknown" visitors that are now "known".
@@ -128,50 +128,50 @@ 
 
 $action = Filter::get('action');
 switch ($action) {
-case 'load':
-	// AJAX callback for datatables
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	$sql =
-		"SELECT SQL_CACHE SQL_CALC_FOUND_ROWS" .
-		" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
-		" FROM `##site_access_rule`";
-	$args = array();
-
-	if ($search) {
-		$sql .=
-			" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
-			" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
-			" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
-			" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
-			" OR comment LIKE CONCAT('%', :search_5, '%'))";
-		$args['search_1'] = Filter::escapeLike($search);
-		$args['search_2'] = Filter::escapeLike($search);
-		$args['search_3'] = Filter::escapeLike($search);
-		$args['search_4'] = Filter::escapeLike($search);
-		$args['search_5'] = Filter::escapeLike($search);
-	}
+	case 'load':
+		// AJAX callback for datatables
+		$search = Filter::get('search');
+		$search = $search['value'];
+		$start  = Filter::getInteger('start');
+		$length = Filter::getInteger('length');
+
+		$sql =
+			"SELECT SQL_CACHE SQL_CALC_FOUND_ROWS" .
+			" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
+			" FROM `##site_access_rule`";
+		$args = array();
+
+		if ($search) {
+			$sql .=
+				" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
+				" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
+				" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
+				" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
+				" OR comment LIKE CONCAT('%', :search_5, '%'))";
+			$args['search_1'] = Filter::escapeLike($search);
+			$args['search_2'] = Filter::escapeLike($search);
+			$args['search_3'] = Filter::escapeLike($search);
+			$args['search_4'] = Filter::escapeLike($search);
+			$args['search_5'] = Filter::escapeLike($search);
+		}
 
-	$order = Filter::getArray('order');
-	$sql .= ' ORDER BY';
-	if ($order) {
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$sql .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$sql .= " :col_" . $key . " ASC";
-				break;
-			case 'desc':
-				$sql .= " :col_" . $key . " DESC";
-				break;
-			}
+		$order = Filter::getArray('order');
+		$sql .= ' ORDER BY';
+		if ($order) {
+			foreach ($order as $key => $value) {
+				if ($key > 0) {
+					$sql .= ',';
+				}
+				// Datatables numbers columns 0, 1, 2
+				// MySQL numbers columns 1, 2, 3
+				switch ($value['dir']) {
+					case 'asc':
+						$sql .= " :col_" . $key . " ASC";
+						break;
+					case 'desc':
+						$sql .= " :col_" . $key . " DESC";
+						break;
+				}
 			$args['col_' . $key] = 1 + $value['column'];
 		}
 	} else {
@@ -210,31 +210,31 @@ 
 	));
 	break;
 
-case 'edit':
-case 'create':
-	if (Filter::get('action') === 'edit') {
-		$controller->setPageTitle(I18N::translate('Edit a website access rule'));
-	} else {
-		$controller->setPageTitle(I18N::translate('Create a website access rule'));
-	}
+	case 'edit':
+	case 'create':
+		if (Filter::get('action') === 'edit') {
+			$controller->setPageTitle(I18N::translate('Edit a website access rule'));
+		} else {
+			$controller->setPageTitle(I18N::translate('Create a website access rule'));
+		}
 
-	$controller->pageHeader();
+		$controller->pageHeader();
 
-	$site_access_rule = Database::prepare(
-		"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
-		" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-	)->execute(array(
-		'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
-	))->fetchOneRow();
+		$site_access_rule = Database::prepare(
+			"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
+			" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+		)->execute(array(
+			'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
+		))->fetchOneRow();
 
-	$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
-	$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
-	$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
-	$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
-	$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
-	$comment             = $site_access_rule ? $site_access_rule->comment : '';
+		$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
+		$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
+		$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
+		$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
+		$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
+		$comment             = $site_access_rule ? $site_access_rule->comment : '';
 
-	?>
+		?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_site_access.php"><?php echo I18N::translate('Website access rules'); ?></a></li>
@@ -311,12 +311,12 @@ 
 	</form>
 
 	<?php
-	break;
+		break;
 
-default:
-	$controller
-		->pageHeader()
-		->addInlineJavascript('
+	default:
+		$controller
+			->pageHeader()
+			->addInlineJavascript('
 			jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 			jQuery.fn.dataTableExt.oSort["unicode-desc"]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
 			jQuery(".table-site-access-rules").dataTable({
@@ -340,7 +340,7 @@ 
 			});
 		');
 
-	?>
+		?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li class="active"><?php echo $controller->getPageTitle(); ?></li>
@@ -381,5 +381,5 @@ 
 		}
 	</script>
 	<?php
-	break;
+		break;
 }

famlist.php

Switch Indentation +41 added lines, -41 removed lines

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

app/Fact.php

Switch Indentation +26 added lines, -26 removed lines

@@ -92,23 +92,23 @@ 
 	public function getTarget() {
 		$xref = trim($this->getValue(), '@');
 		switch ($this->tag) {
-		case 'FAMC':
-		case 'FAMS':
-			return Family::getInstance($xref, $this->getParent()->getTree());
-		case 'HUSB':
-		case 'WIFE':
-		case 'CHIL':
-			return Individual::getInstance($xref, $this->getParent()->getTree());
-		case 'SOUR':
-			return Source::getInstance($xref, $this->getParent()->getTree());
-		case 'OBJE':
-			return Media::getInstance($xref, $this->getParent()->getTree());
-		case 'REPO':
-			return Repository::getInstance($xref, $this->getParent()->getTree());
-		case 'NOTE':
-			return Note::getInstance($xref, $this->getParent()->getTree());
-		default:
-			return GedcomRecord::getInstance($xref, $this->getParent()->getTree());
+			case 'FAMC':
+			case 'FAMS':
+				return Family::getInstance($xref, $this->getParent()->getTree());
+			case 'HUSB':
+			case 'WIFE':
+			case 'CHIL':
+				return Individual::getInstance($xref, $this->getParent()->getTree());
+			case 'SOUR':
+				return Source::getInstance($xref, $this->getParent()->getTree());
+			case 'OBJE':
+				return Media::getInstance($xref, $this->getParent()->getTree());
+			case 'REPO':
+				return Repository::getInstance($xref, $this->getParent()->getTree());
+			case 'NOTE':
+				return Note::getInstance($xref, $this->getParent()->getTree());
+			default:
+				return GedcomRecord::getInstance($xref, $this->getParent()->getTree());
 		}
 	}
 
@@ -262,15 +262,15 @@ 
 	 */
 	public function getLabel() {
 		switch ($this->tag) {
-		case 'EVEN':
-		case 'FACT':
-			if ($this->getAttribute('TYPE')) {
-				// Custom FACT/EVEN - with a TYPE
-				return I18N::translate(Filter::escapeHtml($this->getAttribute('TYPE')));
-			}
-			// no break - drop into next case
-		default:
-			return GedcomTag::getLabel($this->tag, $this->parent);
+			case 'EVEN':
+			case 'FACT':
+				if ($this->getAttribute('TYPE')) {
+					// Custom FACT/EVEN - with a TYPE
+					return I18N::translate(Filter::escapeHtml($this->getAttribute('TYPE')));
+				}
+				// no break - drop into next case
+			default:
+				return GedcomTag::getLabel($this->tag, $this->parent);
 		}
 	}
 

app/Query/QueryName.php

Switch Indentation +145 added lines, -145 removed lines

@@ -34,85 +34,85 @@ 
 	 */
 	private static function getAlphabetForLocale($locale) {
 		switch ($locale) {
-		case 'ar':
-			return array(
-				'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
-			);
-		case 'cs':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'da':
-		case 'nb':
-		case 'nn':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
-			);
-		case 'el':
-			return array(
-				'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
-			);
-		case 'es':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'et':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
-			);
-		case 'fi':
-		case 'sv':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
-			);
-		case 'he':
-			return array(
-				'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
-			);
-		case 'hu':
-			return array(
-				'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
-			);
-		case 'lt':
-			return array(
-				'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
-			);
-		case 'nl':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
-			);
-		case 'pl':
-			return array(
-				'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
-			);
-		case 'ro':
-			return array(
-				'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'ru':
-			return array(
-				'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
-			);
-		case 'sk':
-			return array(
-				'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
-			);
-		case 'sl':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'sr':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'tr':
-			return array(
-				'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
-			);
-		default:
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
+			case 'ar':
+				return array(
+					'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
+				);
+			case 'cs':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
+			case 'da':
+			case 'nb':
+			case 'nn':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
+				);
+			case 'el':
+				return array(
+					'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
+				);
+			case 'es':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
+			case 'et':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
+				);
+			case 'fi':
+			case 'sv':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
+				);
+			case 'he':
+				return array(
+					'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
+				);
+			case 'hu':
+				return array(
+					'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
+				);
+			case 'lt':
+				return array(
+					'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
+				);
+			case 'nl':
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
+				);
+			case 'pl':
+				return array(
+					'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
+				);
+			case 'ro':
+				return array(
+					'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
+			case 'ru':
+				return array(
+					'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
+				);
+			case 'sk':
+				return array(
+					'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
+				);
+			case 'sl':
+				return array(
+					'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+				);
+			case 'sr':
+				return array(
+					'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+				);
+			case 'tr':
+				return array(
+					'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
+				);
+			default:
+				return array(
+					'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				);
 		}
 	}
 
@@ -126,44 +126,44 @@ 
 	public static function initialLetter($name) {
 		$name = I18N::strtoupper($name);
 		switch (WT_LOCALE) {
-		case 'cs':
-			if (substr($name, 0, 2) == 'CH') {
-				return 'CH';
-			}
-			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			if (substr($name, 0, 2) == 'AA') {
-				return 'Å';
-			}
-			break;
-		case 'hu':
-			if (substr($name, 0, 2) == 'CS') {
-				return 'CS';
-			} elseif (substr($name, 0, 3) == 'DZS') {
-				return 'DZS';
-			} elseif (substr($name, 0, 2) == 'DZ') {
-				return 'DZ';
-			} elseif (substr($name, 0, 2) == 'GY') {
-				return 'GY';
-			} elseif (substr($name, 0, 2) == 'LY') {
-				return 'LY';
-			} elseif (substr($name, 0, 2) == 'NY') {
-				return 'NY';
-			} elseif (substr($name, 0, 2) == 'SZ') {
-				return 'SZ';
-			} elseif (substr($name, 0, 2) == 'TY') {
-				return 'TY';
-			} elseif (substr($name, 0, 2) == 'ZS') {
-				return 'ZS';
-			}
-			break;
-		case 'nl':
-			if (substr($name, 0, 2) == 'IJ') {
-				return 'IJ';
-			}
-			break;
+			case 'cs':
+				if (substr($name, 0, 2) == 'CH') {
+					return 'CH';
+				}
+				break;
+			case 'da':
+			case 'nb':
+			case 'nn':
+				if (substr($name, 0, 2) == 'AA') {
+					return 'Å';
+				}
+				break;
+			case 'hu':
+				if (substr($name, 0, 2) == 'CS') {
+					return 'CS';
+				} elseif (substr($name, 0, 3) == 'DZS') {
+					return 'DZS';
+				} elseif (substr($name, 0, 2) == 'DZ') {
+					return 'DZ';
+				} elseif (substr($name, 0, 2) == 'GY') {
+					return 'GY';
+				} elseif (substr($name, 0, 2) == 'LY') {
+					return 'LY';
+				} elseif (substr($name, 0, 2) == 'NY') {
+					return 'NY';
+				} elseif (substr($name, 0, 2) == 'SZ') {
+					return 'SZ';
+				} elseif (substr($name, 0, 2) == 'TY') {
+					return 'TY';
+				} elseif (substr($name, 0, 2) == 'ZS') {
+					return 'ZS';
+				}
+				break;
+			case 'nl':
+				if (substr($name, 0, 2) == 'IJ') {
+					return 'IJ';
+				}
+				break;
 		}
 		// No special rules - just take the first character
 		return mb_substr($name, 0, 1);
@@ -191,37 +191,37 @@ 
 	 */
 	private static function getInitialSql($field, $letter) {
 		switch (WT_LOCALE) {
-		case 'cs':
-			switch ($letter) {
-			case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
-			}
+			case 'cs':
+				switch ($letter) {
+					case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
+				}
 			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			switch ($letter) {
-			// AA gets listed under Å
-			case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
-			case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
-			}
+			case 'da':
+			case 'nb':
+			case 'nn':
+				switch ($letter) {
+				// AA gets listed under Å
+					case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
+					case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
+				}
 			break;
-		case 'hu':
-			switch ($letter) {
-			case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
-			case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
-			case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
-			case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
-			case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
-			case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
-			case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
-			case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
-			case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
-			}
+			case 'hu':
+				switch ($letter) {
+					case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
+					case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
+					case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
+					case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
+					case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
+					case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
+					case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
+					case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
+					case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
+				}
 			break;
-		case 'nl':
-			switch ($letter) {
-			case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
-			}
+			case 'nl':
+				switch ($letter) {
+					case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
+				}
 			break;
 		}
 

app/Query/QueryMedia.php

Switch Indentation +19 added lines, -19 removed lines

@@ -104,17 +104,17 @@ 
 
 		// Include / exclude subfolders (but always include external)
 		switch ($subfolders) {
-		case 'include':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			break;
-		case 'exclude':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			$args[] = Filter::escapeLike($folder);
-			break;
-		default:
-			throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
+			case 'include':
+				$sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
+				$args[] = Filter::escapeLike($folder);
+				break;
+			case 'exclude':
+				$sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
+				$args[] = Filter::escapeLike($folder);
+				$args[] = Filter::escapeLike($folder);
+				break;
+			default:
+				throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
 		}
 
 		// Apply search terms
@@ -130,14 +130,14 @@ 
 		}
 
 		switch ($sort) {
-		case 'file':
-			$sql .= " ORDER BY m_filename";
-			break;
-		case 'title':
-			$sql .= " ORDER BY m_titl";
-			break;
-		default:
-			throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
+			case 'file':
+				$sql .= " ORDER BY m_filename";
+				break;
+			case 'title':
+				$sql .= " ORDER BY m_titl";
+				break;
+			default:
+				throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
 		}
 
 		$rows = Database::prepare($sql)->execute($args)->fetchAll();