fisharebest / webtrees

notelist.php

Indentation +2 added lines, -2 removed lines

@@ -34,6 +34,6 @@
 $controller->pageHeader();
 
 echo '<div id="notelist-page">',
-	'<h2>', I18N::translate('Shared notes'), '</h2>',
-	FunctionsPrintLists::noteTable(FunctionsDb::getNoteList($WT_TREE));
+    '<h2>', I18N::translate('Shared notes'), '</h2>',
+    FunctionsPrintLists::noteTable(FunctionsDb::getNoteList($WT_TREE));
 echo '</div>';

statistics.php

Indentation +42 added lines, -42 removed lines

@@ -34,12 +34,12 @@ 
 $ajax = Filter::getBool('ajax');
 
 if (!$ajax) {
-	$controller = new PageController;
-	$controller
-		->restrictAccess(Module::isActiveChart($WT_TREE, 'statistics_chart'))
-		->setPageTitle(I18N::translate('Statistics'))
-		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-		->addInlineJavascript('
+    $controller = new PageController;
+    $controller
+        ->restrictAccess(Module::isActiveChart($WT_TREE, 'statistics_chart'))
+        ->setPageTitle(I18N::translate('Statistics'))
+        ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+        ->addInlineJavascript('
 			jQuery("#statistics_chart").css("visibility", "visible");
 			jQuery("#statistics_chart").tabs({
 				load: function() {
@@ -60,33 +60,33 @@ 
 				}
 			});
 		')
-		->pageHeader();
+        ->pageHeader();
 
-	echo '<div id="statistics-page"><h2>', I18N::translate('Statistics'), '</h2>',
-	'<div id="statistics_chart">',
-	'<ul>',
-	'<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=0">',
-	'<span id="stats-indi">', I18N::translate('Individuals'), '</span></a></li>',
-	'<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=1">',
-	'<span id="stats-fam">', I18N::translate('Families'), '</span></a></li>',
-	'<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=2">',
-	'<span id="stats-other">', I18N::translate('Others'), '</span></a></li>',
-	'<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=3">',
-	'<span id="stats-own">', I18N::translate('Own charts'), '</span></a></li>',
-	'</ul>',
-	'<div id="loading-indicator" style="margin:auto;width:100%;"></div>',
-	'</div>', // statistics_chart
-	'</div>', // statistics-page
-	'<br><br>';
+    echo '<div id="statistics-page"><h2>', I18N::translate('Statistics'), '</h2>',
+    '<div id="statistics_chart">',
+    '<ul>',
+    '<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=0">',
+    '<span id="stats-indi">', I18N::translate('Individuals'), '</span></a></li>',
+    '<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=1">',
+    '<span id="stats-fam">', I18N::translate('Families'), '</span></a></li>',
+    '<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=2">',
+    '<span id="stats-other">', I18N::translate('Others'), '</span></a></li>',
+    '<li><a href="statistics.php?ged=', $WT_TREE->getNameUrl(), '&amp;ajax=1&amp;tab=3">',
+    '<span id="stats-own">', I18N::translate('Own charts'), '</span></a></li>',
+    '</ul>',
+    '<div id="loading-indicator" style="margin:auto;width:100%;"></div>',
+    '</div>', // statistics_chart
+    '</div>', // statistics-page
+    '<br><br>';
 } else {
-	$controller = new AjaxController;
-	$controller
-		->pageHeader()
-		->addInlineJavascript('autocomplete();')
-		->addInlineJavascript('jQuery("#loading-indicator").removeClass("loading-image");');
-	$stats = new Stats($WT_TREE);
-	if ($tab == 0) {
-		echo '<fieldset>
+    $controller = new AjaxController;
+    $controller
+        ->pageHeader()
+        ->addInlineJavascript('autocomplete();')
+        ->addInlineJavascript('jQuery("#loading-indicator").removeClass("loading-image");');
+    $stats = new Stats($WT_TREE);
+    if ($tab == 0) {
+        echo '<fieldset>
 		<legend>', I18N::translate('Total individuals: %s', $stats->totalIndividuals()), '</legend>
 		<table class="facts_table">
 			<tr>
@@ -172,8 +172,8 @@ 
 			</tr>
 		</table>
 		<br>';
-		if (Auth::check()) {
-			echo '<b>', I18N::translate('Oldest living individuals'), '</b>
+        if (Auth::check()) {
+            echo '<b>', I18N::translate('Oldest living individuals'), '</b>
 			<table class="facts_table">
 				<tr>
 					<td class="facts_label">', I18N::translate('Males'), '</td>
@@ -185,8 +185,8 @@ 
 				</tr>
 			</table>
 			<br>';
-		}
-		echo '<b>', I18N::translate('Names'), '</b>
+        }
+        echo '<b>', I18N::translate('Names'), '</b>
 		<table class="facts_table">
 			<tr>
 				<td class="facts_label">', I18N::translate('Total surnames'), '</td>
@@ -206,8 +206,8 @@ 
 			</tr>
 		</table>
 		</fieldset>';
-	} elseif ($tab == 1) {
-		echo '<fieldset>
+    } elseif ($tab == 1) {
+        echo '<fieldset>
 		<legend>', I18N::translate('Total families: %s', $stats->totalFamilies()), '</legend>
 		<b>', I18N::translate('Events'), '</b>
 		<table class="facts_table">
@@ -344,8 +344,8 @@ 
 			</tr>
 		</table>
 		</fieldset>';
-	} elseif ($tab == 2) {
-		echo '
+    } elseif ($tab == 2) {
+        echo '
 		<fieldset>
 			<legend>', I18N::translate('Records'), ': ', $stats->totalRecords(), '</legend>
 			<table class="facts_table">
@@ -428,8 +428,8 @@ 
 				</tr>
 			</table>
 		</fieldset>';
-	} elseif ($tab == 3) {
-		?>
+    } elseif ($tab == 3) {
+        ?>
 		<script>
 			function statusHide(sel) {
 				var box = document.getElementById(sel);
@@ -769,5 +769,5 @@ 
 			</div>
 		</fieldset>
 	<?php
-	}
+    }
 }

action.php

Indentation +190 added lines, -190 removed lines

@@ -32,222 +32,222 @@
 header('Content-type: text/html; charset=UTF-8');
 
 if (!Filter::checkCsrf()) {
-	http_response_code(406);
+    http_response_code(406);
 
-	return;
+    return;
 }
 
 switch (Filter::post('action')) {
 case 'accept-changes':
-	// Accept all the pending changes for a record
-	$record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-	if ($record && Auth::isModerator($record->getTree()) && $record->canShow() && $record->canEdit()) {
-		if ($record->isPendingDeletion()) {
-			FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
-				I18N::translate('“%s” has been deleted.', $record->getFullName()));
-		} else {
-			FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
-				I18N::translate('The changes to “%s” have been accepted.', $record->getFullName()));
-		}
-		FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
-	} else {
-		http_response_code(406);
-	}
-	break;
+    // Accept all the pending changes for a record
+    $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+    if ($record && Auth::isModerator($record->getTree()) && $record->canShow() && $record->canEdit()) {
+        if ($record->isPendingDeletion()) {
+            FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
+                I18N::translate('“%s” has been deleted.', $record->getFullName()));
+        } else {
+            FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
+                I18N::translate('The changes to “%s” have been accepted.', $record->getFullName()));
+        }
+        FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
+    } else {
+        http_response_code(406);
+    }
+    break;
 
 case 'copy-fact':
-	// Copy a fact to the clipboard
-	$xref    = Filter::post('xref', WT_REGEX_XREF);
-	$fact_id = Filter::post('fact_id');
-
-	$record = GedcomRecord::getInstance($xref, $WT_TREE);
-
-	if ($record && $record->canEdit()) {
-		foreach ($record->getFacts() as $fact) {
-			if ($fact->getFactId() == $fact_id) {
-				switch ($fact->getTag()) {
-				case 'NOTE':
-				case 'SOUR':
-				case 'OBJE':
-					$type = 'all'; // paste this anywhere
-					break;
-				default:
-					$type = $record::RECORD_TYPE; // paste only to the same record type
-					break;
-				}
-				$clipboard = Session::get('clipboard');
-				if (!is_array($clipboard)) {
-					$clipboard = array();
-				}
-				$clipboard[$fact_id] = array(
-					'type'    => $type,
-					'factrec' => $fact->getGedcom(),
-					'fact'    => $fact->getTag(),
-					);
-				// The clipboard only holds 10 facts
-				while (count($clipboard) > 10) {
-					array_shift($clipboard);
-				}
-				Session::put('clipboard', $clipboard);
-				FlashMessages::addMessage(I18N::translate('The record has been copied to the clipboard.'));
-				break 2;
-			}
-		}
-	}
-	break;
+    // Copy a fact to the clipboard
+    $xref    = Filter::post('xref', WT_REGEX_XREF);
+    $fact_id = Filter::post('fact_id');
+
+    $record = GedcomRecord::getInstance($xref, $WT_TREE);
+
+    if ($record && $record->canEdit()) {
+        foreach ($record->getFacts() as $fact) {
+            if ($fact->getFactId() == $fact_id) {
+                switch ($fact->getTag()) {
+                case 'NOTE':
+                case 'SOUR':
+                case 'OBJE':
+                    $type = 'all'; // paste this anywhere
+                    break;
+                default:
+                    $type = $record::RECORD_TYPE; // paste only to the same record type
+                    break;
+                }
+                $clipboard = Session::get('clipboard');
+                if (!is_array($clipboard)) {
+                    $clipboard = array();
+                }
+                $clipboard[$fact_id] = array(
+                    'type'    => $type,
+                    'factrec' => $fact->getGedcom(),
+                    'fact'    => $fact->getTag(),
+                    );
+                // The clipboard only holds 10 facts
+                while (count($clipboard) > 10) {
+                    array_shift($clipboard);
+                }
+                Session::put('clipboard', $clipboard);
+                FlashMessages::addMessage(I18N::translate('The record has been copied to the clipboard.'));
+                break 2;
+            }
+        }
+    }
+    break;
 
 case 'paste-fact':
-	// Paste a fact from the clipboard
-	$xref      = Filter::post('xref', WT_REGEX_XREF);
-	$fact_id   = Filter::post('fact_id');
-	$record    = GedcomRecord::getInstance($xref, $WT_TREE);
-	$clipboard = Session::get('clipboard');
+    // Paste a fact from the clipboard
+    $xref      = Filter::post('xref', WT_REGEX_XREF);
+    $fact_id   = Filter::post('fact_id');
+    $record    = GedcomRecord::getInstance($xref, $WT_TREE);
+    $clipboard = Session::get('clipboard');
 
-	if ($record && $record->canEdit() && isset($clipboard[$fact_id])) {
-		$record->createFact($clipboard[$fact_id]['factrec'], true);
-	}
-	break;
+    if ($record && $record->canEdit() && isset($clipboard[$fact_id])) {
+        $record->createFact($clipboard[$fact_id]['factrec'], true);
+    }
+    break;
 
 case 'delete-fact':
-	$xref    = Filter::post('xref', WT_REGEX_XREF);
-	$fact_id = Filter::post('fact_id');
-
-	$record = GedcomRecord::getInstance($xref, $WT_TREE);
-	if ($record && $record->canShow() && $record->canEdit()) {
-		foreach ($record->getFacts() as $fact) {
-			if ($fact->getFactId() == $fact_id && $fact->canShow() && $fact->canEdit()) {
-				$record->deleteFact($fact_id, true);
-				break 2;
-			}
-		}
-	}
-
-	// Can’t find the record/fact, or don’t have permission to delete it.
-	http_response_code(406);
-	break;
+    $xref    = Filter::post('xref', WT_REGEX_XREF);
+    $fact_id = Filter::post('fact_id');
+
+    $record = GedcomRecord::getInstance($xref, $WT_TREE);
+    if ($record && $record->canShow() && $record->canEdit()) {
+        foreach ($record->getFacts() as $fact) {
+            if ($fact->getFactId() == $fact_id && $fact->canShow() && $fact->canEdit()) {
+                $record->deleteFact($fact_id, true);
+                break 2;
+            }
+        }
+    }
+
+    // Can’t find the record/fact, or don’t have permission to delete it.
+    http_response_code(406);
+    break;
 
 case 'delete-record':
-	$record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-	if ($record && Auth::isEditor($record->getTree()) && $record->canShow() && $record->canEdit()) {
-		// Delete links to this record
-		foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->getTreeId()) as $xref) {
-			$linker     = GedcomRecord::getInstance($xref, $WT_TREE);
-			$old_gedcom = $linker->getGedcom();
-			$new_gedcom = FunctionsEdit::removeLinks($old_gedcom, $record->getXref());
-			// FunctionsDb::fetch_all_links() does not take account of pending changes. The links (or even the
-			// record itself) may have already been deleted.
-			if ($old_gedcom !== $new_gedcom) {
-				// If we have removed a link from a family to an individual, and it has only one member
-				if (preg_match('/^0 @' . WT_REGEX_XREF . '@ FAM/', $new_gedcom) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . WT_REGEX_XREF . ')@/', $new_gedcom, $match) == 1) {
-					// Delete the family
-					$family = GedcomRecord::getInstance($xref, $WT_TREE);
-					FlashMessages::addMessage(/* I18N: %s is the name of a family group, e.g. “Husband name + Wife name” */ I18N::translate('The family “%s” has been deleted because it only has one member.', $family->getFullName()));
-					$family->deleteRecord();
-					// Delete any remaining link to this family
-					if ($match) {
-						$relict     = GedcomRecord::getInstance($match[2][0], $WT_TREE);
-						$new_gedcom = $relict->getGedcom();
-						$new_gedcom = FunctionsEdit::removeLinks($new_gedcom, $linker->getXref());
-						$relict->updateRecord($new_gedcom, false);
-						FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $relict->getFullName(), $family->getFullName()));
-					}
-				} else {
-					// Remove links from $linker to $record
-					FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $linker->getFullName(), $record->getFullName()));
-					$linker->updateRecord($new_gedcom, false);
-				}
-			}
-		}
-		// Delete the record itself
-		$record->deleteRecord();
-	} else {
-		http_response_code(406);
-	}
-	break;
+    $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+    if ($record && Auth::isEditor($record->getTree()) && $record->canShow() && $record->canEdit()) {
+        // Delete links to this record
+        foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->getTreeId()) as $xref) {
+            $linker     = GedcomRecord::getInstance($xref, $WT_TREE);
+            $old_gedcom = $linker->getGedcom();
+            $new_gedcom = FunctionsEdit::removeLinks($old_gedcom, $record->getXref());
+            // FunctionsDb::fetch_all_links() does not take account of pending changes. The links (or even the
+            // record itself) may have already been deleted.
+            if ($old_gedcom !== $new_gedcom) {
+                // If we have removed a link from a family to an individual, and it has only one member
+                if (preg_match('/^0 @' . WT_REGEX_XREF . '@ FAM/', $new_gedcom) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . WT_REGEX_XREF . ')@/', $new_gedcom, $match) == 1) {
+                    // Delete the family
+                    $family = GedcomRecord::getInstance($xref, $WT_TREE);
+                    FlashMessages::addMessage(/* I18N: %s is the name of a family group, e.g. “Husband name + Wife name” */ I18N::translate('The family “%s” has been deleted because it only has one member.', $family->getFullName()));
+                    $family->deleteRecord();
+                    // Delete any remaining link to this family
+                    if ($match) {
+                        $relict     = GedcomRecord::getInstance($match[2][0], $WT_TREE);
+                        $new_gedcom = $relict->getGedcom();
+                        $new_gedcom = FunctionsEdit::removeLinks($new_gedcom, $linker->getXref());
+                        $relict->updateRecord($new_gedcom, false);
+                        FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $relict->getFullName(), $family->getFullName()));
+                    }
+                } else {
+                    // Remove links from $linker to $record
+                    FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $linker->getFullName(), $record->getFullName()));
+                    $linker->updateRecord($new_gedcom, false);
+                }
+            }
+        }
+        // Delete the record itself
+        $record->deleteRecord();
+    } else {
+        http_response_code(406);
+    }
+    break;
 
 case 'delete-user':
-	$user = User::find(Filter::postInteger('user_id'));
+    $user = User::find(Filter::postInteger('user_id'));
 
-	if ($user && Auth::isAdmin() && Auth::user() !== $user) {
-		Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
-		$user->delete();
-	}
-	break;
+    if ($user && Auth::isAdmin() && Auth::user() !== $user) {
+        Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
+        $user->delete();
+    }
+    break;
 
 case 'language':
-	// Change the current language
-	$language = Filter::post('language');
-	try {
-		I18N::init($language);
-		Session::put('locale', $language);
-		// Remember our selection
-		Auth::user()->setPreference('language', $language);
-	} catch (\Exception $ex) {
-		// Request for a non-existant language.
-		http_response_code(406);
-	}
-	break;
+    // Change the current language
+    $language = Filter::post('language');
+    try {
+        I18N::init($language);
+        Session::put('locale', $language);
+        // Remember our selection
+        Auth::user()->setPreference('language', $language);
+    } catch (\Exception $ex) {
+        // Request for a non-existant language.
+        http_response_code(406);
+    }
+    break;
 
 case 'masquerade':
-	$user = User::find(Filter::postInteger('user_id'));
+    $user = User::find(Filter::postInteger('user_id'));
 
-	if ($user && Auth::isAdmin() && Auth::user() !== $user) {
-		Log::addAuthenticationLog('Masquerade as user: ' . $user->getUserName());
-		Auth::login($user);
-		Session::put('masquerade', '1');
-	} else {
-		http_response_code(406);
-	}
-	break;
+    if ($user && Auth::isAdmin() && Auth::user() !== $user) {
+        Log::addAuthenticationLog('Masquerade as user: ' . $user->getUserName());
+        Auth::login($user);
+        Session::put('masquerade', '1');
+    } else {
+        http_response_code(406);
+    }
+    break;
 
 case 'unlink-media':
-	// Remove links from an individual and their spouse-family records to a media object.
-	// Used by the "unlink" option on the album (lightbox) tab.
-	$source = Individual::getInstance(Filter::post('source', WT_REGEX_XREF), $WT_TREE);
-	$target = Filter::post('target', WT_REGEX_XREF);
-	if ($source && $source->canShow() && $source->canEdit() && $target) {
-		// Consider the individual and their spouse-family records
-		$sources   = $source->getSpouseFamilies();
-		$sources[] = $source;
-		foreach ($sources as $source) {
-			foreach ($source->getFacts() as $fact) {
-				if (!$fact->isPendingDeletion()) {
-					if ($fact->getValue() == '@' . $target . '@') {
-						// Level 1 links
-						$source->deleteFact($fact->getFactId(), true);
-					} elseif (strpos($fact->getGedcom(), ' @' . $target . '@')) {
-						// Level 2-3 links
-						$source->updateFact($fact->getFactId(), preg_replace(array('/\n2 OBJE @' . $target . '@(\n[3-9].*)*/', '/\n3 OBJE @' . $target . '@(\n[4-9].*)*/'), '', $fact->getGedcom()), true);
-					}
-				}
-			}
-		}
-	} else {
-		http_response_code(406);
-	}
-	break;
+    // Remove links from an individual and their spouse-family records to a media object.
+    // Used by the "unlink" option on the album (lightbox) tab.
+    $source = Individual::getInstance(Filter::post('source', WT_REGEX_XREF), $WT_TREE);
+    $target = Filter::post('target', WT_REGEX_XREF);
+    if ($source && $source->canShow() && $source->canEdit() && $target) {
+        // Consider the individual and their spouse-family records
+        $sources   = $source->getSpouseFamilies();
+        $sources[] = $source;
+        foreach ($sources as $source) {
+            foreach ($source->getFacts() as $fact) {
+                if (!$fact->isPendingDeletion()) {
+                    if ($fact->getValue() == '@' . $target . '@') {
+                        // Level 1 links
+                        $source->deleteFact($fact->getFactId(), true);
+                    } elseif (strpos($fact->getGedcom(), ' @' . $target . '@')) {
+                        // Level 2-3 links
+                        $source->updateFact($fact->getFactId(), preg_replace(array('/\n2 OBJE @' . $target . '@(\n[3-9].*)*/', '/\n3 OBJE @' . $target . '@(\n[4-9].*)*/'), '', $fact->getGedcom()), true);
+                    }
+                }
+            }
+        }
+    } else {
+        http_response_code(406);
+    }
+    break;
 
 case 'reject-changes':
-	// Reject all the pending changes for a record
-	$record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-	if ($record && $record->canEdit() && Auth::isModerator($record->getTree())) {
-		FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('The changes to “%s” have been rejected.', $record->getFullName()));
-		FunctionsImport::rejectAllChanges($record);
-	} else {
-		http_response_code(406);
-	}
-	break;
+    // Reject all the pending changes for a record
+    $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+    if ($record && $record->canEdit() && Auth::isModerator($record->getTree())) {
+        FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('The changes to “%s” have been rejected.', $record->getFullName()));
+        FunctionsImport::rejectAllChanges($record);
+    } else {
+        http_response_code(406);
+    }
+    break;
 
 case 'theme':
-	// Change the current theme
-	$theme = Filter::post('theme');
-	if (Site::getPreference('ALLOW_USER_THEMES') && array_key_exists($theme, Theme::themeNames())) {
-		Session::put('theme_id', $theme);
-		// Remember our selection
-		Auth::user()->setPreference('theme', $theme);
-	} else {
-		// Request for a non-existant theme.
-		http_response_code(406);
-	}
-	break;
+    // Change the current theme
+    $theme = Filter::post('theme');
+    if (Site::getPreference('ALLOW_USER_THEMES') && array_key_exists($theme, Theme::themeNames())) {
+        Session::put('theme_id', $theme);
+        // Remember our selection
+        Auth::user()->setPreference('theme', $theme);
+    } else {
+        // Request for a non-existant theme.
+        http_response_code(406);
+    }
+    break;
 }

Switch Indentation +8 added lines, -8 removed lines

@@ -66,14 +66,14 @@
 		foreach ($record->getFacts() as $fact) {
 			if ($fact->getFactId() == $fact_id) {
 				switch ($fact->getTag()) {
-				case 'NOTE':
-				case 'SOUR':
-				case 'OBJE':
-					$type = 'all'; // paste this anywhere
-					break;
-				default:
-					$type = $record::RECORD_TYPE; // paste only to the same record type
-					break;
+				    case 'NOTE':
+				    case 'SOUR':
+				    case 'OBJE':
+					    $type = 'all'; // paste this anywhere
+					    break;
+				    default:
+					    $type = $record::RECORD_TYPE; // paste only to the same record type
+					    break;
 				}
 				$clipboard = Session::get('clipboard');
 				if (!is_array($clipboard)) {

statisticsplot.php

Indentation +1123 added lines, -1123 removed lines

@@ -37,50 +37,50 @@ 
  * @return int
  */
 function month_of_birth($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->statsBirthQuery(false);
-		foreach ($num as $values) {
-			foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-				if ($month === $values['d_month']) {
-					fill_y_data(0, $key, $values['total']);
-					$total += $values['total'];
-				}
-			}
-		}
-	} elseif ($z_axis === 301) {
-		$num = $stats->statsBirthQuery(false, true);
-		foreach ($num as $values) {
-			foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-				if ($month === $values['d_month']) {
-					if ($values['i_sex'] === 'M') {
-						fill_y_data(0, $key, $values['total']);
-						$total += $values['total'];
-					} elseif ($values['i_sex'] === 'F') {
-						fill_y_data(1, $key, $values['total']);
-						$total += $values['total'];
-					}
-				}
-			}
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsBirthQuery(false, false, $zstart, $boundary);
-			foreach ($num as $values) {
-				foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-					if ($month === $values['d_month']) {
-						fill_y_data($boundary, $key, $values['total']);
-						$total += $values['total'];
-					}
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->statsBirthQuery(false);
+        foreach ($num as $values) {
+            foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                if ($month === $values['d_month']) {
+                    fill_y_data(0, $key, $values['total']);
+                    $total += $values['total'];
+                }
+            }
+        }
+    } elseif ($z_axis === 301) {
+        $num = $stats->statsBirthQuery(false, true);
+        foreach ($num as $values) {
+            foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                if ($month === $values['d_month']) {
+                    if ($values['i_sex'] === 'M') {
+                        fill_y_data(0, $key, $values['total']);
+                        $total += $values['total'];
+                    } elseif ($values['i_sex'] === 'F') {
+                        fill_y_data(1, $key, $values['total']);
+                        $total += $values['total'];
+                    }
+                }
+            }
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsBirthQuery(false, false, $zstart, $boundary);
+            foreach ($num as $values) {
+                foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                    if ($month === $values['d_month']) {
+                        fill_y_data($boundary, $key, $values['total']);
+                        $total += $values['total'];
+                    }
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -93,50 +93,50 @@ 
  * @return int
  */
 function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->monthFirstChildQuery(false);
-		foreach ($num as $values) {
-			foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-				if ($month === $values['d_month']) {
-					fill_y_data(0, $key, $values['total']);
-					$total += $values['total'];
-				}
-			}
-		}
-	} elseif ($z_axis === 301) {
-		$num = $stats->monthFirstChildQuery(false, true);
-		foreach ($num as $values) {
-			foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-				if ($month === $values['d_month']) {
-					if ($values['i_sex'] === 'M') {
-						fill_y_data(0, $key, $values['total']);
-						$total += $values['total'];
-					} elseif ($values['i_sex'] === 'F') {
-						fill_y_data(1, $key, $values['total']);
-						$total += $values['total'];
-					}
-				}
-			}
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->monthFirstChildQuery(false, false, $zstart, $boundary);
-			foreach ($num as $values) {
-				foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-					if ($month === $values['d_month']) {
-						fill_y_data($boundary, $key, $values['total']);
-						$total += $values['total'];
-					}
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->monthFirstChildQuery(false);
+        foreach ($num as $values) {
+            foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                if ($month === $values['d_month']) {
+                    fill_y_data(0, $key, $values['total']);
+                    $total += $values['total'];
+                }
+            }
+        }
+    } elseif ($z_axis === 301) {
+        $num = $stats->monthFirstChildQuery(false, true);
+        foreach ($num as $values) {
+            foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                if ($month === $values['d_month']) {
+                    if ($values['i_sex'] === 'M') {
+                        fill_y_data(0, $key, $values['total']);
+                        $total += $values['total'];
+                    } elseif ($values['i_sex'] === 'F') {
+                        fill_y_data(1, $key, $values['total']);
+                        $total += $values['total'];
+                    }
+                }
+            }
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->monthFirstChildQuery(false, false, $zstart, $boundary);
+            foreach ($num as $values) {
+                foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                    if ($month === $values['d_month']) {
+                        fill_y_data($boundary, $key, $values['total']);
+                        $total += $values['total'];
+                    }
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -149,50 +149,50 @@ 
  * @return int
  */
 function month_of_death($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->statsDeathQuery(false);
-		foreach ($num as $values) {
-			foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-				if ($month === $values['d_month']) {
-					fill_y_data(0, $key, $values['total']);
-					$total += $values['total'];
-				}
-			}
-		}
-	} elseif ($z_axis === 301) {
-		$num = $stats->statsDeathQuery(false, true);
-		foreach ($num as $values) {
-			foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-				if ($month === $values['d_month']) {
-					if ($values['i_sex'] === 'M') {
-						fill_y_data(0, $key, $values['total']);
-						$total += $values['total'];
-					} elseif ($values['i_sex'] === 'F') {
-						fill_y_data(1, $key, $values['total']);
-						$total += $values['total'];
-					}
-				}
-			}
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsDeathQuery(false, false, $zstart, $boundary);
-			foreach ($num as $values) {
-				foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-					if ($month === $values['d_month']) {
-						fill_y_data($boundary, $key, $values['total']);
-						$total += $values['total'];
-					}
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->statsDeathQuery(false);
+        foreach ($num as $values) {
+            foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                if ($month === $values['d_month']) {
+                    fill_y_data(0, $key, $values['total']);
+                    $total += $values['total'];
+                }
+            }
+        }
+    } elseif ($z_axis === 301) {
+        $num = $stats->statsDeathQuery(false, true);
+        foreach ($num as $values) {
+            foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                if ($month === $values['d_month']) {
+                    if ($values['i_sex'] === 'M') {
+                        fill_y_data(0, $key, $values['total']);
+                        $total += $values['total'];
+                    } elseif ($values['i_sex'] === 'F') {
+                        fill_y_data(1, $key, $values['total']);
+                        $total += $values['total'];
+                    }
+                }
+            }
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsDeathQuery(false, false, $zstart, $boundary);
+            foreach ($num as $values) {
+                foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                    if ($month === $values['d_month']) {
+                        fill_y_data($boundary, $key, $values['total']);
+                        $total += $values['total'];
+                    }
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -205,35 +205,35 @@ 
  * @return int
  */
 function month_of_marriage($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->statsMarrQuery(false, false);
-		foreach ($num as $values) {
-			foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-				if ($month === $values['d_month']) {
-					fill_y_data(0, $key, $values['total']);
-					$total += $values['total'];
-				}
-			}
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsMarrQuery(false, false, $zstart, $boundary);
-			foreach ($num as $values) {
-				foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-					if ($month === $values['d_month']) {
-						fill_y_data($boundary, $key, $values['total']);
-						$total += $values['total'];
-					}
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->statsMarrQuery(false, false);
+        foreach ($num as $values) {
+            foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                if ($month === $values['d_month']) {
+                    fill_y_data(0, $key, $values['total']);
+                    $total += $values['total'];
+                }
+            }
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsMarrQuery(false, false, $zstart, $boundary);
+            foreach ($num as $values) {
+                foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                    if ($month === $values['d_month']) {
+                        fill_y_data($boundary, $key, $values['total']);
+                        $total += $values['total'];
+                    }
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -246,47 +246,47 @@ 
  * @return int
  */
 function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num  = $stats->statsMarrQuery(false, true);
-		$indi = array();
-		$fam  = array();
-		foreach ($num as $values) {
-			if (!in_array($values['indi'], $indi) && !in_array($values['fams'], $fam)) {
-				foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-					if ($month === $values['month']) {
-						fill_y_data(0, $key, 1);
-						$total++;
-					}
-				}
-				$indi[] = $values['indi'];
-				$fam[]  = $values['fams'];
-			}
-		}
-	} else {
-		$zstart = 0;
-		$indi   = array();
-		$fam    = array();
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsMarrQuery(false, true, $zstart, $boundary);
-			foreach ($num as $values) {
-				if (!in_array($values['indi'], $indi) && !in_array($values['fams'], $fam)) {
-					foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
-						if ($month === $values['month']) {
-							fill_y_data($boundary, $key, 1);
-							$total++;
-						}
-					}
-					$indi[] = $values['indi'];
-					$fam[]  = $values['fams'];
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num  = $stats->statsMarrQuery(false, true);
+        $indi = array();
+        $fam  = array();
+        foreach ($num as $values) {
+            if (!in_array($values['indi'], $indi) && !in_array($values['fams'], $fam)) {
+                foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                    if ($month === $values['month']) {
+                        fill_y_data(0, $key, 1);
+                        $total++;
+                    }
+                }
+                $indi[] = $values['indi'];
+                $fam[]  = $values['fams'];
+            }
+        }
+    } else {
+        $zstart = 0;
+        $indi   = array();
+        $fam    = array();
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsMarrQuery(false, true, $zstart, $boundary);
+            foreach ($num as $values) {
+                if (!in_array($values['indi'], $indi) && !in_array($values['fams'], $fam)) {
+                    foreach (array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC') as $key => $month) {
+                        if ($month === $values['month']) {
+                            fill_y_data($boundary, $key, 1);
+                            $total++;
+                        }
+                    }
+                    $indi[] = $values['indi'];
+                    $fam[]  = $values['fams'];
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -299,46 +299,46 @@ 
  * @return int
  */
 function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->statsAgeQuery(false, 'BIRT');
-		foreach ($num as $values) {
-			foreach ($values as $age_value) {
-				fill_y_data(0, (int) ($age_value / 365.25), 1);
-				$total++;
-			}
-		}
-	} elseif ($z_axis === 301) {
-		$num = $stats->statsAgeQuery(false, 'BIRT', 'M');
-		foreach ($num as $values) {
-			foreach ($values as $age_value) {
-				fill_y_data(0, (int) ($age_value / 365.25), 1);
-				$total++;
-			}
-		}
-		$num = $stats->statsAgeQuery(false, 'BIRT', 'F');
-		foreach ($num as $values) {
-			foreach ($values as $age_value) {
-				fill_y_data(1, (int) ($age_value / 365.25), 1);
-				$total++;
-			}
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsAgeQuery(false, 'BIRT', 'BOTH', $zstart, $boundary);
-			foreach ($num as $values) {
-				foreach ($values as $age_value) {
-					fill_y_data($boundary, (int) ($age_value / 365.25), 1);
-					$total++;
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->statsAgeQuery(false, 'BIRT');
+        foreach ($num as $values) {
+            foreach ($values as $age_value) {
+                fill_y_data(0, (int) ($age_value / 365.25), 1);
+                $total++;
+            }
+        }
+    } elseif ($z_axis === 301) {
+        $num = $stats->statsAgeQuery(false, 'BIRT', 'M');
+        foreach ($num as $values) {
+            foreach ($values as $age_value) {
+                fill_y_data(0, (int) ($age_value / 365.25), 1);
+                $total++;
+            }
+        }
+        $num = $stats->statsAgeQuery(false, 'BIRT', 'F');
+        foreach ($num as $values) {
+            foreach ($values as $age_value) {
+                fill_y_data(1, (int) ($age_value / 365.25), 1);
+                $total++;
+            }
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsAgeQuery(false, 'BIRT', 'BOTH', $zstart, $boundary);
+            foreach ($num as $values) {
+                foreach ($values as $age_value) {
+                    fill_y_data($boundary, (int) ($age_value / 365.25), 1);
+                    $total++;
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -351,46 +351,46 @@ 
  * @return int
  */
 function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->statsAgeQuery(false, 'DEAT');
-		foreach ($num as $values) {
-			foreach ($values as $age_value) {
-				fill_y_data(0, (int) ($age_value / 365.25), 1);
-				$total++;
-			}
-		}
-	} elseif ($z_axis === 301) {
-		$num = $stats->statsAgeQuery(false, 'DEAT', 'M');
-		foreach ($num as $values) {
-			foreach ($values as $age_value) {
-				fill_y_data(0, (int) ($age_value / 365.25), 1);
-				$total++;
-			}
-		}
-		$num = $stats->statsAgeQuery(false, 'DEAT', 'F');
-		foreach ($num as $values) {
-			foreach ($values as $age_value) {
-				fill_y_data(1, (int) ($age_value / 365.25), 1);
-				$total++;
-			}
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsAgeQuery(false, 'DEAT', 'BOTH', $zstart, $boundary);
-			foreach ($num as $values) {
-				foreach ($values as $age_value) {
-					fill_y_data($boundary, (int) ($age_value / 365.25), 1);
-					$total++;
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->statsAgeQuery(false, 'DEAT');
+        foreach ($num as $values) {
+            foreach ($values as $age_value) {
+                fill_y_data(0, (int) ($age_value / 365.25), 1);
+                $total++;
+            }
+        }
+    } elseif ($z_axis === 301) {
+        $num = $stats->statsAgeQuery(false, 'DEAT', 'M');
+        foreach ($num as $values) {
+            foreach ($values as $age_value) {
+                fill_y_data(0, (int) ($age_value / 365.25), 1);
+                $total++;
+            }
+        }
+        $num = $stats->statsAgeQuery(false, 'DEAT', 'F');
+        foreach ($num as $values) {
+            foreach ($values as $age_value) {
+                fill_y_data(1, (int) ($age_value / 365.25), 1);
+                $total++;
+            }
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsAgeQuery(false, 'DEAT', 'BOTH', $zstart, $boundary);
+            foreach ($num as $values) {
+                foreach ($values as $age_value) {
+                    fill_y_data($boundary, (int) ($age_value / 365.25), 1);
+                    $total++;
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -403,48 +403,48 @@ 
  * @return int
  */
 function age_at_marriage($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->statsMarrAgeQuery(false, 'M');
-		foreach ($num as $values) {
-			fill_y_data(0, (int) ($values['age'] / 365.25), 1);
-			$total++;
-		}
-		$num = $stats->statsMarrAgeQuery(false, 'F');
-		foreach ($num as $values) {
-			fill_y_data(0, (int) ($values['age'] / 365.25), 1);
-			$total++;
-		}
-	} elseif ($z_axis === 301) {
-		$num = $stats->statsMarrAgeQuery(false, 'M');
-		foreach ($num as $values) {
-			fill_y_data(0, (int) ($values['age'] / 365.25), 1);
-			$total++;
-		}
-		$num = $stats->statsMarrAgeQuery(false, 'F');
-		foreach ($num as $values) {
-			fill_y_data(1, (int) ($values['age'] / 365.25), 1);
-			$total++;
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsMarrAgeQuery(false, 'M', $zstart, $boundary);
-			foreach ($num as $values) {
-				fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
-				$total++;
-			}
-			$num = $stats->statsMarrAgeQuery(false, 'F', $zstart, $boundary);
-			foreach ($num as $values) {
-				fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
-				$total++;
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->statsMarrAgeQuery(false, 'M');
+        foreach ($num as $values) {
+            fill_y_data(0, (int) ($values['age'] / 365.25), 1);
+            $total++;
+        }
+        $num = $stats->statsMarrAgeQuery(false, 'F');
+        foreach ($num as $values) {
+            fill_y_data(0, (int) ($values['age'] / 365.25), 1);
+            $total++;
+        }
+    } elseif ($z_axis === 301) {
+        $num = $stats->statsMarrAgeQuery(false, 'M');
+        foreach ($num as $values) {
+            fill_y_data(0, (int) ($values['age'] / 365.25), 1);
+            $total++;
+        }
+        $num = $stats->statsMarrAgeQuery(false, 'F');
+        foreach ($num as $values) {
+            fill_y_data(1, (int) ($values['age'] / 365.25), 1);
+            $total++;
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsMarrAgeQuery(false, 'M', $zstart, $boundary);
+            foreach ($num as $values) {
+                fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
+                $total++;
+            }
+            $num = $stats->statsMarrAgeQuery(false, 'F', $zstart, $boundary);
+            foreach ($num as $values) {
+                fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
+                $total++;
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -457,71 +457,71 @@ 
  * @return int
  */
 function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num  = $stats->statsMarrAgeQuery(false, 'M');
-		$indi = array();
-		foreach ($num as $values) {
-			if (!in_array($values['d_gid'], $indi)) {
-				fill_y_data(0, (int) ($values['age'] / 365.25), 1);
-				$total++;
-				$indi[] = $values['d_gid'];
-			}
-		}
-		$num  = $stats->statsMarrAgeQuery(false, 'F');
-		$indi = array();
-		foreach ($num as $values) {
-			if (!in_array($values['d_gid'], $indi)) {
-				fill_y_data(0, (int) ($values['age'] / 365.25), 1);
-				$total++;
-				$indi[] = $values['d_gid'];
-			}
-		}
-	} elseif ($z_axis === 301) {
-		$num  = $stats->statsMarrAgeQuery(false, 'M');
-		$indi = array();
-		foreach ($num as $values) {
-			if (!in_array($values['d_gid'], $indi)) {
-				fill_y_data(0, (int) ($values['age'] / 365.25), 1);
-				$total++;
-				$indi[] = $values['d_gid'];
-			}
-		}
-		$num  = $stats->statsMarrAgeQuery(false, 'F');
-		$indi = array();
-		foreach ($num as $values) {
-			if (!in_array($values['d_gid'], $indi)) {
-				fill_y_data(1, (int) ($values['age'] / 365.25), 1);
-				$total++;
-				$indi[] = $values['d_gid'];
-			}
-		}
-	} else {
-		$zstart = 0;
-		$indi   = array();
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsMarrAgeQuery(false, 'M', $zstart, $boundary);
-			foreach ($num as $values) {
-				if (!in_array($values['d_gid'], $indi)) {
-					fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
-					$total++;
-					$indi[] = $values['d_gid'];
-				}
-			}
-			$num = $stats->statsMarrAgeQuery(false, 'F', $zstart, $boundary);
-			foreach ($num as $values) {
-				if (!in_array($values['d_gid'], $indi)) {
-					fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
-					$total++;
-					$indi[] = $values['d_gid'];
-				}
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num  = $stats->statsMarrAgeQuery(false, 'M');
+        $indi = array();
+        foreach ($num as $values) {
+            if (!in_array($values['d_gid'], $indi)) {
+                fill_y_data(0, (int) ($values['age'] / 365.25), 1);
+                $total++;
+                $indi[] = $values['d_gid'];
+            }
+        }
+        $num  = $stats->statsMarrAgeQuery(false, 'F');
+        $indi = array();
+        foreach ($num as $values) {
+            if (!in_array($values['d_gid'], $indi)) {
+                fill_y_data(0, (int) ($values['age'] / 365.25), 1);
+                $total++;
+                $indi[] = $values['d_gid'];
+            }
+        }
+    } elseif ($z_axis === 301) {
+        $num  = $stats->statsMarrAgeQuery(false, 'M');
+        $indi = array();
+        foreach ($num as $values) {
+            if (!in_array($values['d_gid'], $indi)) {
+                fill_y_data(0, (int) ($values['age'] / 365.25), 1);
+                $total++;
+                $indi[] = $values['d_gid'];
+            }
+        }
+        $num  = $stats->statsMarrAgeQuery(false, 'F');
+        $indi = array();
+        foreach ($num as $values) {
+            if (!in_array($values['d_gid'], $indi)) {
+                fill_y_data(1, (int) ($values['age'] / 365.25), 1);
+                $total++;
+                $indi[] = $values['d_gid'];
+            }
+        }
+    } else {
+        $zstart = 0;
+        $indi   = array();
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsMarrAgeQuery(false, 'M', $zstart, $boundary);
+            foreach ($num as $values) {
+                if (!in_array($values['d_gid'], $indi)) {
+                    fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
+                    $total++;
+                    $indi[] = $values['d_gid'];
+                }
+            }
+            $num = $stats->statsMarrAgeQuery(false, 'F', $zstart, $boundary);
+            foreach ($num as $values) {
+                if (!in_array($values['d_gid'], $indi)) {
+                    fill_y_data($boundary, (int) ($values['age'] / 365.25), 1);
+                    $total++;
+                    $indi[] = $values['d_gid'];
+                }
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -534,38 +534,38 @@ 
  * @return int
  */
 function number_of_children($z_axis, array $z_boundaries, Stats $stats) {
-	$total = 0;
+    $total = 0;
 
-	if ($z_axis === 300) {
-		$num = $stats->statsChildrenQuery(false);
-		foreach ($num as $values) {
-			fill_y_data(0, $values['f_numchil'], $values['total']);
-			$total += $values['f_numchil'] * $values['total'];
-		}
-	} elseif ($z_axis === 301) {
-		$num = $stats->statsChildrenQuery(false, 'M');
-		foreach ($num as $values) {
-			fill_y_data(0, $values['num'], $values['total']);
-			$total += $values['num'] * $values['total'];
-		}
-		$num = $stats->statsChildrenQuery(false, 'F');
-		foreach ($num as $values) {
-			fill_y_data(1, $values['num'], $values['total']);
-			$total += $values['num'] * $values['total'];
-		}
-	} else {
-		$zstart = 0;
-		foreach ($z_boundaries as $boundary) {
-			$num = $stats->statsChildrenQuery(false, 'BOTH', $zstart, $boundary);
-			foreach ($num as $values) {
-				fill_y_data($boundary, $values['f_numchil'], $values['total']);
-				$total += $values['f_numchil'] * $values['total'];
-			}
-			$zstart = $boundary + 1;
-		}
-	}
+    if ($z_axis === 300) {
+        $num = $stats->statsChildrenQuery(false);
+        foreach ($num as $values) {
+            fill_y_data(0, $values['f_numchil'], $values['total']);
+            $total += $values['f_numchil'] * $values['total'];
+        }
+    } elseif ($z_axis === 301) {
+        $num = $stats->statsChildrenQuery(false, 'M');
+        foreach ($num as $values) {
+            fill_y_data(0, $values['num'], $values['total']);
+            $total += $values['num'] * $values['total'];
+        }
+        $num = $stats->statsChildrenQuery(false, 'F');
+        foreach ($num as $values) {
+            fill_y_data(1, $values['num'], $values['total']);
+            $total += $values['num'] * $values['total'];
+        }
+    } else {
+        $zstart = 0;
+        foreach ($z_boundaries as $boundary) {
+            $num = $stats->statsChildrenQuery(false, 'BOTH', $zstart, $boundary);
+            foreach ($num as $values) {
+                fill_y_data($boundary, $values['f_numchil'], $values['total']);
+                $total += $values['f_numchil'] * $values['total'];
+            }
+            $zstart = $boundary + 1;
+        }
+    }
 
-	return $total;
+    return $total;
 }
 
 /**
@@ -576,30 +576,30 @@ 
  * @param int $val
  */
 function fill_y_data($z, $x, $val) {
-	global $ydata, $xmax, $x_boundaries, $zmax, $z_boundaries, $xgiven, $zgiven;
-	//-- calculate index $i out of given z value
-	//-- calculate index $j out of given x value
-	if ($xgiven) {
-		$j = $x;
-	} else {
-		$j = 0;
-		while (($x > $x_boundaries[$j]) && ($j < $xmax)) {
-			$j++;
-		}
-	}
-	if ($zgiven) {
-		$i = $z;
-	} else {
-		$i = 0;
-		while (($z > $z_boundaries[$i]) && ($i < $zmax)) {
-			$i++;
-		}
-	}
-	if (isset($ydata[$i][$j])) {
-		$ydata[$i][$j] += $val;
-	} else {
-		$ydata[$i][$j] = $val;
-	}
+    global $ydata, $xmax, $x_boundaries, $zmax, $z_boundaries, $xgiven, $zgiven;
+    //-- calculate index $i out of given z value
+    //-- calculate index $j out of given x value
+    if ($xgiven) {
+        $j = $x;
+    } else {
+        $j = 0;
+        while (($x > $x_boundaries[$j]) && ($j < $xmax)) {
+            $j++;
+        }
+    }
+    if ($zgiven) {
+        $i = $z;
+    } else {
+        $i = 0;
+        while (($z > $z_boundaries[$i]) && ($i < $zmax)) {
+            $i++;
+        }
+    }
+    if (isset($ydata[$i][$j])) {
+        $ydata[$i][$j] += $val;
+    } else {
+        $ydata[$i][$j] = $val;
+    }
 }
 
 /**
@@ -613,138 +613,138 @@ 
  * @param string[]    $legend
  */
 function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend) {
-	global $percentage, $male_female, $ymax, $scalefactor, $datastring, $imgurl;
+    global $percentage, $male_female, $ymax, $scalefactor, $datastring, $imgurl;
 
-	// Google Chart API only allows text encoding for numbers less than 100
-	// and it does not allow adjusting the y-axis range, so we must find the maximum y-value
-	// in order to adjust beforehand by changing the numbers
+    // Google Chart API only allows text encoding for numbers less than 100
+    // and it does not allow adjusting the y-axis range, so we must find the maximum y-value
+    // in order to adjust beforehand by changing the numbers
 
-	if ($male_female) {
-		$stop = 2;
-	} else {
-		$stop = count($ydata);
-	}
-	if ($percentage) {
-		$ypercentmax = 0;
-		$yt          = array();
-		for ($i = 0; $i < $stop; $i++) {
-			if (isset($ydata[$i])) {
-				$ymax   = max($ydata[$i]);
-				$yt[$i] = array_sum($ydata[$i]);
-				if ($yt[$i] > 0) {
-					$ypercent    = round($ymax / $yt[$i] * 100, 1);
-					$ypercentmax = max($ypercentmax, $ypercent);
-				}
-			}
-		}
-		$ymax = $ypercentmax;
-		if ($ymax > 0) {
-			$scalefactor = 100.0 / $ymax;
-		} else {
-			$scalefactor = 0;
-		}
-		$datastring = 'chd=t:';
-		for ($i = 0; $i < $stop; $i++) {
-			if (isset($ydata[$i])) {
-				foreach ($ydata[$i] as $j => $data) {
-					if ($j > 0) {
-						$datastring .= ',';
-					}
-					if ($yt[$i] > 0) {
-						$datastring .= round($data / $yt[$i] * 100 * $scalefactor, 1);
-					} else {
-						$datastring .= '0';
-					}
-				}
-				if ($i !== $stop - 1) {
-					$datastring .= '|';
-				}
-			}
-		}
-	} else {
-		for ($i = 0; $i < $stop; $i++) {
-			$ymax = max($ymax, max($ydata[$i]));
-		}
-		if ($ymax > 0) {
-			$scalefactor = 100.0 / $ymax;
-		} else {
-			$scalefactor = 0;
-		}
-		$datastring = 'chd=t:';
-		for ($i = 0; $i < $stop; $i++) {
-			foreach ($ydata[$i] as $j => $data) {
-				if ($j > 0) {
-					$datastring .= ',';
-				}
-				$datastring .= round($data * $scalefactor, 1);
-			}
-			if ($i !== $stop - 1) {
-				$datastring .= '|';
-			}
-		}
-	}
-	$colors      = array('0000FF', 'FFA0CB', '9F00FF', 'FF7000', '905030', 'FF0000', '00FF00', 'F0F000');
-	$colorstring = 'chco=';
-	for ($i = 0; $i < $stop; $i++) {
-		if (isset($colors[$i])) {
-			$colorstring .= $colors[$i];
-			if ($i !== ($stop - 1)) {
-				$colorstring .= ',';
-			}
-		}
-	}
+    if ($male_female) {
+        $stop = 2;
+    } else {
+        $stop = count($ydata);
+    }
+    if ($percentage) {
+        $ypercentmax = 0;
+        $yt          = array();
+        for ($i = 0; $i < $stop; $i++) {
+            if (isset($ydata[$i])) {
+                $ymax   = max($ydata[$i]);
+                $yt[$i] = array_sum($ydata[$i]);
+                if ($yt[$i] > 0) {
+                    $ypercent    = round($ymax / $yt[$i] * 100, 1);
+                    $ypercentmax = max($ypercentmax, $ypercent);
+                }
+            }
+        }
+        $ymax = $ypercentmax;
+        if ($ymax > 0) {
+            $scalefactor = 100.0 / $ymax;
+        } else {
+            $scalefactor = 0;
+        }
+        $datastring = 'chd=t:';
+        for ($i = 0; $i < $stop; $i++) {
+            if (isset($ydata[$i])) {
+                foreach ($ydata[$i] as $j => $data) {
+                    if ($j > 0) {
+                        $datastring .= ',';
+                    }
+                    if ($yt[$i] > 0) {
+                        $datastring .= round($data / $yt[$i] * 100 * $scalefactor, 1);
+                    } else {
+                        $datastring .= '0';
+                    }
+                }
+                if ($i !== $stop - 1) {
+                    $datastring .= '|';
+                }
+            }
+        }
+    } else {
+        for ($i = 0; $i < $stop; $i++) {
+            $ymax = max($ymax, max($ydata[$i]));
+        }
+        if ($ymax > 0) {
+            $scalefactor = 100.0 / $ymax;
+        } else {
+            $scalefactor = 0;
+        }
+        $datastring = 'chd=t:';
+        for ($i = 0; $i < $stop; $i++) {
+            foreach ($ydata[$i] as $j => $data) {
+                if ($j > 0) {
+                    $datastring .= ',';
+                }
+                $datastring .= round($data * $scalefactor, 1);
+            }
+            if ($i !== $stop - 1) {
+                $datastring .= '|';
+            }
+        }
+    }
+    $colors      = array('0000FF', 'FFA0CB', '9F00FF', 'FF7000', '905030', 'FF0000', '00FF00', 'F0F000');
+    $colorstring = 'chco=';
+    for ($i = 0; $i < $stop; $i++) {
+        if (isset($colors[$i])) {
+            $colorstring .= $colors[$i];
+            if ($i !== ($stop - 1)) {
+                $colorstring .= ',';
+            }
+        }
+    }
 
-	$titleLength = strpos($mytitle . "\n", "\n");
-	$title       = substr($mytitle, 0, $titleLength);
+    $titleLength = strpos($mytitle . "\n", "\n");
+    $title       = substr($mytitle, 0, $titleLength);
 
-	$imgurl = 'https://chart.googleapis.com/chart?cht=bvg&amp;chs=950x300&amp;chf=bg,s,ffffff00|c,s,ffffff00&amp;chtt=' . rawurlencode($title) . '&amp;' . $datastring . '&amp;' . $colorstring . '&amp;chbh=';
-	if (count($ydata) > 3) {
-		$imgurl .= '5,1';
-	} elseif (count($ydata) < 2) {
-		$imgurl .= '45,1';
-	} else {
-		$imgurl .= '20,3';
-	}
-	$imgurl .= '&amp;chxt=x,x,y,y&amp;chxl=0:|';
-	foreach ($xdata as $data) {
-		$imgurl .= rawurlencode($data) . '|';
-	}
+    $imgurl = 'https://chart.googleapis.com/chart?cht=bvg&amp;chs=950x300&amp;chf=bg,s,ffffff00|c,s,ffffff00&amp;chtt=' . rawurlencode($title) . '&amp;' . $datastring . '&amp;' . $colorstring . '&amp;chbh=';
+    if (count($ydata) > 3) {
+        $imgurl .= '5,1';
+    } elseif (count($ydata) < 2) {
+        $imgurl .= '45,1';
+    } else {
+        $imgurl .= '20,3';
+    }
+    $imgurl .= '&amp;chxt=x,x,y,y&amp;chxl=0:|';
+    foreach ($xdata as $data) {
+        $imgurl .= rawurlencode($data) . '|';
+    }
 
-	$imgurl .= '1:||||' . rawurlencode($xtitle) . '|2:|';
-	$imgurl .= '0|';
-	if ($percentage) {
-		for ($i = 1; $i < 11; $i++) {
-			if ($ymax < 11) {
-				$imgurl .= round($ymax * $i / 10, 1) . '|';
-			} else {
-				$imgurl .= round($ymax * $i / 10, 0) . '|';
-			}
-		}
-		$imgurl .= '3:||%|';
-	} else {
-		if ($ymax < 11) {
-			for ($i = 1; $i < $ymax + 1; $i++) {
-				$imgurl .= round($ymax * $i / ($ymax), 0) . '|';
-			}
-		} else {
-			for ($i = 1; $i < 11; $i++) {
-				$imgurl .= round($ymax * $i / 10, 0) . '|';
-			}
-		}
-		$imgurl .= '3:||' . rawurlencode($ytitle) . '|';
-	}
-	// Only show legend if y-data is non-2-dimensional
-	if (count($ydata) > 1) {
-		$imgurl .= '&amp;chdl=';
-		foreach ($legend as $i => $data) {
-			if ($i > 0) {
-				$imgurl .= '|';
-			}
-			$imgurl .= rawurlencode($data);
-		}
-	}
-	$title = strstr($mytitle, '|', true);
-	echo '<img src="', $imgurl, '" width="950" height="300" alt="', Filter::escapeHtml($title), '" title="', Filter::escapeHtml($title), '">';
+    $imgurl .= '1:||||' . rawurlencode($xtitle) . '|2:|';
+    $imgurl .= '0|';
+    if ($percentage) {
+        for ($i = 1; $i < 11; $i++) {
+            if ($ymax < 11) {
+                $imgurl .= round($ymax * $i / 10, 1) . '|';
+            } else {
+                $imgurl .= round($ymax * $i / 10, 0) . '|';
+            }
+        }
+        $imgurl .= '3:||%|';
+    } else {
+        if ($ymax < 11) {
+            for ($i = 1; $i < $ymax + 1; $i++) {
+                $imgurl .= round($ymax * $i / ($ymax), 0) . '|';
+            }
+        } else {
+            for ($i = 1; $i < 11; $i++) {
+                $imgurl .= round($ymax * $i / 10, 0) . '|';
+            }
+        }
+        $imgurl .= '3:||' . rawurlencode($ytitle) . '|';
+    }
+    // Only show legend if y-data is non-2-dimensional
+    if (count($ydata) > 1) {
+        $imgurl .= '&amp;chdl=';
+        foreach ($legend as $i => $data) {
+            if ($i > 0) {
+                $imgurl .= '|';
+            }
+            $imgurl .= rawurlencode($data);
+        }
+    }
+    $title = strstr($mytitle, '|', true);
+    echo '<img src="', $imgurl, '" width="950" height="300" alt="', Filter::escapeHtml($title), '" title="', Filter::escapeHtml($title), '">';
 }
 
 /**
@@ -753,44 +753,44 @@ 
  * @param string $x_axis_boundaries
  */
 function calculate_axis($x_axis_boundaries) {
-	global $x_axis, $xdata, $xmax, $x_boundaries;
+    global $x_axis, $xdata, $xmax, $x_boundaries;
 
-	// Calculate xdata and zdata elements out of chart values
-	$hulpar = explode(',', $x_axis_boundaries);
-	$i      = 1;
-	if ($x_axis === 21 && $hulpar[0] == 1) {
-		$xdata[0] = 0;
-	} else {
-		$xdata[0] = format_range_of_numbers(0, $hulpar[0]);
-	}
-	$x_boundaries[0] = $hulpar[0] - 1;
-	while (isset($hulpar[$i])) {
-		$i1 = $i - 1;
-		if (($hulpar[$i] - $hulpar[$i1]) === 1) {
-			$xdata[$i]        = $hulpar[$i1];
-			$x_boundaries[$i] = $hulpar[$i1];
-		} elseif ($hulpar[$i1] === $hulpar[0]) {
-			$xdata[$i]        = format_range_of_numbers($hulpar[$i1], $hulpar[$i]);
-			$x_boundaries[$i] = $hulpar[$i];
-		} else {
-			$xdata[$i]        = format_range_of_numbers($hulpar[$i1] + 1, $hulpar[$i]);
-			$x_boundaries[$i] = $hulpar[$i];
-		}
-		$i++;
-	}
-	$xdata[$i]        = $hulpar[$i - 1];
-	$x_boundaries[$i] = $hulpar[$i - 1];
-	if ($hulpar[$i - 1] === $i) {
-		$xmax = $i + 1;
-	} else {
-		$xmax = $i;
-	}
-	$xdata[$xmax]        = /* I18N: Label on a graph; 40+ means 40 or more */ I18N::translate('%s+', I18N::number($hulpar[$i - 1]));
-	$x_boundaries[$xmax] = 10000;
-	$xmax                = $xmax + 1;
-	if ($xmax > 20) {
-		$xmax = 20;
-	}
+    // Calculate xdata and zdata elements out of chart values
+    $hulpar = explode(',', $x_axis_boundaries);
+    $i      = 1;
+    if ($x_axis === 21 && $hulpar[0] == 1) {
+        $xdata[0] = 0;
+    } else {
+        $xdata[0] = format_range_of_numbers(0, $hulpar[0]);
+    }
+    $x_boundaries[0] = $hulpar[0] - 1;
+    while (isset($hulpar[$i])) {
+        $i1 = $i - 1;
+        if (($hulpar[$i] - $hulpar[$i1]) === 1) {
+            $xdata[$i]        = $hulpar[$i1];
+            $x_boundaries[$i] = $hulpar[$i1];
+        } elseif ($hulpar[$i1] === $hulpar[0]) {
+            $xdata[$i]        = format_range_of_numbers($hulpar[$i1], $hulpar[$i]);
+            $x_boundaries[$i] = $hulpar[$i];
+        } else {
+            $xdata[$i]        = format_range_of_numbers($hulpar[$i1] + 1, $hulpar[$i]);
+            $x_boundaries[$i] = $hulpar[$i];
+        }
+        $i++;
+    }
+    $xdata[$i]        = $hulpar[$i - 1];
+    $x_boundaries[$i] = $hulpar[$i - 1];
+    if ($hulpar[$i - 1] === $i) {
+        $xmax = $i + 1;
+    } else {
+        $xmax = $i;
+    }
+    $xdata[$xmax]        = /* I18N: Label on a graph; 40+ means 40 or more */ I18N::translate('%s+', I18N::number($hulpar[$i - 1]));
+    $x_boundaries[$xmax] = 10000;
+    $xmax                = $xmax + 1;
+    if ($xmax > 20) {
+        $xmax = 20;
+    }
 }
 
 /**
@@ -802,11 +802,11 @@ 
  * @return string
  */
 function format_range_of_numbers($x, $y) {
-	return /* I18N: A range of numbers */ I18N::translate(
-		'%1$s–%2$s',
-		I18N::number($x),
-		I18N::number($y)
-	);
+    return /* I18N: A range of numbers */ I18N::translate(
+        '%1$s–%2$s',
+        I18N::number($x),
+        I18N::number($y)
+    );
 }
 
 /**
@@ -815,30 +815,30 @@ 
  * @param string $boundaries_z_axis
  */
 function calculate_legend($boundaries_z_axis) {
-	global $legend, $zmax, $z_boundaries;
+    global $legend, $zmax, $z_boundaries;
 
-	// calculate the legend values
-	$hulpar          = explode(',', $boundaries_z_axis);
-	$i               = 1;
-	$date            = new Date('BEF ' . $hulpar[0]);
-	$legend[0]       = strip_tags($date->display());
-	$z_boundaries[0] = $hulpar[0] - 1;
-	while (isset($hulpar[$i])) {
-		$i1               = $i - 1;
-		$date             = new Date('BET ' . $hulpar[$i1] . ' AND ' . ($hulpar[$i] - 1));
-		$legend[$i]       = strip_tags($date->display());
-		$z_boundaries[$i] = $hulpar[$i] - 1;
-		$i++;
-	}
-	$zmax                = $i;
-	$zmax1               = $zmax - 1;
-	$date                = new Date('AFT ' . $hulpar[$zmax1]);
-	$legend[$zmax]       = strip_tags($date->display());
-	$z_boundaries[$zmax] = 10000;
-	$zmax                = $zmax + 1;
-	if ($zmax > 8) {
-		$zmax = 8;
-	}
+    // calculate the legend values
+    $hulpar          = explode(',', $boundaries_z_axis);
+    $i               = 1;
+    $date            = new Date('BEF ' . $hulpar[0]);
+    $legend[0]       = strip_tags($date->display());
+    $z_boundaries[0] = $hulpar[0] - 1;
+    while (isset($hulpar[$i])) {
+        $i1               = $i - 1;
+        $date             = new Date('BET ' . $hulpar[$i1] . ' AND ' . ($hulpar[$i] - 1));
+        $legend[$i]       = strip_tags($date->display());
+        $z_boundaries[$i] = $hulpar[$i] - 1;
+        $i++;
+    }
+    $zmax                = $i;
+    $zmax1               = $zmax - 1;
+    $date                = new Date('AFT ' . $hulpar[$zmax1]);
+    $legend[$zmax]       = strip_tags($date->display());
+    $z_boundaries[$zmax] = 10000;
+    $zmax                = $zmax + 1;
+    if ($zmax > 8) {
+        $zmax = 8;
+    }
 }
 
 global $legend, $xdata, $ydata, $xmax, $zmax, $z_boundaries, $xgiven, $zgiven, $percentage, $male_female;
@@ -853,527 +853,527 @@ 
 
 switch ($x_axis) {
 case '1':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), Filter::get('chart_type'), Filter::get('SURN')));
-	break;
+    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;
+    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;
+    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;
+    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) {
-		$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;
+    $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) {
+        $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);
-	}
-	$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;
-		}
-	}
-	$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;
+    $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;
+        }
+    }
+    $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);
-	}
+    $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) {
-		$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;
+    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) {
+        $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);
-	}
-	$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;
-		}
-	}
-	$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;
+    $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;
+        }
+    }
+    $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);
-	}
+    $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;
-		}
-	}
-	$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;
+    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;
+        }
+    }
+    $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;
-		}
-	}
-	$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;
+    $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;
+        }
+    }
+    $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;
-		}
-	}
-	$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;
+    $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;
+        }
+    }
+    $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;
-		}
-	}
-	$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;
+    $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;
+        }
+    }
+    $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;
-		$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;
+    $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;
+        $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;
+    $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 '<i class="icon-loading-large"></i>';
+    break;
 }
 echo '</div>';

Switch Indentation +521 added lines, -521 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) {
-		$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);
-	}
-	$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;
-		}
-	}
-	$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);
-	}
+    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) {
+		    $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);
+	    }
+	    $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;
+		    }
+	    }
+	    $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) {
-		$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);
-	}
-	$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;
-		}
-	}
-	$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 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;
+		    }
+	    }
+	    $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;
+		    }
+	    }
+	    $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;
-		}
-	}
-	$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;
-		}
-	}
-	$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;
-		}
-	}
-	$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;
-		}
-	}
-	$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;
-		$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;
+	    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;
+		    }
+	    }
+	    $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;
+		    }
+	    }
+	    $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;
+		    }
+	    }
+	    $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;
+		    }
+	    }
+	    $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;
+		    $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>';

Braces +30 added lines, -15 removed lines

@@ -36,7 +36,8 @@ 
  *
  * @return int
  */
-function month_of_birth($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -92,7 +93,8 @@ 
  *
  * @return int
  */
-function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -148,7 +150,8 @@ 
  *
  * @return int
  */
-function month_of_death($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_death($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -204,7 +207,8 @@ 
  *
  * @return int
  */
-function month_of_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -245,7 +249,8 @@ 
  *
  * @return int
  */
-function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -298,7 +303,8 @@ 
  *
  * @return int
  */
-function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -350,7 +356,8 @@ 
  *
  * @return int
  */
-function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -402,7 +409,8 @@ 
  *
  * @return int
  */
-function age_at_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -456,7 +464,8 @@ 
  *
  * @return int
  */
-function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -533,7 +542,8 @@ 
  *
  * @return int
  */
-function number_of_children($z_axis, array $z_boundaries, Stats $stats) {
+function number_of_children($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -575,7 +585,8 @@ 
  * @param int $x
  * @param int $val
  */
-function fill_y_data($z, $x, $val) {
+function fill_y_data($z, $x, $val)
+{
 	global $ydata, $xmax, $x_boundaries, $zmax, $z_boundaries, $xgiven, $zgiven;
 	//-- calculate index $i out of given z value
 	//-- calculate index $j out of given x value
@@ -612,7 +623,8 @@ 
  * @param string      $ytitle
  * @param string[]    $legend
  */
-function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend) {
+function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend)
+{
 	global $percentage, $male_female, $ymax, $scalefactor, $datastring, $imgurl;
 
 	// Google Chart API only allows text encoding for numbers less than 100
@@ -752,7 +764,8 @@ 
  *
  * @param string $x_axis_boundaries
  */
-function calculate_axis($x_axis_boundaries) {
+function calculate_axis($x_axis_boundaries)
+{
 	global $x_axis, $xdata, $xmax, $x_boundaries;
 
 	// Calculate xdata and zdata elements out of chart values
@@ -801,7 +814,8 @@ 
  *
  * @return string
  */
-function format_range_of_numbers($x, $y) {
+function format_range_of_numbers($x, $y)
+{
 	return /* I18N: A range of numbers */ I18N::translate(
 		'%1$s–%2$s',
 		I18N::number($x),
@@ -814,7 +828,8 @@ 
  *
  * @param string $boundaries_z_axis
  */
-function calculate_legend($boundaries_z_axis) {
+function calculate_legend($boundaries_z_axis)
+{
 	global $legend, $zmax, $z_boundaries;
 
 	// calculate the legend values

admin_trees_check.php

Indentation +131 added lines, -131 removed lines

@@ -29,92 +29,92 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Check for errors') . ' — ' . $WT_TREE->getTitleHtml())
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Check for errors') . ' — ' . $WT_TREE->getTitleHtml())
+    ->pageHeader();
 
 // We need to work with raw GEDCOM data, as we are looking for errors
 // which may prevent the GedcomRecord objects from working.
 
 $rows = Database::prepare(
-	"SELECT i_id AS xref, 'INDI' AS type, i_gedcom AS gedrec FROM `##individuals` WHERE i_file=?" .
-	" UNION " .
-	"SELECT f_id AS xref, 'FAM'  AS type, f_gedcom AS gedrec FROM `##families`    WHERE f_file=?" .
-	" UNION " .
-	"SELECT s_id AS xref, 'SOUR' AS type, s_gedcom AS gedrec FROM `##sources`     WHERE s_file=?" .
-	" UNION " .
-	"SELECT m_id AS xref, 'OBJE' AS type, m_gedcom AS gedrec FROM `##media`       WHERE m_file=?" .
-	" UNION " .
-	"SELECT o_id AS xref, o_type AS type, o_gedcom AS gedrec FROM `##other`       WHERE o_file=? AND o_type NOT IN ('HEAD', 'TRLR')"
+    "SELECT i_id AS xref, 'INDI' AS type, i_gedcom AS gedrec FROM `##individuals` WHERE i_file=?" .
+    " UNION " .
+    "SELECT f_id AS xref, 'FAM'  AS type, f_gedcom AS gedrec FROM `##families`    WHERE f_file=?" .
+    " UNION " .
+    "SELECT s_id AS xref, 'SOUR' AS type, s_gedcom AS gedrec FROM `##sources`     WHERE s_file=?" .
+    " UNION " .
+    "SELECT m_id AS xref, 'OBJE' AS type, m_gedcom AS gedrec FROM `##media`       WHERE m_file=?" .
+    " UNION " .
+    "SELECT o_id AS xref, o_type AS type, o_gedcom AS gedrec FROM `##other`       WHERE o_file=? AND o_type NOT IN ('HEAD', 'TRLR')"
 )->execute(array($WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId()))->fetchAll();
 
 $records = array();
 foreach ($rows as $row) {
-	$records[$row->xref] = $row;
+    $records[$row->xref] = $row;
 }
 
 // Need to merge pending new/changed/deleted records
 
 $rows = Database::prepare(
-	"SELECT xref, SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING_INDEX(CASE WHEN old_gedcom='' THEN new_gedcom ELSE old_gedcom END, '\n', 1), ' ', 3), ' ', -1) AS type, new_gedcom AS gedrec" .
-	" FROM (" .
-	"  SELECT MAX(change_id) AS change_id" .
-	"  FROM `##change`" .
-	"  WHERE gedcom_id=? AND status='pending'" .
-	"  GROUP BY xref" .
-	" ) AS t1" .
-	" JOIN `##change` t2 USING (change_id)"
+    "SELECT xref, SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING_INDEX(CASE WHEN old_gedcom='' THEN new_gedcom ELSE old_gedcom END, '\n', 1), ' ', 3), ' ', -1) AS type, new_gedcom AS gedrec" .
+    " FROM (" .
+    "  SELECT MAX(change_id) AS change_id" .
+    "  FROM `##change`" .
+    "  WHERE gedcom_id=? AND status='pending'" .
+    "  GROUP BY xref" .
+    " ) AS t1" .
+    " JOIN `##change` t2 USING (change_id)"
 )->execute(array($WT_TREE->getTreeId()))->fetchAll();
 
 foreach ($rows as $row) {
-	if ($row->gedrec) {
-		// new/updated record
-		$records[$row->xref] = $row;
-	} else {
-		// deleted record
-		unset($records[$row->xref]);
-	}
+    if ($row->gedrec) {
+        // new/updated record
+        $records[$row->xref] = $row;
+    } else {
+        // deleted record
+        unset($records[$row->xref]);
+    }
 }
 
 // Keep a list of upper case XREFs, to detect mismatches.
 $ukeys = array();
 foreach (array_keys($records) as $key) {
-	$ukeys[strtoupper($key)] = $key;
+    $ukeys[strtoupper($key)] = $key;
 }
 
 // LOOK FOR BROKEN LINKS
 $XREF_LINKS = array(
-	'NOTE'          => 'NOTE',
-	'SOUR'          => 'SOUR',
-	'REPO'          => 'REPO',
-	'OBJE'          => 'OBJE',
-	'SUBM'          => 'SUBM',
-	'FAMC'          => 'FAM',
-	'FAMS'          => 'FAM',
-	//'ADOP'=>'FAM', // Need to handle this case specially. We may have both ADOP and FAMC links to the same FAM, but only store one.
-	'HUSB'          => 'INDI',
-	'WIFE'          => 'INDI',
-	'CHIL'          => 'INDI',
-	'ASSO'          => 'INDI',
-	'_ASSO'         => 'INDI', // A webtrees extension
-	'ALIA'          => 'INDI',
-	'AUTH'          => 'INDI', // A webtrees extension
-	'ANCI'          => 'SUBM',
-	'DESI'          => 'SUBM',
-	'_WT_OBJE_SORT' => 'OBJE',
-	'_LOC'          => '_LOC',
+    'NOTE'          => 'NOTE',
+    'SOUR'          => 'SOUR',
+    'REPO'          => 'REPO',
+    'OBJE'          => 'OBJE',
+    'SUBM'          => 'SUBM',
+    'FAMC'          => 'FAM',
+    'FAMS'          => 'FAM',
+    //'ADOP'=>'FAM', // Need to handle this case specially. We may have both ADOP and FAMC links to the same FAM, but only store one.
+    'HUSB'          => 'INDI',
+    'WIFE'          => 'INDI',
+    'CHIL'          => 'INDI',
+    'ASSO'          => 'INDI',
+    '_ASSO'         => 'INDI', // A webtrees extension
+    'ALIA'          => 'INDI',
+    'AUTH'          => 'INDI', // A webtrees extension
+    'ANCI'          => 'SUBM',
+    'DESI'          => 'SUBM',
+    '_WT_OBJE_SORT' => 'OBJE',
+    '_LOC'          => '_LOC',
 );
 
 $RECORD_LINKS = array(
-	'INDI' => array('NOTE', 'OBJE', 'SOUR', 'SUBM', 'ASSO', '_ASSO', 'FAMC', 'FAMS', 'ALIA', '_WT_OBJE_SORT', '_LOC'),
-	'FAM'  => array('NOTE', 'OBJE', 'SOUR', 'SUBM', 'ASSO', '_ASSO', 'HUSB', 'WIFE', 'CHIL', '_LOC'),
-	'SOUR' => array('NOTE', 'OBJE', 'REPO', 'AUTH'),
-	'REPO' => array('NOTE'),
-	'OBJE' => array('NOTE'), // The spec also allows SOUR, but we treat this as a warning
-	'NOTE' => array(), // The spec also allows SOUR, but we treat this as a warning
-	'SUBM' => array('NOTE', 'OBJE'),
-	'SUBN' => array('SUBM'),
-	'_LOC' => array('SOUR', 'OBJE', '_LOC'),
+    'INDI' => array('NOTE', 'OBJE', 'SOUR', 'SUBM', 'ASSO', '_ASSO', 'FAMC', 'FAMS', 'ALIA', '_WT_OBJE_SORT', '_LOC'),
+    'FAM'  => array('NOTE', 'OBJE', 'SOUR', 'SUBM', 'ASSO', '_ASSO', 'HUSB', 'WIFE', 'CHIL', '_LOC'),
+    'SOUR' => array('NOTE', 'OBJE', 'REPO', 'AUTH'),
+    'REPO' => array('NOTE'),
+    'OBJE' => array('NOTE'), // The spec also allows SOUR, but we treat this as a warning
+    'NOTE' => array(), // The spec also allows SOUR, but we treat this as a warning
+    'SUBM' => array('NOTE', 'OBJE'),
+    'SUBN' => array('SUBM'),
+    '_LOC' => array('SOUR', 'OBJE', '_LOC'),
 );
 
 $errors = false;
@@ -144,71 +144,71 @@ 
 $all_links   = array();
 $upper_links = array();
 foreach ($records as $record) {
-	$all_links[$record->xref]               = array();
-	$upper_links[strtoupper($record->xref)] = $record->xref;
-	preg_match_all('/\n\d (' . WT_REGEX_TAG . ') @([^#@\n][^\n@]*)@/', $record->gedrec, $matches, PREG_SET_ORDER);
-	foreach ($matches as $match) {
-		$all_links[$record->xref][$match[2]] = $match[1];
-	}
+    $all_links[$record->xref]               = array();
+    $upper_links[strtoupper($record->xref)] = $record->xref;
+    preg_match_all('/\n\d (' . WT_REGEX_TAG . ') @([^#@\n][^\n@]*)@/', $record->gedrec, $matches, PREG_SET_ORDER);
+    foreach ($matches as $match) {
+        $all_links[$record->xref][$match[2]] = $match[1];
+    }
 }
 
 foreach ($all_links as $xref1 => $links) {
-	$type1 = $records[$xref1]->type;
-	foreach ($links as $xref2 => $type2) {
-		$type3 = isset($records[$xref2]) ? $records[$xref2]->type : '';
-		if (!array_key_exists($xref2, $all_links)) {
-			if (array_key_exists(strtoupper($xref2), $upper_links)) {
-				echo warning(
-					link_message($type1, $xref1, $type2, $xref2) . ' ' .
-					/* I18N: placeholders are GEDCOM XREFs, such as R123 */
-					I18N::translate('%1$s does not exist. Did you mean %2$s?', format_link($xref2), format_link($upper_links[strtoupper($xref2)]))
-				);
-			} else {
-				echo error(
-					link_message(
-						$type1, $xref1, $type2, $xref2) . ' ' .
-					/* I18N: placeholders are GEDCOM XREFs, such as R123 */
-					I18N::translate('%1$s does not exist.', format_link($xref2))
-				);
-			}
-		} elseif ($type2 === 'SOUR' && $type1 === 'NOTE') {
-			// Notes are intended to add explanations and comments to other records. They should not have their own sources.
-		} elseif ($type2 === 'SOUR' && $type1 === 'OBJE') {
-			// Media objects are intended to illustrate other records, facts, and source/citations. They should not have their own sources.
-		} elseif ($type2 === 'OBJE' && $type1 === 'REPO') {
-			echo warning(
-				link_message($type1, $xref1, $type2, $xref2) . ' ' . I18N::translate('This type of link is not allowed here.')
-			);
-		} elseif (!array_key_exists($type1, $RECORD_LINKS) || !in_array($type2, $RECORD_LINKS[$type1]) || !array_key_exists($type2, $XREF_LINKS)) {
-			echo error(
-				link_message($type1, $xref1, $type2, $xref2) . ' ' .
-				I18N::translate('This type of link is not allowed here.')
-			);
-		} elseif ($XREF_LINKS[$type2] !== $type3) {
-			// Target XREF does exist - but is invalid
-			echo error(
-				link_message($type1, $xref1, $type2, $xref2) . ' ' .
-				/* I18N: %1$s is an internal ID number such as R123. %2$s and %3$s are record types, such as INDI or SOUR */
-				I18N::translate('%1$s is a %2$s but a %3$s is expected.', format_link($xref2), format_type($type3), format_type($type2))
-			);
-		} elseif (
-			$type2 === 'FAMC' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'CHIL') ||
-			$type2 === 'FAMS' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'HUSB' && $all_links[$xref2][$xref1] !== 'WIFE') ||
-			$type2 === 'CHIL' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'FAMC') ||
-			$type2 === 'HUSB' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'FAMS') ||
-			$type2 === 'WIFE' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'FAMS')
-		) {
-			echo error(
-				link_message($type1, $xref1, $type2, $xref2) . ' ' .
-				/* I18N: %1$s and %2$s are internal ID numbers such as R123 */
-				I18N::translate('%1$s does not have a link back to %2$s.', format_link($xref2), format_link($xref1))
-			);
-		}
-	}
+    $type1 = $records[$xref1]->type;
+    foreach ($links as $xref2 => $type2) {
+        $type3 = isset($records[$xref2]) ? $records[$xref2]->type : '';
+        if (!array_key_exists($xref2, $all_links)) {
+            if (array_key_exists(strtoupper($xref2), $upper_links)) {
+                echo warning(
+                    link_message($type1, $xref1, $type2, $xref2) . ' ' .
+                    /* I18N: placeholders are GEDCOM XREFs, such as R123 */
+                    I18N::translate('%1$s does not exist. Did you mean %2$s?', format_link($xref2), format_link($upper_links[strtoupper($xref2)]))
+                );
+            } else {
+                echo error(
+                    link_message(
+                        $type1, $xref1, $type2, $xref2) . ' ' .
+                    /* I18N: placeholders are GEDCOM XREFs, such as R123 */
+                    I18N::translate('%1$s does not exist.', format_link($xref2))
+                );
+            }
+        } elseif ($type2 === 'SOUR' && $type1 === 'NOTE') {
+            // Notes are intended to add explanations and comments to other records. They should not have their own sources.
+        } elseif ($type2 === 'SOUR' && $type1 === 'OBJE') {
+            // Media objects are intended to illustrate other records, facts, and source/citations. They should not have their own sources.
+        } elseif ($type2 === 'OBJE' && $type1 === 'REPO') {
+            echo warning(
+                link_message($type1, $xref1, $type2, $xref2) . ' ' . I18N::translate('This type of link is not allowed here.')
+            );
+        } elseif (!array_key_exists($type1, $RECORD_LINKS) || !in_array($type2, $RECORD_LINKS[$type1]) || !array_key_exists($type2, $XREF_LINKS)) {
+            echo error(
+                link_message($type1, $xref1, $type2, $xref2) . ' ' .
+                I18N::translate('This type of link is not allowed here.')
+            );
+        } elseif ($XREF_LINKS[$type2] !== $type3) {
+            // Target XREF does exist - but is invalid
+            echo error(
+                link_message($type1, $xref1, $type2, $xref2) . ' ' .
+                /* I18N: %1$s is an internal ID number such as R123. %2$s and %3$s are record types, such as INDI or SOUR */
+                I18N::translate('%1$s is a %2$s but a %3$s is expected.', format_link($xref2), format_type($type3), format_type($type2))
+            );
+        } elseif (
+            $type2 === 'FAMC' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'CHIL') ||
+            $type2 === 'FAMS' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'HUSB' && $all_links[$xref2][$xref1] !== 'WIFE') ||
+            $type2 === 'CHIL' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'FAMC') ||
+            $type2 === 'HUSB' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'FAMS') ||
+            $type2 === 'WIFE' && (!array_key_exists($xref1, $all_links[$xref2]) || $all_links[$xref2][$xref1] !== 'FAMS')
+        ) {
+            echo error(
+                link_message($type1, $xref1, $type2, $xref2) . ' ' .
+                /* I18N: %1$s and %2$s are internal ID numbers such as R123 */
+                I18N::translate('%1$s does not have a link back to %2$s.', format_link($xref2), format_link($xref1))
+            );
+        }
+    }
 }
 
 if (!$errors) {
-	echo '<li class="list-group-item">', I18N::translate('No errors have been found.'), '</li>';
+    echo '<li class="list-group-item">', I18N::translate('No errors have been found.'), '</li>';
 }
 
 echo '</ul>';
@@ -224,13 +224,13 @@ 
  * @return string
  */
 function link_message($type1, $xref1, $type2, $xref2) {
-	return /* I18N: The placeholders are GEDCOM XREFs and tags. e.g. “INDI I123 contains a FAMC link to F234.” */ I18N::translate(
-		'%1$s %2$s has a %3$s link to %4$s.',
-		format_type($type1),
-		format_link($xref1),
-		format_type($type2),
-		format_link($xref2)
-	);
+    return /* I18N: The placeholders are GEDCOM XREFs and tags. e.g. “INDI I123 contains a FAMC link to F234.” */ I18N::translate(
+        '%1$s %2$s has a %3$s link to %4$s.',
+        format_type($type1),
+        format_link($xref1),
+        format_type($type2),
+        format_link($xref2)
+    );
 }
 
 /**
@@ -241,7 +241,7 @@ 
  * @return string
  */
 function format_link($xref) {
-	return '<b><a href="gedrecord.php?pid=' . $xref . '">' . $xref . '</a></b>';
+    return '<b><a href="gedrecord.php?pid=' . $xref . '">' . $xref . '</a></b>';
 }
 
 /**
@@ -252,7 +252,7 @@ 
  * @return string
  */
 function format_type($type) {
-	return '<b title="' . strip_tags(GedcomTag::getLabel($type)) . '">' . $type . '</b>';
+    return '<b title="' . strip_tags(GedcomTag::getLabel($type)) . '">' . $type . '</b>';
 }
 
 /**
@@ -263,10 +263,10 @@ 
  * @return string
  */
 function error($message) {
-	global $errors;
-	$errors = true;
+    global $errors;
+    $errors = true;
 
-	return '<li class="list-group-item list-group-item-danger">' . $message . '</li>';
+    return '<li class="list-group-item list-group-item-danger">' . $message . '</li>';
 }
 
 /**
@@ -277,8 +277,8 @@ 
  * @return string
  */
 function warning($message) {
-	global $errors;
-	$errors = true;
+    global $errors;
+    $errors = true;
 
-	return '<li class="list-group-item list-group-item-warning">' . $message . '</li>';
+    return '<li class="list-group-item list-group-item-warning">' . $message . '</li>';
 }

Braces +10 added lines, -5 removed lines

@@ -223,7 +223,8 @@ 
  *
  * @return string
  */
-function link_message($type1, $xref1, $type2, $xref2) {
+function link_message($type1, $xref1, $type2, $xref2)
+{
 	return /* I18N: The placeholders are GEDCOM XREFs and tags. e.g. “INDI I123 contains a FAMC link to F234.” */ I18N::translate(
 		'%1$s %2$s has a %3$s link to %4$s.',
 		format_type($type1),
@@ -240,7 +241,8 @@ 
  *
  * @return string
  */
-function format_link($xref) {
+function format_link($xref)
+{
 	return '<b><a href="gedrecord.php?pid=' . $xref . '">' . $xref . '</a></b>';
 }
 
@@ -251,7 +253,8 @@ 
  *
  * @return string
  */
-function format_type($type) {
+function format_type($type)
+{
 	return '<b title="' . strip_tags(GedcomTag::getLabel($type)) . '">' . $type . '</b>';
 }
 
@@ -262,7 +265,8 @@ 
  *
  * @return string
  */
-function error($message) {
+function error($message)
+{
 	global $errors;
 	$errors = true;
 
@@ -276,7 +280,8 @@ 
  *
  * @return string
  */
-function warning($message) {
+function warning($message)
+{
 	global $errors;
 	$errors = true;
 

admin_trees_manage.php

Indentation +166 added lines, -166 removed lines

@@ -30,9 +30,9 @@ 
 
 $controller = new PageController;
 $controller
-	->addExternalJavascript(WT_ADMIN_JS_URL)
-	->restrictAccess(Auth::isAdmin() || Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Manage family trees'));
+    ->addExternalJavascript(WT_ADMIN_JS_URL)
+    ->restrictAccess(Auth::isAdmin() || Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Manage family trees'));
 
 // Show a reduced page when there are more than a certain number of trees
 $multiple_tree_threshold = Site::getPreference('MULTIPLE_TREE_THRESHOLD') ?: 500;
@@ -40,126 +40,126 @@ 
 // Note that glob() returns false instead of an empty array when open_basedir_restriction
 // is in force and no files are found. See PHP bug #47358.
 if (defined('GLOB_BRACE')) {
-	$gedcom_files = glob(WT_DATA_DIR . '*.{ged,Ged,GED}', GLOB_NOSORT | GLOB_BRACE) ?: array();
+    $gedcom_files = glob(WT_DATA_DIR . '*.{ged,Ged,GED}', GLOB_NOSORT | GLOB_BRACE) ?: array();
 } else {
-	$gedcom_files = array_merge(
-		glob(WT_DATA_DIR . '*.ged', GLOB_NOSORT) ?: array(),
-		glob(WT_DATA_DIR . '*.Ged', GLOB_NOSORT) ?: array(),
-		glob(WT_DATA_DIR . '*.GED', GLOB_NOSORT) ?: array()
-	);
+    $gedcom_files = array_merge(
+        glob(WT_DATA_DIR . '*.ged', GLOB_NOSORT) ?: array(),
+        glob(WT_DATA_DIR . '*.Ged', GLOB_NOSORT) ?: array(),
+        glob(WT_DATA_DIR . '*.GED', GLOB_NOSORT) ?: array()
+    );
 }
 // Process POST actions
 switch (Filter::post('action')) {
 case 'delete':
-	$gedcom_id = Filter::postInteger('gedcom_id');
-	if (Filter::checkCsrf() && $gedcom_id) {
-		$tree = Tree::findById($gedcom_id);
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-		$tree->delete();
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    $gedcom_id = Filter::postInteger('gedcom_id');
+    if (Filter::checkCsrf() && $gedcom_id) {
+        $tree = Tree::findById($gedcom_id);
+        FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+        $tree->delete();
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 case 'setdefault':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    if (Filter::checkCsrf()) {
+        Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
+        FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+    return;
 case 'new_tree':
-	$basename   = basename(Filter::post('tree_name'));
-	$tree_title = Filter::post('tree_title');
-
-	if (Filter::checkCsrf() && $basename && $tree_title) {
-		if (Tree::findByName($basename)) {
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
-		} else {
-			Tree::create($basename, $tree_title);
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
-
-	return;
+    $basename   = basename(Filter::post('tree_name'));
+    $tree_title = Filter::post('tree_title');
+
+    if (Filter::checkCsrf() && $basename && $tree_title) {
+        if (Tree::findByName($basename)) {
+            FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
+        } else {
+            Tree::create($basename, $tree_title);
+            FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
+        }
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
+
+    return;
 case 'replace_upload':
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if (isset($_FILES['tree_name'])) {
-			if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
-				$tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
-			} else {
-				FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
-			}
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    $gedcom_id          = Filter::postInteger('gedcom_id');
+    $keep_media         = Filter::post('keep_media', '1', '0');
+    $GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+    $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+    $tree               = Tree::findById($gedcom_id);
+
+    if (Filter::checkCsrf() && $tree) {
+        $tree->setPreference('keep_media', $keep_media);
+        $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+        $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+        if (isset($_FILES['tree_name'])) {
+            if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
+                $tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
+            } else {
+                FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
+            }
+        } else {
+            FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
+        }
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 case 'replace_import':
-	$basename           = basename(Filter::post('tree_name'));
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if ($basename) {
-			$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    $basename           = basename(Filter::post('tree_name'));
+    $gedcom_id          = Filter::postInteger('gedcom_id');
+    $keep_media         = Filter::post('keep_media', '1', '0');
+    $GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+    $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+    $tree               = Tree::findById($gedcom_id);
+
+    if (Filter::checkCsrf() && $tree) {
+        $tree->setPreference('keep_media', $keep_media);
+        $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+        $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+        if ($basename) {
+            $tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
+        } else {
+            FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
+        }
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 
 case 'synchronize':
-	if (Filter::checkCsrf()) {
-		$basenames = array();
-
-		foreach ($gedcom_files as $gedcom_file) {
-			$filemtime   = filemtime($gedcom_file); // Only import files that have changed
-			$basename    = basename($gedcom_file);
-			$basenames[] = $basename;
-
-			$tree = Tree::findByName($basename);
-			if (!$tree) {
-				$tree = Tree::create($basename, $basename);
-			}
-			if ($tree->getPreference('filemtime') != $filemtime) {
-				$tree->importGedcomFile($gedcom_file, $basename);
-				$tree->setPreference('filemtime', $filemtime);
-				FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
-			}
-		}
-
-		foreach (Tree::getAll() as $tree) {
-			if (!in_array($tree->getName(), $basenames)) {
-				FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-				$tree->delete();
-			}
-		}
-
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    if (Filter::checkCsrf()) {
+        $basenames = array();
+
+        foreach ($gedcom_files as $gedcom_file) {
+            $filemtime   = filemtime($gedcom_file); // Only import files that have changed
+            $basename    = basename($gedcom_file);
+            $basenames[] = $basename;
+
+            $tree = Tree::findByName($basename);
+            if (!$tree) {
+                $tree = Tree::create($basename, $basename);
+            }
+            if ($tree->getPreference('filemtime') != $filemtime) {
+                $tree->importGedcomFile($gedcom_file, $basename);
+                $tree->setPreference('filemtime', $filemtime);
+                FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
+            }
+        }
+
+        foreach (Tree::getAll() as $tree) {
+            if (!in_array($tree->getName(), $basenames)) {
+                FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+                $tree->delete();
+            }
+        }
+
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 }
 
 $default_tree_title  = /* I18N: Default name for a new tree */ I18N::translate('My family tree');
@@ -167,18 +167,18 @@ 
 $default_tree_number = 1;
 $existing_trees      = Tree::getNameList();
 while (array_key_exists($default_tree_name . $default_tree_number, $existing_trees)) {
-	$default_tree_number++;
+    $default_tree_number++;
 }
 $default_tree_name .= $default_tree_number;
 
 // Process GET actions
 switch (Filter::get('action')) {
 case 'importform':
-	$controller
-		->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
-		->pageHeader();
+    $controller
+        ->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
+        ->pageHeader();
 
-	?>
+    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_trees_manage.php"><?php echo I18N::translate('Manage family trees'); ?></a></li>
@@ -188,13 +188,13 @@ 
 	<h1><?php echo $controller->getPageTitle(); ?></h1>
 	<?php
 
-	$tree = Tree::findById(Filter::getInteger('gedcom_id'));
-	// Check it exists
-	if (!$tree) {
-		break;
-	}
-	$gedcom_filename = $tree->getPreference('gedcom_filename')
-	?>
+    $tree = Tree::findById(Filter::getInteger('gedcom_id'));
+    // Check it exists
+    if (!$tree) {
+        break;
+    }
+    $gedcom_filename = $tree->getPreference('gedcom_filename')
+    ?>
 	<p>
 		<?php echo /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', $tree->getTitleHtml()); ?>
 	</p>
@@ -230,33 +230,33 @@ 
 								<?php echo WT_DATA_DIR; ?>
 							</span>
 							<?php
-							$d     = opendir(WT_DATA_DIR);
-							$files = array();
-							while (($f = readdir($d)) !== false) {
-								if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
-									$fp     = fopen(WT_DATA_DIR . $f, 'rb');
-									$header = fread($fp, 64);
-									fclose($fp);
-									if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
-										$files[] = $f;
-									}
-								}
-							}
-							echo '<select name="tree_name" class="form-control" id="import-server-file">';
-							echo '<option value=""></option>';
-							sort($files);
-							foreach ($files as $gedcom_file) {
-								echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
-								if ($gedcom_file === $gedcom_filename) {
-									echo ' selected';
-								}
-								echo'>', Filter::escapeHtml($gedcom_file), '</option>';
-							}
-							if (!$files) {
-								echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
-							}
-							echo '</select>';
-							?>
+                            $d     = opendir(WT_DATA_DIR);
+                            $files = array();
+                            while (($f = readdir($d)) !== false) {
+                                if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
+                                    $fp     = fopen(WT_DATA_DIR . $f, 'rb');
+                                    $header = fread($fp, 64);
+                                    fclose($fp);
+                                    if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
+                                        $files[] = $f;
+                                    }
+                                }
+                            }
+                            echo '<select name="tree_name" class="form-control" id="import-server-file">';
+                            echo '<option value=""></option>';
+                            sort($files);
+                            foreach ($files as $gedcom_file) {
+                                echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
+                                if ($gedcom_file === $gedcom_filename) {
+                                    echo ' selected';
+                                }
+                                echo'>', Filter::escapeHtml($gedcom_file), '</option>';
+                            }
+                            if (!$files) {
+                                echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
+                            }
+                            echo '</select>';
+                            ?>
 						</div>
 					</div>
 				</div>
@@ -313,11 +313,11 @@ 
 	</form>
 	<?php
 
-	return;
+    return;
 }
 
 if (!Tree::getAll()) {
-	FlashMessages::addMessage(I18N::translate('You need to create a family tree.'), 'info');
+    FlashMessages::addMessage(I18N::translate('You need to create a family tree.'), 'info');
 }
 
 $controller->pageHeader();
@@ -326,9 +326,9 @@ 
 // On sites with hundreds or thousands of trees, this page becomes very large.
 // Just show the current tree, the default tree, and unimported trees
 if (count($all_trees) >= $multiple_tree_threshold) {
-	$all_trees = array_filter($all_trees, function (Tree $x) use ($WT_TREE) {
-		return $x->getPreference('imported') === '0' || $WT_TREE->getTreeId() === $x->getTreeId() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM');
-	});
+    $all_trees = array_filter($all_trees, function (Tree $x) use ($WT_TREE) {
+        return $x->getPreference('imported') === '0' || $WT_TREE->getTreeId() === $x->getTreeId() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM');
+    });
 }
 
 // List the gedcoms available to this user
@@ -356,23 +356,23 @@ 
 			<div class="panel-body">
 				<?php
 
-		// The third row shows an optional progress bar and a list of maintenance options
-		$importing = Database::prepare(
-			"SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1"
-		)->execute(array($tree->getTreeId()))->fetchOne();
-		if ($importing) {
-				?>
+        // The third row shows an optional progress bar and a list of maintenance options
+        $importing = Database::prepare(
+            "SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1"
+        )->execute(array($tree->getTreeId()))->fetchOne();
+        if ($importing) {
+                ?>
 				<div id="import<?php echo $tree->getTreeId(); ?>" class="col-xs-12">
 					<div class="progress">
 						<?php echo I18N::translate('Calculating…'); ?>
 					</div>
 				</div>
 				<?php
-			$controller->addInlineJavascript(
-				'jQuery("#import' . $tree->getTreeId() . '").load("import.php?gedcom_id=' . $tree->getTreeId() . '");'
-			);
-		}
-				?>
+            $controller->addInlineJavascript(
+                'jQuery("#import' . $tree->getTreeId() . '").load("import.php?gedcom_id=' . $tree->getTreeId() . '");'
+            );
+        }
+                ?>
 				<div class="row<?php echo $importing ? ' hidden' : ''; ?>" id="actions<?php echo $tree->getTreeId(); ?>">
 					<div class="col-sm-6 col-md-3">
 						<h3>

Switch Indentation +153 added lines, -153 removed lines

@@ -50,116 +50,116 @@ 
 }
 // Process POST actions
 switch (Filter::post('action')) {
-case 'delete':
-	$gedcom_id = Filter::postInteger('gedcom_id');
-	if (Filter::checkCsrf() && $gedcom_id) {
-		$tree = Tree::findById($gedcom_id);
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-		$tree->delete();
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'setdefault':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'new_tree':
-	$basename   = basename(Filter::post('tree_name'));
-	$tree_title = Filter::post('tree_title');
-
-	if (Filter::checkCsrf() && $basename && $tree_title) {
-		if (Tree::findByName($basename)) {
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
-		} else {
-			Tree::create($basename, $tree_title);
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
-
-	return;
-case 'replace_upload':
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if (isset($_FILES['tree_name'])) {
-			if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
-				$tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
-			} else {
-				FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
-			}
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'replace_import':
-	$basename           = basename(Filter::post('tree_name'));
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if ($basename) {
-			$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-
-case 'synchronize':
-	if (Filter::checkCsrf()) {
-		$basenames = array();
-
-		foreach ($gedcom_files as $gedcom_file) {
-			$filemtime   = filemtime($gedcom_file); // Only import files that have changed
-			$basename    = basename($gedcom_file);
-			$basenames[] = $basename;
-
-			$tree = Tree::findByName($basename);
-			if (!$tree) {
-				$tree = Tree::create($basename, $basename);
-			}
-			if ($tree->getPreference('filemtime') != $filemtime) {
-				$tree->importGedcomFile($gedcom_file, $basename);
-				$tree->setPreference('filemtime', $filemtime);
-				FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
-			}
-		}
-
-		foreach (Tree::getAll() as $tree) {
-			if (!in_array($tree->getName(), $basenames)) {
-				FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-				$tree->delete();
-			}
-		}
-
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    case 'delete':
+	    $gedcom_id = Filter::postInteger('gedcom_id');
+	    if (Filter::checkCsrf() && $gedcom_id) {
+		    $tree = Tree::findById($gedcom_id);
+		    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+		    $tree->delete();
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+    case 'setdefault':
+	    if (Filter::checkCsrf()) {
+		    Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
+		    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+    case 'new_tree':
+	    $basename   = basename(Filter::post('tree_name'));
+	    $tree_title = Filter::post('tree_title');
+
+	    if (Filter::checkCsrf() && $basename && $tree_title) {
+		    if (Tree::findByName($basename)) {
+			    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
+		    } else {
+			    Tree::create($basename, $tree_title);
+			    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
+		    }
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
+
+	    return;
+    case 'replace_upload':
+	    $gedcom_id          = Filter::postInteger('gedcom_id');
+	    $keep_media         = Filter::post('keep_media', '1', '0');
+	    $GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+	    $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+	    $tree               = Tree::findById($gedcom_id);
+
+	    if (Filter::checkCsrf() && $tree) {
+		    $tree->setPreference('keep_media', $keep_media);
+		    $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+		    $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+		    if (isset($_FILES['tree_name'])) {
+			    if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
+				    $tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
+			    } else {
+				    FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
+			    }
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
+		    }
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+    case 'replace_import':
+	    $basename           = basename(Filter::post('tree_name'));
+	    $gedcom_id          = Filter::postInteger('gedcom_id');
+	    $keep_media         = Filter::post('keep_media', '1', '0');
+	    $GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+	    $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+	    $tree               = Tree::findById($gedcom_id);
+
+	    if (Filter::checkCsrf() && $tree) {
+		    $tree->setPreference('keep_media', $keep_media);
+		    $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+		    $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+		    if ($basename) {
+			    $tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
+		    }
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+
+    case 'synchronize':
+	    if (Filter::checkCsrf()) {
+		    $basenames = array();
+
+		    foreach ($gedcom_files as $gedcom_file) {
+			    $filemtime   = filemtime($gedcom_file); // Only import files that have changed
+			    $basename    = basename($gedcom_file);
+			    $basenames[] = $basename;
+
+			    $tree = Tree::findByName($basename);
+			    if (!$tree) {
+				    $tree = Tree::create($basename, $basename);
+			    }
+			    if ($tree->getPreference('filemtime') != $filemtime) {
+				    $tree->importGedcomFile($gedcom_file, $basename);
+				    $tree->setPreference('filemtime', $filemtime);
+				    FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
+			    }
+		    }
+
+		    foreach (Tree::getAll() as $tree) {
+			    if (!in_array($tree->getName(), $basenames)) {
+				    FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+				    $tree->delete();
+			    }
+		    }
+
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
 }
 
 $default_tree_title  = /* I18N: Default name for a new tree */ I18N::translate('My family tree');
@@ -173,12 +173,12 @@ 
 
 // Process GET actions
 switch (Filter::get('action')) {
-case 'importform':
-	$controller
-		->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
-		->pageHeader();
+    case 'importform':
+	    $controller
+		    ->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
+		    ->pageHeader();
 
-	?>
+	    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_trees_manage.php"><?php echo I18N::translate('Manage family trees'); ?></a></li>
@@ -188,14 +188,14 @@ 
 	<h1><?php echo $controller->getPageTitle(); ?></h1>
 	<?php
 
-	$tree = Tree::findById(Filter::getInteger('gedcom_id'));
-	// Check it exists
-	if (!$tree) {
-		break;
-	}
-	$gedcom_filename = $tree->getPreference('gedcom_filename')
-	?>
-	<p>
+	    $tree = Tree::findById(Filter::getInteger('gedcom_id'));
+	    // Check it exists
+	    if (!$tree) {
+		    break;
+	    }
+	    $gedcom_filename = $tree->getPreference('gedcom_filename')
+	    ?>
+    	<p>
 		<?php echo /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', $tree->getTitleHtml()); ?>
 	</p>
 	<form class="form form-horizontal" name="gedcomimportform" method="post" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?php echo Filter::escapeHtml(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')); ?>');">
@@ -228,35 +228,35 @@ 
 						<div class="input-group">
 							<span class="input-group-addon">
 								<?php echo WT_DATA_DIR; ?>
-							</span>
+    							</span>
 							<?php
-							$d     = opendir(WT_DATA_DIR);
-							$files = array();
-							while (($f = readdir($d)) !== false) {
-								if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
-									$fp     = fopen(WT_DATA_DIR . $f, 'rb');
-									$header = fread($fp, 64);
-									fclose($fp);
-									if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
-										$files[] = $f;
-									}
-								}
-							}
-							echo '<select name="tree_name" class="form-control" id="import-server-file">';
-							echo '<option value=""></option>';
-							sort($files);
-							foreach ($files as $gedcom_file) {
-								echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
-								if ($gedcom_file === $gedcom_filename) {
-									echo ' selected';
-								}
-								echo'>', Filter::escapeHtml($gedcom_file), '</option>';
-							}
-							if (!$files) {
-								echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
-							}
-							echo '</select>';
-							?>
+							    $d     = opendir(WT_DATA_DIR);
+							    $files = array();
+							    while (($f = readdir($d)) !== false) {
+								    if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
+									    $fp     = fopen(WT_DATA_DIR . $f, 'rb');
+									    $header = fread($fp, 64);
+									    fclose($fp);
+									    if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
+										    $files[] = $f;
+									    }
+								    }
+							    }
+							    echo '<select name="tree_name" class="form-control" id="import-server-file">';
+							    echo '<option value=""></option>';
+							    sort($files);
+							    foreach ($files as $gedcom_file) {
+								    echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
+								    if ($gedcom_file === $gedcom_filename) {
+									    echo ' selected';
+								    }
+								    echo'>', Filter::escapeHtml($gedcom_file), '</option>';
+							    }
+							    if (!$files) {
+								    echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
+							    }
+							    echo '</select>';
+							    ?>
 						</div>
 					</div>
 				</div>
@@ -298,7 +298,7 @@ 
 					>
 				<p class="small text-muted">
 					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\Genealogy\Photos\John_Smith.jpeg” */ I18N::translate('Some genealogy software creates GEDCOM files that contain media filenames with full paths. These paths will not exist on the web-server. To allow webtrees to find the file, the first part of the path must be removed.'); ?>
-					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>'); ?>
+    					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>'); ?>
 				</p>
 			</div>
 		</fieldset>
@@ -313,7 +313,7 @@ 
 	</form>
 	<?php
 
-	return;
+	    return;
 }
 
 if (!Tree::getAll()) {

Braces +5 added lines, -2 removed lines

@@ -436,8 +436,11 @@
 									<i class="fa fa-li fa-star"></i>
 									<?php if ($tree->getName() == Site::getPreference('DEFAULT_GEDCOM')): ?>
 										<?php echo I18N::translate('Default family tree'); ?>
-									<?php else: ?>
-										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId(); ?>.submit();">
+									<?php else {
+    : ?>
+										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId();
+}
+?>.submit();">
 											<?php echo I18N::translate('Set as default'); ?>
 											<span class="sr-only">
 										<?php echo $tree->getTitleHtml(); ?>

gedrecord.php

Indentation +38 added lines, -38 removed lines

@@ -32,48 +32,48 @@ 
 
 $record = GedcomRecord::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
 if (
-	$record instanceof Individual ||
-	$record instanceof Family ||
-	$record instanceof Source ||
-	$record instanceof Repository ||
-	$record instanceof Note ||
-	$record instanceof Media
+    $record instanceof Individual ||
+    $record instanceof Family ||
+    $record instanceof Source ||
+    $record instanceof Repository ||
+    $record instanceof Note ||
+    $record instanceof Media
 ) {
-	header('Location: ' . WT_BASE_URL . $record->getRawUrl());
+    header('Location: ' . WT_BASE_URL . $record->getRawUrl());
 
-	return;
+    return;
 }
 $controller = new GedcomRecordController($record);
 
 if ($controller->record && $controller->record->canShow()) {
-	if ($controller->record->isPendingDeletion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This record has been deleted. You should review the deletion and then %1$s or %2$s it.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	} elseif ($controller->record->isPendingAddtion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This record has been edited. You should review the changes and then %1$s or %2$s them.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	}
-	$controller->pageHeader();
+    if ($controller->record->isPendingDeletion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This record has been deleted. You should review the deletion and then %1$s or %2$s it.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    } elseif ($controller->record->isPendingAddtion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This record has been edited. You should review the changes and then %1$s or %2$s them.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    }
+    $controller->pageHeader();
 } else {
-	FlashMessages::addMessage(I18N::translate('This record does not exist or you do not have permission to view it.'), 'danger');
-	http_response_code(404);
-	$controller->pageHeader();
+    FlashMessages::addMessage(I18N::translate('This record does not exist or you do not have permission to view it.'), 'danger');
+    http_response_code(404);
+    $controller->pageHeader();
 
-	return;
+    return;
 }
 
 $controller->addInlineJavascript('
@@ -141,10 +141,10 @@ 
 		<div id="record-edit">
 			<table class="facts_table">
 				<?php
-				foreach ($facts as $fact) {
-					FunctionsPrintFacts::printFact($fact, $controller->record);
-				}
-				?>
+                foreach ($facts as $fact) {
+                    FunctionsPrintFacts::printFact($fact, $controller->record);
+                }
+                ?>
 			</table>
 		</div>
 

sourcelist.php

Indentation +2 added lines, -2 removed lines

@@ -34,6 +34,6 @@
 $controller->pageHeader();
 
 echo '<div id="sourcelist-page">',
-	'<h2>', I18N::translate('Sources'), '</h2>';
-	echo FunctionsPrintLists::sourceTable(FunctionsDb::getSourceList($WT_TREE));
+    '<h2>', I18N::translate('Sources'), '</h2>';
+    echo FunctionsPrintLists::sourceTable(FunctionsDb::getSourceList($WT_TREE));
 echo '</div>';

repolist.php

Indentation +2 added lines, -2 removed lines

@@ -34,6 +34,6 @@
 $controller->pageHeader();
 
 echo '<div id="repolist-page">',
-	'<h2>', I18N::translate('Repositories'), '</h2>';
-	echo FunctionsPrintLists::repositoryTable(FunctionsDb::getRepositoryList($WT_TREE));
+    '<h2>', I18N::translate('Repositories'), '</h2>';
+    echo FunctionsPrintLists::repositoryTable(FunctionsDb::getRepositoryList($WT_TREE));
 echo '</div>';