fisharebest / webtrees

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

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();

app/SurnameTradition/PaternalSurnameTradition.php

Switch Indentation +11 added lines, -11 removed lines

@@ -39,17 +39,17 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SPFX_SURN, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return array_filter(array(
-					'NAME' => $match['NAME'],
-					'SPFX' => $match['SPFX'],
-					'SURN' => $match['SURN'],
-				));
-			case 'F':
-				return array(
-					'NAME'   => '//',
-					'_MARNM' => '/' . trim($match['SPFX'] . ' ' . $match['SURN']) . '/',
-				);
+				case 'M':
+					return array_filter(array(
+						'NAME' => $match['NAME'],
+						'SPFX' => $match['SPFX'],
+						'SURN' => $match['SURN'],
+					));
+				case 'F':
+					return array(
+						'NAME'   => '//',
+						'_MARNM' => '/' . trim($match['SPFX'] . ' ' . $match['SURN']) . '/',
+					);
 			}
 		}
 

app/SurnameTradition/PortugueseSurnameTradition.php

Switch Indentation +10 added lines, -10 removed lines

@@ -62,16 +62,16 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return array(
-					'NAME' => '// /' . $match['SURN1'] . '/',
-					'SURN' => $match['SURN1'],
-				);
-			case 'F':
-				return array(
-					'NAME' => '// /' . $match['SURN2'] . '/',
-					'SURN' => $match['SURN2'],
-				);
+				case 'M':
+					return array(
+						'NAME' => '// /' . $match['SURN1'] . '/',
+						'SURN' => $match['SURN1'],
+					);
+				case 'F':
+					return array(
+						'NAME' => '// /' . $match['SURN2'] . '/',
+						'SURN' => $match['SURN2'],
+					);
 			}
 		}
 

app/SurnameTradition/IcelandicSurnameTradition.php

Switch Indentation +8 added lines, -8 removed lines

@@ -43,14 +43,14 @@
 	public function newChildNames($father_name, $mother_name, $child_sex) {
 		if (preg_match(self::REGEX_GIVN, $father_name, $father_match)) {
 			switch ($child_sex) {
-			case 'M':
-				return array(
-					'NAME' => $father_match['GIVN'] . 'sson',
-				);
-			case 'F':
-				return array(
-					'NAME' => $father_match['GIVN'] . 'sdottir',
-				);
+				case 'M':
+					return array(
+						'NAME' => $father_match['GIVN'] . 'sson',
+					);
+				case 'F':
+					return array(
+						'NAME' => $father_match['GIVN'] . 'sdottir',
+					);
 			}
 		}