PHP-CS-FIXER, PSR-2 (mostly!)

99 files changed, 941 insertions, 901 deletions

diff --git a/.gitattributes b/.gitattributes
index ee62d723e5..4fe0850a8c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,7 @@
 
 .gitattributes export-ignore
 .gitignore     export-ignore
+.php_cs        export-ignore
 .travis.yml    export-ignore
 Makefile       export-ignore
 build/         export-ignore
diff --git a/.php_cs b/.php_cs
new file mode 100644
index 0000000000..e5d2c94308
--- /dev/null
+++ b/.php_cs
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// This is a configuration file for php-cs-fixer
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+	->in(__DIR__)
+	->exclude('packages')
+	->exclude('vendor');
+
+return Symfony\CS\Config\Config::create()
+	->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+	->fixers([
+		// Exclude these PSR2 rules
+		'--indentation',
+		'--braces',
+	])
+	->finder($finder);
diff --git a/admin_media.php b/admin_media.php
index d58342aa6e..129175eaf7 100644
--- a/admin_media.php
+++ b/admin_media.php
@@ -259,7 +259,7 @@ case 'load_json':
 
 		// Filter unused files
 		if ($search) {
-			$unused_files = array_filter($unused_files, function($x) use ($search) { return strpos($x, $search) !== false; });
+			$unused_files = array_filter($unused_files, function ($x) use ($search) { return strpos($x, $search) !== false; });
 		}
 		$recordsFiltered = count($unused_files);
 
diff --git a/admin_site_info.php b/admin_site_info.php
index 663f813421..f1c4edd8db 100644
--- a/admin_site_info.php
+++ b/admin_site_info.php
@@ -26,7 +26,7 @@ $controller
 	->pageHeader();
 
 $variables = Database::prepare("SHOW VARIABLES")->fetchAssoc();
-array_walk($variables, function(&$x) { $x = str_replace(',', ', ', $x); });
+array_walk($variables, function (&$x) { $x = str_replace(',', ', ', $x); });
 
 ob_start();
 phpinfo(INFO_ALL & ~INFO_CREDITS & ~INFO_LICENSE);
diff --git a/admin_trees_config.php b/admin_trees_config.php
index 89cb756c7c..914c25bd3a 100644
--- a/admin_trees_config.php
+++ b/admin_trees_config.php
@@ -155,7 +155,7 @@ foreach ($resns as $resn) {
 		$resn->tag_label = '';
 	}
 }
-usort($resns, function(\stdClass $x, \stdClass $y) { return I18N::strcasecmp($x->tag_label, $y->tag_label); });
+usort($resns, function (\stdClass $x, \stdClass $y) { return I18N::strcasecmp($x->tag_label, $y->tag_label); });
 
 // We have two fields in one
 $CALENDAR_FORMATS = explode('_and_', $WT_TREE->getPreference('CALENDAR_FORMAT') . '_and_');
diff --git a/admin_trees_export.php b/admin_trees_export.php
index 5aa9b33407..3efb8e711a 100644
--- a/admin_trees_export.php
+++ b/admin_trees_export.php
@@ -49,4 +49,3 @@ if (Auth::isManager($WT_TREE) && Filter::checkCsrf()) {
 }
 
 header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php');
-
diff --git a/admin_trees_manage.php b/admin_trees_manage.php
index d22782ddb5..c5d14f802c 100644
--- a/admin_trees_manage.php
+++ b/admin_trees_manage.php
@@ -313,7 +313,7 @@ $all_trees = Tree::getAll();
 // 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($x) use ($WT_TREE) {
+	$all_trees = array_filter($all_trees, function ($x) use ($WT_TREE) {
 		return $x->getPreference('imported') === '0' || $WT_TREE->getTreeId() === $x->getTreeId() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM');
 	});
 }
diff --git a/admin_trees_places.php b/admin_trees_places.php
index 1ac4745d5b..395c0e048a 100644
--- a/admin_trees_places.php
+++ b/admin_trees_places.php
@@ -110,7 +110,7 @@ $controller
 <?php if ($search && $replace) { ?>
 	<?php if ($changes) { ?>
 	<p>
-		<?php echo ($confirm) ? I18N::translate('The following places have been changed:') : I18N::translate('The following places would be changed:'); ?>
+		<?php echo $confirm ? I18N::translate('The following places have been changed:') : I18N::translate('The following places would be changed:'); ?>
 	</p>
 	<ul>
 		<?php foreach ($changes as $old_place => $new_place) { ?>
diff --git a/app/Controller/AdvancedSearchController.php b/app/Controller/AdvancedSearchController.php
index c00d7fde2d..059a3fa7cd 100644
--- a/app/Controller/AdvancedSearchController.php
+++ b/app/Controller/AdvancedSearchController.php
@@ -20,10 +20,10 @@ namespace Fisharebest\Webtrees;
  * Class AdvancedSearchController - Controller for the advanced search page
  */
 class AdvancedSearchController extends SearchController {
-	var $fields = array();
-	var $values = array();
-	var $plusminus = array();
-	var $errors = array();
+	public $fields = array();
+	public $values = array();
+	public $plusminus = array();
+	public $errors = array();
 
 	/**
 	 * Startup activity
@@ -73,7 +73,7 @@ class AdvancedSearchController extends SearchController {
 	 *
 	 * @return string[]
 	 */
-	function getOtherFields() {
+	public function getOtherFields() {
 		global $WT_TREE;
 
 		$ofields = array(
@@ -163,7 +163,7 @@ class AdvancedSearchController extends SearchController {
 	 *
 	 * @return string
 	 */
-	function getValue($i) {
+	public function getValue($i) {
 		$val = '';
 		if (isset($this->values[$i])) {
 			$val = $this->values[$i];
@@ -176,7 +176,7 @@ class AdvancedSearchController extends SearchController {
 	 *
 	 * @return string
 	 */
-	function getField($i) {
+	public function getField($i) {
 		$val = '';
 		if (isset($this->fields[$i])) {
 			$val = htmlentities($this->fields[$i]);
@@ -190,7 +190,7 @@ class AdvancedSearchController extends SearchController {
 	 *
 	 * @return integer
 	 */
-	function getIndex($field) {
+	public function getIndex($field) {
 		return array_search($field, $this->fields);
 	}
 
@@ -199,14 +199,14 @@ class AdvancedSearchController extends SearchController {
 	 *
 	 * @return string
 	 */
-	function getLabel($tag) {
+	public function getLabel($tag) {
 		return GedcomTag::getLabel(preg_replace('/:(SDX|BEGINS|EXACT|CONTAINS)$/', '', $tag));
 	}
 
 	/**
 	 * Set the field order
 	 */
-	function reorderFields() {
+	private function reorderFields() {
 		$i = 0;
 		$newfields = array();
 		$newvalues = array();
@@ -240,7 +240,7 @@ class AdvancedSearchController extends SearchController {
 	 *
 	 * @return void
 	 */
-	function advancedSearch() {
+	private function advancedSearch() {
 		global $WT_TREE;
 
 		$this->myindilist = array();
@@ -629,7 +629,7 @@ class AdvancedSearchController extends SearchController {
 	}
 
 	/** {@inheritdoc} */
-	function printResults() {
+	public function printResults() {
 		if ($this->myindilist) {
 			uasort($this->myindilist, __NAMESPACE__ . '\GedcomRecord::compare');
 			echo format_indi_table($this->myindilist);
diff --git a/app/Controller/FamilyBookController.php b/app/Controller/FamilyBookController.php
index c577831432..5b59cafbf9 100644
--- a/app/Controller/FamilyBookController.php
+++ b/app/Controller/FamilyBookController.php
@@ -224,21 +224,21 @@ class FamilyBookController extends ChartController {
 					if ($genoffset == 3) {
 						if ($famcount == 3) {
 							$linefactor = $tblheight / 2;
-						} else if ($famcount > 3) {
+						} elseif ($famcount > 3) {
 							$linefactor = $tblheight;
 						}
 					}
 					if ($genoffset == 4) {
 						if ($famcount == 4) {
 							$linefactor = $tblheight;
-						} else if ($famcount > 4) {
+						} elseif ($famcount > 4) {
 							$linefactor = ($famcount - $genoffset) * ($tblheight * 1.5);
 						}
 					}
 					if ($genoffset == 5) {
 						if ($famcount == 5) {
 							$linefactor = 0;
-						} else if ($famcount > 5) {
+						} elseif ($famcount > 5) {
 							$linefactor = $tblheight * ($famcount - $genoffset);
 						}
 					}
diff --git a/app/Controller/FamilyController.php b/app/Controller/FamilyController.php
index c5ed8c4e4c..f5c4ea51ac 100644
--- a/app/Controller/FamilyController.php
+++ b/app/Controller/FamilyController.php
@@ -68,7 +68,7 @@ class FamilyController extends GedcomRecordController {
 	 *
 	 * @return string
 	 */
-	function getTimelineIndis($tags) {
+	public function getTimelineIndis($tags) {
 		preg_match_all('/\n1 (?:' . implode('|', $tags) . ') @(' . WT_REGEX_XREF . ')@/', $this->record->getGedcom(), $matches);
 		foreach ($matches[1] as &$match) {
 			$match = 'pids%5B%5D=' . $match;
@@ -79,7 +79,7 @@ class FamilyController extends GedcomRecordController {
 	/**
 	 * get edit menu
 	 */
-	function getEditMenu() {
+	public function getEditMenu() {
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}
diff --git a/app/Controller/HourglassController.php b/app/Controller/HourglassController.php
index f027e1047f..21ee3ded19 100644
--- a/app/Controller/HourglassController.php
+++ b/app/Controller/HourglassController.php
@@ -37,9 +37,6 @@ class HourglassController extends ChartController {
 	private $left_arrow;
 	private $right_arrow;
 
-	// The following is an ajax variable
-	var $ARID;
-
 	/** @var boolean Can the Javascript be loaded by the controller */
 	private $canLoadJS;
 
@@ -353,7 +350,7 @@ class HourglassController extends ChartController {
 						}
 
 						// filter out root person from children array so only siblings remain
-						$siblings = array_filter($family->getChildren(), function(Individual $item) use ($pid) {
+						$siblings = array_filter($family->getChildren(), function (Individual $item) use ($pid) {
 							return $item->getXref() != $pid;
 						});
 						$num = count($siblings);
@@ -414,7 +411,7 @@ class HourglassController extends ChartController {
 	 * setup all of the javascript that is needed for the hourglass chart
 	 *
 	 */
-	function setupJavascript() {
+	public function setupJavascript() {
 		$js = "
 			var WT_HOURGLASS_CHART = (function() {
 				function sizeLines() {
diff --git a/app/Controller/IndividualController.php b/app/Controller/IndividualController.php
index 9d21a714f3..99c3bda206 100644
--- a/app/Controller/IndividualController.php
+++ b/app/Controller/IndividualController.php
@@ -254,7 +254,7 @@ class IndividualController extends GedcomRecordController {
 	/**
 	 * get edit menu
 	 */
-	function getEditMenu() {
+	public function getEditMenu() {
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}
@@ -333,7 +333,7 @@ class IndividualController extends GedcomRecordController {
 	 *
 	 * @return string returns 'person_box', 'person_boxF', or 'person_boxNN'
 	 */
-	function getPersonStyle($person) {
+	public function getPersonStyle($person) {
 		switch ($person->getSex()) {
 		case 'M':
 			$class = 'person_box';
diff --git a/app/Controller/LifespanController.php b/app/Controller/LifespanController.php
index 628ad738cf..afca613a07 100644
--- a/app/Controller/LifespanController.php
+++ b/app/Controller/LifespanController.php
@@ -22,39 +22,36 @@ use Fisharebest\ExtCalendar\GregorianCalendar;
  * Class LifespanController - Controller for the timeline chart
  */
 class LifespanController extends PageController {
-	var $pids = array();
-	var $people = array();
-	var $place = '';
-	var $beginYear = 0;
-	var $endYear = 0;
-	var $scale = 2;
-	var $YrowLoc = 125;
-	var $minYear = 0;
+	private $pids = array();
+	public $people = array();
+	public $place = '';
+	public $beginYear = 0;
+	public $endYear = 0;
+	public $YrowLoc = 125;
 
 	// The following colours are deliberately omitted from the $colors list:
 	// Blue, Red, Black, White, Green
-	var $colors = array('Aliceblue', 'Antiquewhite', 'Aqua', 'Aquamarine', 'Azure', 'Beige', 'Bisque', 'Blanchedalmond', 'Blueviolet', 'Brown', 'Burlywood', 'Cadetblue', 'Chartreuse', 'Chocolate', 'Coral', 'Cornflowerblue', 'Cornsilk', 'Crimson', 'Cyan', 'Darkcyan', 'Darkgoldenrod', 'Darkgray', 'Darkgreen', 'Darkkhaki', 'Darkmagenta', 'Darkolivegreen', 'Darkorange', 'Darkorchid', 'Darkred', 'Darksalmon', 'Darkseagreen', 'Darkslateblue', 'Darkturquoise', 'Darkviolet', 'Deeppink', 'Deepskyblue', 'Dimgray', 'Dodgerblue', 'Firebrick', 'Floralwhite', 'Forestgreen', 'Fuchsia', 'Gainsboro', 'Ghostwhite', 'Gold', 'Goldenrod', 'Gray', 'Greenyellow', 'Honeydew', 'Hotpink', 'Indianred', 'Ivory', 'Khaki', 'Lavender', 'Lavenderblush', 'Lawngreen', 'Lemonchiffon', 'Lightblue', 'Lightcoral', 'Lightcyan', 'Lightgoldenrodyellow', 'Lightgreen', 'Lightgrey', 'Lightpink', 'Lightsalmon', 'Lightseagreen', 'Lightskyblue', 'Lightslategray', 'Lightsteelblue', 'Lightyellow', 'Lime', 'Limegreen', 'Linen', 'Magenta', 'Maroon', 'Mediumaqamarine', ' Mediumblue', 'Mediumorchid', 'Mediumpurple', 'Mediumseagreen', 'Mediumslateblue', 'Mediumspringgreen', 'Mediumturquoise', 'Mediumvioletred', 'Mintcream', 'Mistyrose', 'Moccasin', 'Navajowhite', 'Oldlace', 'Olive', 'Olivedrab', 'Orange', 'Orangered', 'Orchid', 'Palegoldenrod', 'Palegreen', 'Paleturquoise', 'Palevioletred', 'Papayawhip', 'Peachpuff', 'Peru', 'Pink', 'Plum', 'Powderblue', 'Purple', 'Rosybrown', 'Royalblue', 'Saddlebrown', 'Salmon', 'Sandybrown', 'Seagreen', 'Seashell', 'Sienna', 'Silver', 'Skyblue', 'Slateblue', 'Slategray', 'Snow', 'Springgreen', 'Steelblue', 'Tan', 'Teal', 'Thistle', 'Tomato', 'Turquoise', 'Violet', 'Wheat', 'Whitesmoke', 'Yellow', 'YellowGreen');
-	var $malecolorR = array(' 100', ' 110', ' 120', ' 130', ' 140', ' 150', ' 160', ' 170', ' 180', ' 190', ' 200', ' 210', ' 220', ' 230', ' 240', ' 250');
-	var $malecolorG = array(' 100', ' 110', ' 120', ' 130', ' 140', ' 150', ' 160', ' 170', ' 180', ' 190', ' 200', ' 210', ' 220', ' 230', ' 240', ' 250');
-	var $malecolorB = 255;
-	var $femalecolorR = 255;
-	var $femalecolorG = array(' 100', ' 110', ' 120', ' 130', ' 140', ' 150', ' 160', ' 170', ' 180', ' 190', ' 200', ' 210', ' 220', ' 230', ' 240', ' 250');
-	var $femalecolorB = array('250', ' 240', ' 230', ' 220', ' 210', ' 200', ' 190', ' 180', ' 170', ' 160', ' 150', ' 140', ' 130', ' 120', ' 110', ' 100');
-	var $color;
-	var $colorindex;
-	var $Fcolorindex;
-	var $Mcolorindex;
-	var $zoomfactor;
-	var $timelineMinYear;
-	var $timelineMaxYear;
-	var $birthMod;
-	var $deathMod;
-	var $endMod = 0;
-	var $modTest;
-	var $currentYear;
-	var $endDate;
-	var $startDate;
-	var $currentsex;
+	private $colors = array('Aliceblue', 'Antiquewhite', 'Aqua', 'Aquamarine', 'Azure', 'Beige', 'Bisque', 'Blanchedalmond', 'Blueviolet', 'Brown', 'Burlywood', 'Cadetblue', 'Chartreuse', 'Chocolate', 'Coral', 'Cornflowerblue', 'Cornsilk', 'Crimson', 'Cyan', 'Darkcyan', 'Darkgoldenrod', 'Darkgray', 'Darkgreen', 'Darkkhaki', 'Darkmagenta', 'Darkolivegreen', 'Darkorange', 'Darkorchid', 'Darkred', 'Darksalmon', 'Darkseagreen', 'Darkslateblue', 'Darkturquoise', 'Darkviolet', 'Deeppink', 'Deepskyblue', 'Dimgray', 'Dodgerblue', 'Firebrick', 'Floralwhite', 'Forestgreen', 'Fuchsia', 'Gainsboro', 'Ghostwhite', 'Gold', 'Goldenrod', 'Gray', 'Greenyellow', 'Honeydew', 'Hotpink', 'Indianred', 'Ivory', 'Khaki', 'Lavender', 'Lavenderblush', 'Lawngreen', 'Lemonchiffon', 'Lightblue', 'Lightcoral', 'Lightcyan', 'Lightgoldenrodyellow', 'Lightgreen', 'Lightgrey', 'Lightpink', 'Lightsalmon', 'Lightseagreen', 'Lightskyblue', 'Lightslategray', 'Lightsteelblue', 'Lightyellow', 'Lime', 'Limegreen', 'Linen', 'Magenta', 'Maroon', 'Mediumaqamarine', ' Mediumblue', 'Mediumorchid', 'Mediumpurple', 'Mediumseagreen', 'Mediumslateblue', 'Mediumspringgreen', 'Mediumturquoise', 'Mediumvioletred', 'Mintcream', 'Mistyrose', 'Moccasin', 'Navajowhite', 'Oldlace', 'Olive', 'Olivedrab', 'Orange', 'Orangered', 'Orchid', 'Palegoldenrod', 'Palegreen', 'Paleturquoise', 'Palevioletred', 'Papayawhip', 'Peachpuff', 'Peru', 'Pink', 'Plum', 'Powderblue', 'Purple', 'Rosybrown', 'Royalblue', 'Saddlebrown', 'Salmon', 'Sandybrown', 'Seagreen', 'Seashell', 'Sienna', 'Silver', 'Skyblue', 'Slateblue', 'Slategray', 'Snow', 'Springgreen', 'Steelblue', 'Tan', 'Teal', 'Thistle', 'Tomato', 'Turquoise', 'Violet', 'Wheat', 'Whitesmoke', 'Yellow', 'YellowGreen');
+	private $malecolorR = array(' 100', ' 110', ' 120', ' 130', ' 140', ' 150', ' 160', ' 170', ' 180', ' 190', ' 200', ' 210', ' 220', ' 230', ' 240', ' 250');
+	private $malecolorG = array(' 100', ' 110', ' 120', ' 130', ' 140', ' 150', ' 160', ' 170', ' 180', ' 190', ' 200', ' 210', ' 220', ' 230', ' 240', ' 250');
+	private $malecolorB = 255;
+	private $femalecolorR = 255;
+	private $femalecolorG = array(' 100', ' 110', ' 120', ' 130', ' 140', ' 150', ' 160', ' 170', ' 180', ' 190', ' 200', ' 210', ' 220', ' 230', ' 240', ' 250');
+	private $femalecolorB = array('250', ' 240', ' 230', ' 220', ' 210', ' 200', ' 190', ' 180', ' 170', ' 160', ' 150', ' 140', ' 130', ' 120', ' 110', ' 100');
+	private $color;
+	private $colorindex;
+	private $Fcolorindex;
+	private $Mcolorindex;
+	private $zoomfactor;
+	public $timelineMinYear;
+	public $timelineMaxYear;
+	private $birthMod;
+	private $deathMod;
+	private $endMod = 0;
+	private $modTest;
+	private $currentYear;
+	private $endDate;
+	private $currentsex;
 
 	private $nonfacts = array(
 		'FAMS', 'FAMC', 'MAY', 'BLOB', 'OBJE', 'SEX', 'NAME', 'SOUR', 'NOTE', 'BAPL', 'ENDL', 'SLGC', 'SLGS', '_TODO', '_WT_OBJE_SORT', 'CHAN', 'HUSB', 'WIFE', 'CHIL', 'BIRT', 'DEAT', 'BURI'
@@ -166,11 +163,11 @@ class LifespanController extends PageController {
 		}
 
 		// Sort the array in order of birth year
-		uasort($this->people, function(Individual $a, Individual $b) {
+		uasort($this->people, function (Individual $a, Individual $b) {
 			return Date::compare($a->getEstimatedBirthDate(), $b->getEstimatedBirthDate());
 		});
 		//If there is people in the array posted back this if occurs
-		if (isset ($this->people[0])) {
+		if (isset($this->people[0])) {
 			//Find the maximum Death year and mimimum Birth year for each individual returned in the array.
 			$bdate                 = $this->people[0]->getEstimatedBirthDate();
 			$ddate                 = $this->people[0]->getEstimatedDeathDate();
diff --git a/app/Controller/MediaController.php b/app/Controller/MediaController.php
index 3d912e4f88..22ab213b70 100644
--- a/app/Controller/MediaController.php
+++ b/app/Controller/MediaController.php
@@ -35,7 +35,7 @@ class MediaController extends GedcomRecordController {
 	/**
 	 * get edit menu
 	 */
-	function getEditMenu() {
+	public function getEditMenu() {
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}
@@ -109,7 +109,7 @@ class MediaController extends GedcomRecordController {
 	 *
 	 * @return Fact[]
 	 */
-	function getFacts() {
+	public function getFacts() {
 		$facts = $this->record->getFacts();
 
 		// Add some dummy facts to show additional information
@@ -135,7 +135,7 @@ class MediaController extends GedcomRecordController {
 	 *
 	 * @return string
 	 */
-	static function getMediaListMenu(Media $mediaobject) {
+	public static function getMediaListMenu(Media $mediaobject) {
 		$html = '';
 
 		$menu = new Menu(I18N::translate('Edit details'), '#', 'lb-image_edit', "return window.open('addmedia.php?action=editmedia&amp;pid=" . $mediaobject->getXref() . "', '_blank', edit_window_specs);");
diff --git a/app/Controller/NoteController.php b/app/Controller/NoteController.php
index 9adb5ab535..53532cabd1 100644
--- a/app/Controller/NoteController.php
+++ b/app/Controller/NoteController.php
@@ -35,7 +35,7 @@ class NoteController extends GedcomRecordController {
 	/**
 	 * get edit menu
 	 */
-	function getEditMenu() {
+	public function getEditMenu() {
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}
diff --git a/app/Controller/PedigreeController.php b/app/Controller/PedigreeController.php
index bb3924e201..6a0a5a5808 100644
--- a/app/Controller/PedigreeController.php
+++ b/app/Controller/PedigreeController.php
@@ -250,9 +250,9 @@ class PedigreeController extends ChartController {
 
 	/**
 	 * Function get_menu
-	 * 
+	 *
 	 * Build a menu for the chart root individual
-	 * 
+	 *
 	 * @return string
 	 */
 	public function get_menu() {
@@ -296,9 +296,9 @@ class PedigreeController extends ChartController {
 
 	/**
 	 * Function gotoPreviousGen
-	 * 
+	 *
 	 * Create a link to generate a new chart based on the correct parent of the individual with this index
-	 * 
+	 *
 	 * @param integer $index
 	 * @return string
 	 */
diff --git a/app/Controller/RepositoryController.php b/app/Controller/RepositoryController.php
index 2324892367..21ff8c823d 100644
--- a/app/Controller/RepositoryController.php
+++ b/app/Controller/RepositoryController.php
@@ -35,7 +35,7 @@ class RepositoryController extends GedcomRecordController {
 	/**
 	 * get edit menu
 	 */
-	function getEditMenu() {
+	public function getEditMenu() {
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}
diff --git a/app/Controller/SearchController.php b/app/Controller/SearchController.php
index 2113fa9081..3c5d84e47a 100644
--- a/app/Controller/SearchController.php
+++ b/app/Controller/SearchController.php
@@ -56,18 +56,35 @@ class SearchController extends PageController {
 	/** @var string The soundex algorithm to use */
 	public $soundex;
 
-	// Need to decide if these variables are public/private/protected (or unused)
-	var $showasso = 'off';
-	var $name;
-	var $firstname;
-	var $lastname;
-	var $place;
-	var $year;
-	var $replace = '';
-	var $replaceNames = false;
-	var $replacePlaces = false;
-	var $replaceAll = false;
-	var $replacePlacesWord = false;
+	/** @var string @var string Search parameter */
+	public $showasso = 'off';
+
+	/** @var string @var string Search parameter */
+	public $firstname;
+
+	/** @var string @var string Search parameter */
+	public $lastname;
+
+	/** @var string @var string Search parameter */
+	public $place;
+
+	/** @var string @var string Search parameter */
+	public $year;
+
+	/** @var string @var string Replace parameter */
+	public $replace = '';
+
+	/** @var boolean @var string Replace parameter */
+	public $replaceNames = false;
+
+	/** @var boolean @var string Replace parameter */
+	public $replacePlaces = false;
+
+	/** @var boolean @var string Replace parameter */
+	public $replaceAll = false;
+
+	/** @var boolean @var string Replace parameter */
+	public $replacePlacesWord = false;
 
 	/**
 	 * Startup activity
@@ -111,7 +128,6 @@ class SearchController extends PageController {
 		$this->lastname          = Filter::get('lastname');
 		$this->place             = Filter::get('place');
 		$this->year              = Filter::get('year');
-		$this->name              = Filter::get('name');
 
 		// If no record types specified, search individuals
 		if (!$this->srfams && !$this->srsour && !$this->srnote) {
@@ -419,18 +435,18 @@ class SearchController extends PageController {
 	 *
 	 */
 	private function soundexSearch() {
-		if (((!empty ($this->lastname)) || (!empty ($this->firstname)) || (!empty ($this->place))) && $this->search_trees) {
+		if (((!empty($this->lastname)) || (!empty($this->firstname)) || (!empty($this->place))) && $this->search_trees) {
 			$logstring = "Type: Soundex\n";
-			if (!empty ($this->lastname)) {
+			if (!empty($this->lastname)) {
 				$logstring .= "Last name: " . $this->lastname . "\n";
 			}
-			if (!empty ($this->firstname)) {
+			if (!empty($this->firstname)) {
 				$logstring .= "First name: " . $this->firstname . "\n";
 			}
-			if (!empty ($this->place)) {
+			if (!empty($this->place)) {
 				$logstring .= "Place: " . $this->place . "\n";
 			}
-			if (!empty ($this->year)) {
+			if (!empty($this->year)) {
 				$logstring .= "Year: " . $this->year . "\n";
 			}
 			Log::addSearchLog($logstring, $this->search_trees);
@@ -475,7 +491,7 @@ class SearchController extends PageController {
 	/**
 	 * Display the search results
 	 */
-	function printResults() {
+	public function printResults() {
 		if ($this->action !== 'replace' && ($this->query || $this->firstname || $this->lastname || $this->place)) {
 			if ($this->myindilist || $this->myfamlist || $this->mysourcelist || $this->mynotelist) {
 				$this->addInlineJavascript('jQuery("#search-result-tabs").tabs();');
diff --git a/app/Controller/SourceController.php b/app/Controller/SourceController.php
index 03ddc8b5e0..1c78a02c5a 100644
--- a/app/Controller/SourceController.php
+++ b/app/Controller/SourceController.php
@@ -35,7 +35,7 @@ class SourceController extends GedcomRecordController {
 	/**
 	 * get edit menu
 	 */
-	function getEditMenu() {
+	public function getEditMenu() {
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}
diff --git a/app/Date/CalendarDate.php b/app/Date/CalendarDate.php
index bda527b89f..9c43571bc9 100644
--- a/app/Date/CalendarDate.php
+++ b/app/Date/CalendarDate.php
@@ -134,7 +134,7 @@ class CalendarDate {
 	 *
 	 * @return boolean
 	 */
-	function isLeapYear() {
+	public function isLeapYear() {
 		return $this->calendar->isLeapYear($this->y);
 	}
 
diff --git a/app/Date/JulianDate.php b/app/Date/JulianDate.php
index 28ef14aa5b..a13e994a7e 100644
--- a/app/Date/JulianDate.php
+++ b/app/Date/JulianDate.php
@@ -52,7 +52,7 @@ class JulianDate extends CalendarDate {
 			$this->new_old_style = true;
 
 			return $match[1] + 1;
-		} else if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) {
+		} elseif (preg_match('/^(\d+) B\.C\.$/', $year, $match)) {
 			return -$match[1];
 		} else {
 			return (int) $year;
diff --git a/app/Family.php b/app/Family.php
index cdf72008ba..7cb1a9a59a 100644
--- a/app/Family.php
+++ b/app/Family.php
@@ -104,7 +104,7 @@ class Family extends GedcomRecord {
 	 *
 	 * @return Individual|null
 	 */
-	function getHusband() {
+	public function getHusband() {
 		if ($this->husb && $this->husb->canShowName()) {
 			return $this->husb;
 		} else {
@@ -117,7 +117,7 @@ class Family extends GedcomRecord {
 	 *
 	 * @return Individual|null
 	 */
-	function getWife() {
+	public function getWife() {
 		if ($this->wife && $this->wife->canShowName()) {
 			return $this->wife;
 		} else {
@@ -153,7 +153,7 @@ class Family extends GedcomRecord {
 	 *
 	 * @return Individual|null
 	 */
-	function getSpouse(Individual $person) {
+	public function getSpouse(Individual $person) {
 		if ($person === $this->wife) {
 			return $this->husb;
 		} else {
@@ -168,7 +168,7 @@ class Family extends GedcomRecord {
 	 *
 	 * @return Individual[]
 	 */
-	function getSpouses($access_level = null) {
+	public function getSpouses($access_level = null) {
 		if ($access_level === null) {
 			$access_level = Auth::accessLevel($this->tree);
 		}
@@ -191,7 +191,7 @@ class Family extends GedcomRecord {
 	 *
 	 * @return Individual[]
 	 */
-	function getChildren($access_level = null) {
+	public function getChildren($access_level = null) {
 		if ($access_level === null) {
 			$access_level = Auth::accessLevel($this->tree);
 		}
@@ -388,7 +388,7 @@ class Family extends GedcomRecord {
 	}
 
 	/** {@inheritdoc} */
-	function formatListDetails() {
+	public function formatListDetails() {
 		return
 			$this->formatFirstMajorFact(WT_EVENTS_MARR, 1) .
 			$this->formatFirstMajorFact(WT_EVENTS_DIV, 1);
diff --git a/app/Filter.php b/app/Filter.php
index cbd4ce50e2..026cb4a6e7 100644
--- a/app/Filter.php
+++ b/app/Filter.php
@@ -66,7 +66,7 @@ class Filter {
 	 * @return string
 	 */
 	public static function escapeJs($string) {
-		return preg_replace_callback('/[^A-Za-z0-9,. _]/Su', function($x) {
+		return preg_replace_callback('/[^A-Za-z0-9,. _]/Su', function ($x) {
 			if (strlen($x[0]) == 1) {
 				return sprintf('\\x%02X', ord($x[0]));
 			} elseif (function_exists('iconv')) {
@@ -135,7 +135,7 @@ class Filter {
 	public static function expandUrls($text) {
 		return preg_replace_callback(
 			'/' . addcslashes('(?!>)' . self::URL_REGEX . '(?!</a>)', '/') . '/i',
-			function($m) {
+			function ($m) {
 				return '<a href="' . $m[0] . '" target="_blank">' . $m[0] . '</a>';
 			},
 			self::escapeHtml($text)
@@ -199,7 +199,7 @@ class Filter {
 				$variable,
 				FILTER_CALLBACK,
 				array(
-					'options' => function($x) {
+					'options' => function ($x) {
 						return mb_check_encoding($x, 'UTF-8') ? $x : false;
 					},
 				)
@@ -243,7 +243,7 @@ class Filter {
 					$variable => array(
 						'flags'   => FILTER_REQUIRE_ARRAY,
 						'filter'  => FILTER_CALLBACK,
-						'options' => function($x) {
+						'options' => function ($x) {
 							return !function_exists('mb_convert_encoding') || mb_check_encoding($x, 'UTF-8') ? $x : false;
 						}
 					),
diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php
index e8248b9b59..99d38f394c 100644
--- a/app/GedcomRecord.php
+++ b/app/GedcomRecord.php
@@ -528,7 +528,7 @@ class GedcomRecord {
 	protected function addName($type, $value, $gedcom) {
 		$this->_getAllNames[] = array(
 			'type'   => $type,
-			'sort'   => preg_replace_callback('/([0-9]+)/', function($matches) { return str_pad($matches[0], 10, '0', STR_PAD_LEFT); }, $value),
+			'sort'   => preg_replace_callback('/([0-9]+)/', function ($matches) { return str_pad($matches[0], 10, '0', STR_PAD_LEFT); }, $value),
 			'full'   => '<span dir="auto">' . Filter::escapeHtml($value) . '</span>', // This is used for display
 			'fullNN' => $value, // This goes into the database
 		);
diff --git a/app/Individual.php b/app/Individual.php
index 40a720e7a4..56fa3c620b 100644
--- a/app/Individual.php
+++ b/app/Individual.php
@@ -25,7 +25,7 @@ class Individual extends GedcomRecord {
 	const RECORD_TYPE = 'INDI';
 	const URL_PREFIX = 'individual.php?pid=';
 
-	var $generation; // used in some lists to keep track of this individual’s generation in that list
+	public $generation; // used in some lists to keep track of this individual’s generation in that list
 
 	/** @var Date The estimated date of birth */
 	private $_getEstimatedBirthDate;
@@ -393,7 +393,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return null|Media
 	 */
-	function findHighlightedMedia() {
+	public function findHighlightedMedia() {
 		$objectA = null;
 		$objectB = null;
 		$objectC = null;
@@ -466,7 +466,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Date
 	 */
-	function getBirthDate() {
+	public function getBirthDate() {
 		foreach ($this->getAllBirthDates() as $date) {
 			if ($date->isOK()) {
 				return $date;
@@ -481,7 +481,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getBirthPlace() {
+	public function getBirthPlace() {
 		foreach ($this->getAllBirthPlaces() as $place) {
 			if ($place) {
 				return $place;
@@ -496,7 +496,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string the year of birth
 	 */
-	function getBirthYear() {
+	public function getBirthYear() {
 		return $this->getBirthDate()->minimumDate()->format('%Y');
 	}
 
@@ -505,7 +505,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Date
 	 */
-	function getDeathDate() {
+	public function getDeathDate() {
 		foreach ($this->getAllDeathDates() as $date) {
 			if ($date->isOK()) {
 				return $date;
@@ -520,7 +520,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getDeathPlace() {
+	public function getDeathPlace() {
 		foreach ($this->getAllDeathPlaces() as $place) {
 			if ($place) {
 				return $place;
@@ -535,7 +535,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string the year of death
 	 */
-	function getDeathYear() {
+	public function getDeathYear() {
 		return $this->getDeathDate()->minimumDate()->format('%Y');
 	}
 
@@ -561,7 +561,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Date[]
 	 */
-	function getAllBirthDates() {
+	public function getAllBirthDates() {
 		foreach (explode('|', WT_EVENTS_BIRT) as $event) {
 			$tmp = $this->getAllEventDates($event);
 			if ($tmp) {
@@ -577,7 +577,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string[]
 	 */
-	function getAllBirthPlaces() {
+	public function getAllBirthPlaces() {
 		foreach (explode('|', WT_EVENTS_BIRT) as $event) {
 			$tmp = $this->getAllEventPlaces($event);
 			if ($tmp) {
@@ -593,7 +593,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Date[]
 	 */
-	function getAllDeathDates() {
+	public function getAllDeathDates() {
 		foreach (explode('|', WT_EVENTS_DEAT) as $event) {
 			$tmp = $this->getAllEventDates($event);
 			if ($tmp) {
@@ -609,7 +609,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string[]
 	 */
-	function getAllDeathPlaces() {
+	public function getAllDeathPlaces() {
 		foreach (explode('|', WT_EVENTS_DEAT) as $event) {
 			$tmp = $this->getAllEventPlaces($event);
 			if ($tmp) {
@@ -625,7 +625,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Date
 	 */
-	function getEstimatedBirthDate() {
+	public function getEstimatedBirthDate() {
 		if (is_null($this->_getEstimatedBirthDate)) {
 			foreach ($this->getAllBirthDates() as $date) {
 				if ($date->isOK()) {
@@ -710,7 +710,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Date
 	 */
-	function getEstimatedDeathDate() {
+	public function getEstimatedDeathDate() {
 		if ($this->_getEstimatedDeathDate === null) {
 			foreach ($this->getAllDeathDates() as $date) {
 				if ($date->isOK()) {
@@ -737,7 +737,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getSex() {
+	public function getSex() {
 		if (preg_match('/\n1 SEX ([MF])/', $this->gedcom . $this->pending, $match)) {
 			return $match[1];
 		} else {
@@ -752,7 +752,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getSexImage($size = 'small') {
+	public function getSexImage($size = 'small') {
 		return self::sexImage($this->getSex(), $size);
 	}
 
@@ -764,7 +764,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	static function sexImage($sex, $size = 'small') {
+	public static function sexImage($sex, $size = 'small') {
 		return '<i class="icon-sex_' . strtolower($sex) . '_' . ($size == 'small' ? '9x9' : '15x15') . '"></i>';
 	}
 
@@ -773,7 +773,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getBoxStyle() {
+	public function getBoxStyle() {
 		$tmp = array('M' => '', 'F' => 'F', 'U' => 'NN');
 
 		return 'person_box' . $tmp[$this->getSex()];
@@ -917,7 +917,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Family[]
 	 */
-	function getChildStepFamilies() {
+	public function getChildStepFamilies() {
 		$step_families = array();
 		$families = $this->getChildFamilies();
 		foreach ($families as $family) {
@@ -947,7 +947,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return Family[]
 	 */
-	function getSpouseStepFamilies() {
+	public function getSpouseStepFamilies() {
 		$step_families = array();
 		$families = $this->getSpouseFamilies();
 		foreach ($families as $family) {
@@ -971,7 +971,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getChildFamilyLabel(Family $family) {
+	public function getChildFamilyLabel(Family $family) {
 		if (preg_match('/\n1 FAMC @' . $family->getXref() . '@(?:\n[2-9].*)*\n2 PEDI (.+)/', $this->getGedcom(), $match)) {
 			// A specified pedigree
 			return GedcomCodePedi::getChildFamilyLabel($match[1]);
@@ -988,7 +988,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getStepFamilyLabel(Family $step_family) {
+	public function getStepFamilyLabel(Family $step_family) {
 		foreach ($this->getChildFamilies() as $family) {
 			if ($family !== $step_family) {
 				// Must be a step-family
@@ -1037,7 +1037,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function getSpouseFamilyLabel(Family $family) {
+	public function getSpouseFamilyLabel(Family $family) {
 		$spouse = $family->getSpouse($this);
 		if ($spouse) {
 			return
@@ -1056,7 +1056,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string a div block with father & mother names
 	 */
-	function getPrimaryParentsNames($classname = '', $display = '') {
+	public function getPrimaryParentsNames($classname = '', $display = '') {
 		$fam = $this->getPrimaryChildFamily();
 		if (!$fam) {
 			return '';
@@ -1097,7 +1097,7 @@ class Individual extends GedcomRecord {
 	}
 
 	/** {@inheritdoc} */
-	function getFallBackName() {
+	public function getFallBackName() {
 		return '@P.N. /@N.N./';
 	}
 
@@ -1247,7 +1247,7 @@ class Individual extends GedcomRecord {
 		$full = str_replace('@N.N.', $UNKNOWN_NN, $full);
 		$full = str_replace('@P.N.', $UNKNOWN_PN, $full);
 		// Localise quotation marks around the nickname
-		$full = preg_replace_callback('/"([^"]*)"/', function($matches) { return I18N::translate('“%s”', $matches[1]); }, $full);
+		$full = preg_replace_callback('/"([^"]*)"/', function ($matches) { return I18N::translate('“%s”', $matches[1]); }, $full);
 		// Format for display
 		$full = '<span class="NAME" dir="auto" translate="no">' . preg_replace('/\/([^\/]*)\//', '<span class="SURN">$1</span>', Filter::escapeHtml($full)) . '</span>';
 
@@ -1258,7 +1258,7 @@ class Individual extends GedcomRecord {
 		$GIVN = str_replace('*', '', $GIVN);
 		$fullNN = str_replace('*', '', $fullNN);
 
-		foreach ($SURNS AS $SURN) {
+		foreach ($SURNS as $SURN) {
 			// Scottish 'Mc and Mac ' prefixes both sort under 'Mac'
 			if (strcasecmp(substr($SURN, 0, 2), 'Mc') == 0) {
 				$SURN = substr_replace($SURN, 'Mac', 0, 2);
@@ -1291,7 +1291,7 @@ class Individual extends GedcomRecord {
 	 *
 	 * @return string
 	 */
-	function formatListDetails() {
+	public function formatListDetails() {
 		return
 			$this->formatFirstMajorFact(WT_EVENTS_BIRT, 1) .
 			$this->formatFirstMajorFact(WT_EVENTS_DEAT, 1);
diff --git a/app/Module.php b/app/Module.php
index aa0c0473f5..61e794c3e5 100644
--- a/app/Module.php
+++ b/app/Module.php
@@ -93,7 +93,7 @@ class Module {
 
 		// The order of menus/sidebars/tabs is defined in the database.  Others are sorted by name.
 		if ($component !== 'menu' && $component !== 'sidebar' && $component !== 'tab') {
-			uasort($array, function(AbstractModule $x, AbstractModule $y) {
+			uasort($array, function (AbstractModule $x, AbstractModule $y) {
 				return I18N::strcasecmp($x->getTitle(), $y->getTitle());
 			});
 		}
@@ -131,7 +131,7 @@ class Module {
 
 		// The order of menus/sidebars/tabs is defined in the database.  Others are sorted by name.
 		if ($component !== 'menu' && $component !== 'sidebar' && $component !== 'tab') {
-			uasort($array, function(AbstractModule $x, AbstractModule $y) {
+			uasort($array, function (AbstractModule $x, AbstractModule $y) {
 				return I18N::strcasecmp($x->getTitle(), $y->getTitle());
 			});
 		}
@@ -314,7 +314,7 @@ class Module {
 			}
 		}
 
-		uasort($modules, function(AbstractModule $x, AbstractModule $y) {
+		uasort($modules, function (AbstractModule $x, AbstractModule $y) {
 			return I18N::strcasecmp($x->getTitle(), $y->getTitle());
 		});
 
diff --git a/app/Module/AlbumModule.php b/app/Module/AlbumModule.php
index f9cae7a09c..1e6decc75e 100644
--- a/app/Module/AlbumModule.php
+++ b/app/Module/AlbumModule.php
@@ -193,7 +193,7 @@ class AlbumModule extends AbstractModule implements ModuleTabInterface {
 			foreach ($controller->record->getFacts('_WT_OBJE_SORT') as $fact) {
 				$wt_obje_sort[] = trim($fact->getValue(), '@');
 			}
-			usort($this->media_list, function(Media $x, Media $y) use ($wt_obje_sort) {
+			usort($this->media_list, function (Media $x, Media $y) use ($wt_obje_sort) {
 				return array_search($x->getXref(), $wt_obje_sort) - array_search($y->getXref(), $wt_obje_sort);
 			});
 		}
diff --git a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php
index c157253270..f65b74bd7a 100644
--- a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php
+++ b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php
@@ -32,14 +32,14 @@ class BatchUpdateBasePlugin {
 	 *
 	 * @return string[]
 	 */
-	function getRecordTypesToUpdate() {
+	public function getRecordTypesToUpdate() {
 		return array('INDI');
 	}
 
 	/**
 	 * Default option is just the "don't update CHAN record"
 	 */
-	function getOptions() {
+	public function getOptions() {
 		$this->chan = Filter::getBool('chan');
 	}
 
@@ -48,7 +48,7 @@ class BatchUpdateBasePlugin {
 	 *
 	 * @return string
 	 */
-	function getOptionsForm() {
+	public function getOptionsForm() {
 		return
 			'<tr><th>' . I18N::translate('Do not update the “last change” record') . '</th>' .
 			'<td><select name="chan" onchange="this.form.submit();">' .
@@ -64,7 +64,7 @@ class BatchUpdateBasePlugin {
 	 *
 	 * @return string[]
 	 */
-	function getActionButtons($xref) {
+	public function getActionButtons($xref) {
 		if (Auth::user()->getPreference('auto_accept')) {
 			return array(
 				BatchUpdateModule::createSubmitButton(I18N::translate('Update'), $xref, 'update'),
@@ -158,7 +158,7 @@ class BatchUpdateBasePlugin {
 	 *
 	 * @return string
 	 */
-	static function decorateInsertedText($text) {
+	public static function decorateInsertedText($text) {
 		return '<ins>' . $text . '</ins>';
 	}
 
@@ -169,7 +169,7 @@ class BatchUpdateBasePlugin {
 	 *
 	 * @return string
 	 */
-	static function decorateDeletedText($text) {
+	public static function decorateDeletedText($text) {
 		return '<del>' . $text . '</del>';
 	}
 
@@ -180,7 +180,7 @@ class BatchUpdateBasePlugin {
 	 *
 	 * @return string
 	 */
-	static function createEditLinks($gedrec) {
+	public static function createEditLinks($gedrec) {
 		return preg_replace(
 			"/@([^#@\n]+)@/m",
 			'<a href="#" onclick="return edit_raw(\'\\1\');">@\\1@</a>',
diff --git a/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php b/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php
index 2489d1b132..2a032c24f4 100644
--- a/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php
+++ b/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php
@@ -20,12 +20,12 @@ namespace Fisharebest\Webtrees;
  * Class BatchUpdateSearchReplacePlugin Batch Update plugin: search/replace
  */
 class BatchUpdateSearchReplacePlugin extends BatchUpdateBasePlugin {
-	var $search = null; // Search string
-	var $replace = null; // Replace string
-	var $method = null; // simple/wildcards/regex
-	var $regex  = null; // Search string, converted to a regex
-	var $case   = null; // "i" for case insensitive, "" for case sensitive
-	var $error  = null; // Message for bad user parameters
+	private $search  = null; // Search string
+	private $replace = null; // Replace string
+	private $method  = null; // simple/wildcards/regex
+	private $regex   = null; // Search string, converted to a regex
+	private $case    = null; // "i" for case insensitive, "" for case sensitive
+	private $error   = null; // Message for bad user parameters
 
 	/**
 	 * User-friendly name for this plugin.
diff --git a/app/Module/BatchUpdateModule.php b/app/Module/BatchUpdateModule.php
index 571c8708f2..414872a83c 100644
--- a/app/Module/BatchUpdateModule.php
+++ b/app/Module/BatchUpdateModule.php
@@ -87,7 +87,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
 	 *
 	 * @return string
 	 */
-	function main() {
+	private function main() {
 		global $WT_TREE;
 
 		$this->plugins = $this->getPluginList(); // List of available plugins
diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php
index 8c86a95372..2775f4be84 100644
--- a/app/Module/CensusAssistantModule.php
+++ b/app/Module/CensusAssistantModule.php
@@ -308,7 +308,7 @@ class CensusAssistantModule extends AbstractModule {
 	 *
 	 * @return string
 	 */
-	static function addNoteWithAssistantLink($element_id, $xref, $action) {
+	public static function addNoteWithAssistantLink($element_id, $xref, $action) {
 		global $controller, $WT_TREE;
 
 		// We do not yet support family records
diff --git a/app/Module/ClippingsCart/ClippingsCart.php b/app/Module/ClippingsCart/ClippingsCart.php
index 559514b846..67c463aa3f 100644
--- a/app/Module/ClippingsCart/ClippingsCart.php
+++ b/app/Module/ClippingsCart/ClippingsCart.php
@@ -149,7 +149,7 @@ class ClippingsCart {
 				uksort($cart[$WT_TREE->getTreeId()], __NAMESPACE__ . '\ClippingsCart::compareClippings');
 			}
 		} elseif ($this->action === 'remove') {
-			unset ($cart[$WT_TREE->getTreeId()][$this->id]);
+			unset($cart[$WT_TREE->getTreeId()][$this->id]);
 		} elseif ($this->action === 'empty') {
 			$cart[$WT_TREE->getTreeId()] = array();
 		} elseif ($this->action === 'download') {
@@ -279,7 +279,7 @@ class ClippingsCart {
 	/**
 	 * Loads everything in the clippings cart into a zip file.
 	 */
-	function zipCart() {
+	private function zipCart() {
 		$tempFileName = 'clipping' . rand() . '.ged';
 		$fp = fopen(WT_DATA_DIR . $tempFileName, "wb");
 		if ($fp) {
@@ -312,7 +312,7 @@ class ClippingsCart {
 	 * Brings up the download dialog box and allows the user to download the file
 	 * based on the options he or she selected.
 	 */
-	function downloadClipping() {
+	public function downloadClipping() {
 		if ($this->IncludeMedia === 'yes' || $this->Zip === 'yes') {
 			header('Content-Type: application/zip');
 			header('Content-Disposition: attachment; filename="clipping.zip"');
@@ -332,7 +332,7 @@ class ClippingsCart {
 	 *
 	 * @param GedcomRecord $record
 	 */
-	function addClipping(GedcomRecord $record) {
+	public function addClipping(GedcomRecord $record) {
 		if ($record->canShowName()) {
 			$cart = Session::get('cart');
 			$cart[$record->getTree()->getTreeId()][$record->getXref()] = true;
@@ -351,7 +351,7 @@ class ClippingsCart {
 	 * @param Family|null $family
 	 * @param integer        $level
 	 */
-	function addFamilyDescendancy(Family $family = null, $level = PHP_INT_MAX) {
+	public function addFamilyDescendancy(Family $family = null, $level = PHP_INT_MAX) {
 		if (!$family) {
 			return;
 		}
@@ -374,7 +374,7 @@ class ClippingsCart {
 	 *
 	 * @param Family|null $family
 	 */
-	function addFamilyMembers(Family $family = null) {
+	public function addFamilyMembers(Family $family = null) {
 		if (!$family) {
 			return;
 		}
@@ -393,7 +393,7 @@ class ClippingsCart {
 	 * @param Individual|null $person
 	 * @param integer         $level
 	 */
-	function addAncestorsToCart(Individual $person = null, $level = 0) {
+	public function addAncestorsToCart(Individual $person = null, $level = 0) {
 		if (!$person) {
 			return;
 		}
@@ -413,7 +413,7 @@ class ClippingsCart {
 	 * @param Individual|null $person
 	 * @param integer            $level
 	 */
-	function addAncestorsToCartFamilies(Individual $person = null, $level = 0) {
+	public function addAncestorsToCartFamilies(Individual $person = null, $level = 0) {
 		if (!$person) {
 			return;
 		}
@@ -434,7 +434,7 @@ class ClippingsCart {
 	 *
 	 * @return integer
 	 */
-	static function compareClippings($a, $b) {
+	private static function compareClippings($a, $b) {
 		global $WT_TREE;
 
 		$a = GedcomRecord::getInstance($a, $WT_TREE);
diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php
index bf5ff3fe7d..c2190696cc 100644
--- a/app/Module/ClippingsCartModule.php
+++ b/app/Module/ClippingsCartModule.php
@@ -554,7 +554,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
 				}
 			}
 		} elseif ($remove) {
-			unset ($cart[$WT_TREE->getTreeId()][$remove]);
+			unset($cart[$WT_TREE->getTreeId()][$remove]);
 			Session::put('cart', $cart);
 		} elseif (isset($_REQUEST['empty'])) {
 			$cart[$WT_TREE->getTreeId()] = array();
diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php
index 1663443056..764c03908b 100644
--- a/app/Module/FrequentlyAskedQuestionsModule.php
+++ b/app/Module/FrequentlyAskedQuestionsModule.php
@@ -436,7 +436,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
 			foreach ($faqs as $faq) {
 				// NOTE: Print the position of the current item
 				echo '<tr class="faq_edit_pos"><td>';
-				echo I18N::translate('#%s',$faq->block_order + 1), ' ';
+				echo I18N::translate('#%s', $faq->block_order + 1), ' ';
 				if ($faq->gedcom_id == null) {
 					echo I18N::translate('All');
 				} else {
diff --git a/app/Module/InteractiveTreeModule.php b/app/Module/InteractiveTreeModule.php
index 012038c9f0..108f190096 100644
--- a/app/Module/InteractiveTreeModule.php
+++ b/app/Module/InteractiveTreeModule.php
@@ -21,9 +21,6 @@ namespace Fisharebest\Webtrees;
  * Tip : you could change the number of generations loaded before ajax calls both in individual page and in treeview page to optimize speed and server load
  */
 class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface {
-	var $headers; // CSS and script to include in the top of <head> section, before theme’s CSS
-	var $js; // the TreeViewHandler javascript
-
 	/** {@inheritdoc} */
 	public function getTitle() {
 		return /* I18N: Name of a module */ I18N::translate('Interactive tree');
diff --git a/app/Module/ModuleBlockInterface.php b/app/Module/ModuleBlockInterface.php
index 60654269f0..cf04fbfc20 100644
--- a/app/Module/ModuleBlockInterface.php
+++ b/app/Module/ModuleBlockInterface.php
@@ -22,7 +22,7 @@ namespace Fisharebest\Webtrees;
 interface ModuleBlockInterface {
 	/**
 	 * Generate the HTML content of this block.
-	 * 
+	 *
 	 * @param integer $block_id
 	 *
 	 * @return string
diff --git a/app/Module/RelativesTabModule.php b/app/Module/RelativesTabModule.php
index c2c5675bcd..0924a4c964 100644
--- a/app/Module/RelativesTabModule.php
+++ b/app/Module/RelativesTabModule.php
@@ -42,7 +42,7 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface {
 	 *
 	 * @return string
 	 */
-	static function ageDifference(Date $prev, Date $next, $child_number = 0) {
+	private static function ageDifference(Date $prev, Date $next, $child_number = 0) {
 		if ($prev->isOK() && $next->isOK()) {
 			$days = $next->maximumJulianDay() - $prev->minimumJulianDay();
 			if ($days < 0) {
@@ -73,7 +73,7 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface {
 	 * @param string $type
 	 * @param string $label
 	 */
-	function printFamily(Family $family, $type, $label) {
+	private function printFamily(Family $family, $type, $label) {
 		global $controller;
 
 		if ($family->getTree()->getPreference('SHOW_PRIVATE_RELATIONSHIPS')) {
diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php
index 927ed089a3..6e07517bf1 100644
--- a/app/Module/SlideShowModule.php
+++ b/app/Module/SlideShowModule.php
@@ -372,7 +372,7 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface {
 							echo '</tr><tr>';
 						}
 						echo '<td class="width33"><label><input type="checkbox" value="yes" name="filter_' . $typeName . '" ';
-						echo ($filters[$typeName]) ? 'checked' : '';
+						echo $filters[$typeName] ? 'checked' : '';
 						echo '> ' . $typeValue . '</label></td>';
 					}
 					?>
diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php
index d9c4fda5e9..a90362b597 100644
--- a/app/Module/UserMessagesModule.php
+++ b/app/Module/UserMessagesModule.php
@@ -56,7 +56,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface
 		$id    = $this->getName() . $block_id;
 		$class = $this->getName() . '_block';
 		$title = I18N::plural('%s message', '%s messages', $count, I18N::number($count));
-		$users = array_filter(User::all(), function(User $user) {
+		$users = array_filter(User::all(), function (User $user) {
 			return $user->getUserId() !== Auth::id() && $user->getPreference('verified_by_admin') && $user->getPreference('contactmethod') !== 'none';
 		});
 
diff --git a/app/Query/QueryName.php b/app/Query/QueryName.php
index 869f69e878..e825baa92f 100644
--- a/app/Query/QueryName.php
+++ b/app/Query/QueryName.php
@@ -122,7 +122,7 @@ class QueryName {
 	 *
 	 * @return string
 	 */
-	static public function initialLetter($name) {
+	public static function initialLetter($name) {
 		$name = I18N::strtoupper($name);
 		switch (WT_LOCALE) {
 		case 'cs':
@@ -188,7 +188,7 @@ class QueryName {
 	 *
 	 * @return string
 	 */
-	static private function getInitialSql($field, $letter) {
+	private static function getInitialSql($field, $letter) {
 		switch (WT_LOCALE) {
 		case 'cs':
 			switch ($letter) {
diff --git a/app/Report/ReportBase.php b/app/Report/ReportBase.php
index ecb7a2c2bf..7b196b117c 100644
--- a/app/Report/ReportBase.php
+++ b/app/Report/ReportBase.php
@@ -96,7 +96,7 @@ class ReportBase {
 	 * As DEFAULT A4 and Portrait will be used if not set
 	 *
 	 */
-	function setup() {
+	public function setup() {
 		// Set RTL direction
 		if (I18N::direction() === 'rtl') {
 			$this->rtl = true;
@@ -413,7 +413,7 @@ class ReportBase {
 	 *
 	 * @return integer
 	 */
-	function setProcessing($p) {
+	public function setProcessing($p) {
 		$this->processing = $p;
 
 		return 0;
@@ -426,7 +426,7 @@ class ReportBase {
 	 *
 	 * @return integer
 	 */
-	function addTitle($data) {
+	public function addTitle($data) {
 		$this->title .= $data;
 
 		return 0;
@@ -439,7 +439,7 @@ class ReportBase {
 	 *
 	 * @return integer
 	 */
-	function addDescription($data) {
+	public function addDescription($data) {
 		$this->rsubject .= $data;
 
 		return 0;
@@ -452,7 +452,7 @@ class ReportBase {
 	 *
 	 * @return integer
 	 */
-	function addStyle($style) {
+	public function addStyle($style) {
 		$this->Styles[$style['name']] = $style;
 
 		return 0;
@@ -465,7 +465,7 @@ class ReportBase {
 	 *
 	 * @return array
 	 */
-	function getStyle($s) {
+	public function getStyle($s) {
 		if (!isset($this->Styles[$s])) {
 			return current($this->Styles);
 		}
@@ -2299,7 +2299,7 @@ function listStartHandler($attrs) {
 				// Substitute global vars
 				$value = preg_replace_callback(
 					'/\$(\w+)/',
-					function($matches) use ($vars) {
+					function ($matches) use ($vars) {
 						return $vars[$matches[1]]['id'];
 					},
 					$value
@@ -2385,7 +2385,7 @@ function listStartHandler($attrs) {
 				// Substitute global vars
 				$value = preg_replace_callback(
 					'/\$(\w+)/',
-					function($matches) use ($vars) {
+					function ($matches) use ($vars) {
 						return $vars[$matches[1]]['id'];
 					},
 					$value
@@ -2609,7 +2609,7 @@ function listStartHandler($attrs) {
 		uasort($list, __NAMESPACE__ . '\GedcomRecord::compare');
 		break;
 	case 'CHAN':
-		uasort($list, function(GedcomRecord $x, GedcomRecord $y) {
+		uasort($list, function (GedcomRecord $x, GedcomRecord $y) {
 			return $y->lastChangeTimestamp(true) - $x->lastChangeTimestamp(true);
 		});
 		break;
diff --git a/app/Report/ReportBaseCell.php b/app/Report/ReportBaseCell.php
index 2aa4f986e3..3cc3eceaa3 100644
--- a/app/Report/ReportBaseCell.php
+++ b/app/Report/ReportBaseCell.php
@@ -159,7 +159,7 @@ class ReportBaseCell extends ReportBaseElement {
 	 *
 	 * @return float
 	 */
-	function getHeight($renderer) {
+	public function getHeight($renderer) {
 		return $this->height;
 	}
 
@@ -170,7 +170,7 @@ class ReportBaseCell extends ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function setUrl($url) {
+	public function setUrl($url) {
 		$this->url = $url;
 
 		return 0;
@@ -183,7 +183,7 @@ class ReportBaseCell extends ReportBaseElement {
 	 *
 	 * @return float
 	 */
-	function getWidth($renderer) {
+	public function getWidth($renderer) {
 		return $this->width;
 	}
 }
diff --git a/app/Report/ReportBaseElement.php b/app/Report/ReportBaseElement.php
index 7121bb3b81..1102257413 100644
--- a/app/Report/ReportBaseElement.php
+++ b/app/Report/ReportBaseElement.php
@@ -32,7 +32,7 @@ class ReportBaseElement {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		//-- to be implemented in inherited classes
 	}
 
@@ -41,7 +41,7 @@ class ReportBaseElement {
 	 *
 	 * @return float
 	 */
-	function getHeight($renderer) {
+	public function getHeight($renderer) {
 		return 0.0;
 	}
 
@@ -50,7 +50,7 @@ class ReportBaseElement {
 	 *
 	 * @return float
 	 */
-	function getWidth($renderer) {
+	public function getWidth($renderer) {
 		return 0.0;
 	}
 
@@ -59,7 +59,7 @@ class ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function addText($t) {
+	public function addText($t) {
 		global $wt_report, $reportTitle, $reportDescription;
 
 		$t = trim($t, "\r\n\t");
@@ -81,7 +81,7 @@ class ReportBaseElement {
 	/**
 	 * @return integer
 	 */
-	function addNewline() {
+	public function addNewline() {
 		$this->text .= "\n";
 
 		return 0;
@@ -90,7 +90,7 @@ class ReportBaseElement {
 	/**
 	 * @return string
 	 */
-	function getValue() {
+	public function getValue() {
 		return $this->text;
 	}
 
@@ -100,7 +100,7 @@ class ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function setWrapWidth($wrapwidth, $cellwidth) {
+	public function setWrapWidth($wrapwidth, $cellwidth) {
 		return 0;
 	}
 
@@ -109,7 +109,7 @@ class ReportBaseElement {
 	 *
 	 * @return void
 	 */
-	function renderFootnote($renderer) {
+	public function renderFootnote($renderer) {
 		// To be implemented in inherited classes
 	}
 
@@ -118,7 +118,7 @@ class ReportBaseElement {
 	 *
 	 * @return void
 	 */
-	function setText($text) {
+	public function setText($text) {
 		$this->text = $text;
 	}
 }
diff --git a/app/Report/ReportBaseFootnote.php b/app/Report/ReportBaseFootnote.php
index 87c66a02f8..1a6055b962 100644
--- a/app/Report/ReportBaseFootnote.php
+++ b/app/Report/ReportBaseFootnote.php
@@ -76,7 +76,7 @@ class ReportBaseFootnote extends ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function addText($t) {
+	public function addText($t) {
 		$t = trim($t, "\r\n\t");
 		$t = str_replace(array("<br>", "&nbsp;"), array("\n", " "), $t);
 		$t = strip_tags($t);
@@ -92,7 +92,7 @@ class ReportBaseFootnote extends ReportBaseElement {
 	 *
 	 * @return mixed
 	 */
-	function setWrapWidth($wrapwidth, $cellwidth) {
+	public function setWrapWidth($wrapwidth, $cellwidth) {
 		$this->wrapWidthCell = $cellwidth;
 		if (strpos($this->numText, "\n") !== false) {
 			$this->wrapWidthRemaining = $cellwidth;
@@ -108,7 +108,7 @@ class ReportBaseFootnote extends ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function setNum($n) {
+	public function setNum($n) {
 		$this->num = $n;
 		$this->numText = "$n ";
 
@@ -120,7 +120,7 @@ class ReportBaseFootnote extends ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function setAddlink($a) {
+	public function setAddlink($a) {
 		$this->addlink = $a;
 
 		return 0;
diff --git a/app/Report/ReportBaseHtml.php b/app/Report/ReportBaseHtml.php
index 0c2b812d6d..02d6e50f22 100644
--- a/app/Report/ReportBaseHtml.php
+++ b/app/Report/ReportBaseHtml.php
@@ -38,7 +38,7 @@ class ReportBaseHtml extends ReportBaseElement {
 	/**
 	 * @return string
 	 */
-	function getStart() {
+	public function getStart() {
 		$str = "<" . $this->tag . " ";
 		foreach ($this->attrs as $key => $value) {
 			$str .= $key . "=\"" . $value . "\" ";
@@ -51,7 +51,7 @@ class ReportBaseHtml extends ReportBaseElement {
 	/**
 	 * @return string
 	 */
-	function getEnd() {
+	public function getEnd() {
 		return "</" . $this->tag . ">";
 	}
 
@@ -60,7 +60,7 @@ class ReportBaseHtml extends ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function addElement($element) {
+	public function addElement($element) {
 		$this->elements[] = $element;
 
 		return 0;
diff --git a/app/Report/ReportBaseImage.php b/app/Report/ReportBaseImage.php
index 26df6166bc..dd457e41f2 100644
--- a/app/Report/ReportBaseImage.php
+++ b/app/Report/ReportBaseImage.php
@@ -91,7 +91,7 @@ class ReportBaseImage extends ReportBaseElement {
 	 *
 	 * @return float
 	 */
-	function getHeight($renderer) {
+	public function getHeight($renderer) {
 		return $this->height;
 	}
 
@@ -100,7 +100,7 @@ class ReportBaseImage extends ReportBaseElement {
 	 *
 	 * @return float
 	 */
-	function getWidth($renderer) {
+	public function getWidth($renderer) {
 		return $this->width;
 	}
 }
diff --git a/app/Report/ReportBaseLine.php b/app/Report/ReportBaseLine.php
index a033aa0891..7a3ecc0b34 100644
--- a/app/Report/ReportBaseLine.php
+++ b/app/Report/ReportBaseLine.php
@@ -67,7 +67,7 @@ class ReportBaseLine extends ReportBaseElement {
 	 *
 	 * @return number
 	 */
-	function getHeight($renderer) {
+	public function getHeight($renderer) {
 		return abs($this->y2 - $this->y1);
 	}
 
@@ -76,7 +76,7 @@ class ReportBaseLine extends ReportBaseElement {
 	 *
 	 * @return number
 	 */
-	function getWidth($renderer) {
+	public function getWidth($renderer) {
 		return abs($this->x2 - $this->x1);
 	}
 }
diff --git a/app/Report/ReportBasePageheader.php b/app/Report/ReportBasePageheader.php
index fb72f18e28..a1f482d893 100644
--- a/app/Report/ReportBasePageheader.php
+++ b/app/Report/ReportBasePageheader.php
@@ -34,7 +34,7 @@ class ReportBasePageheader extends ReportBaseElement {
 	/**
 	 * @return integer
 	 */
-	function textBox() {
+	public function textBox() {
 		$this->elements = array();
 
 		return 0;
@@ -47,7 +47,7 @@ class ReportBasePageheader extends ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function addElement($element) {
+	public function addElement($element) {
 		$this->elements[] = $element;
 
 		return 0;
diff --git a/app/Report/ReportBaseText.php b/app/Report/ReportBaseText.php
index 7c5bdac763..4f7bfa4214 100644
--- a/app/Report/ReportBaseText.php
+++ b/app/Report/ReportBaseText.php
@@ -66,7 +66,7 @@ class ReportBaseText extends ReportBaseElement {
 	 *
 	 * @return mixed
 	 */
-	function setWrapWidth($wrapwidth, $cellwidth) {
+	public function setWrapWidth($wrapwidth, $cellwidth) {
 		$this->wrapWidthCell = $cellwidth;
 		if (strpos($this->text, "\n") !== false) {
 			$this->wrapWidthRemaining = $cellwidth;
@@ -80,7 +80,7 @@ class ReportBaseText extends ReportBaseElement {
 	/**
 	 * @return string
 	 */
-	function getStyleName() {
+	public function getStyleName() {
 		return $this->styleName;
 	}
 }
diff --git a/app/Report/ReportBaseTextbox.php b/app/Report/ReportBaseTextbox.php
index f5df6c2eb5..6d84743b58 100644
--- a/app/Report/ReportBaseTextbox.php
+++ b/app/Report/ReportBaseTextbox.php
@@ -160,7 +160,7 @@ class ReportBaseTextbox extends ReportBaseElement {
 	 *
 	 * @return integer
 	 */
-	function addElement($element) {
+	public function addElement($element) {
 		$this->elements[] = $element;
 
 		return 0;
diff --git a/app/Report/ReportHtml.php b/app/Report/ReportHtml.php
index f34c408cff..987ab7cc41 100644
--- a/app/Report/ReportHtml.php
+++ b/app/Report/ReportHtml.php
@@ -130,7 +130,7 @@ class ReportHtml extends ReportBase {
 	/**
 	 * HTML Setup - ReportHtml
 	 */
-	function setup() {
+	public function setup() {
 		parent::setup();
 
 		// Setting up the correct dimensions if Portrait (default) or Landscape
@@ -163,7 +163,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return mixed
 	 */
-	function addElement($element) {
+	public function addElement($element) {
 		if ($this->processing == "B") {
 			return $this->bodyElements[] = $element;
 		} elseif ($this->processing == "H") {
@@ -176,7 +176,7 @@ class ReportHtml extends ReportBase {
 	/**
 	 *
 	 */
-	function runPageHeader() {
+	public function runPageHeader() {
 		foreach ($this->pageHeaderElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -191,7 +191,7 @@ class ReportHtml extends ReportBase {
 	/**
 	 *
 	 */
-	function footnotes() {
+	public function footnotes() {
 		$this->currentStyle = "";
 		if (!empty($this->printedfootnotes)) {
 			foreach ($this->printedfootnotes as $element) {
@@ -203,7 +203,7 @@ class ReportHtml extends ReportBase {
 	/**
 	 *
 	 */
-	function run() {
+	public function run() {
 		$controller = new SimpleController;
 		$controller
 			->setPageTitle($this->title)
@@ -306,7 +306,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return object ReportHtmlCell
 	 */
-	function createCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth) {
+	public function createCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth) {
 		return new ReportHtmlCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
 	}
 
@@ -326,7 +326,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return ReportHtmlTextbox
 	 */
-	function createTextBox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth) {
+	public function createTextBox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth) {
 		return new ReportHtmlTextbox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth);
 	}
 
@@ -336,7 +336,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return ReportHtmlText
 	 */
-	function createText($style, $color) {
+	public function createText($style, $color) {
 		return new ReportHtmlText($style, $color);
 	}
 
@@ -345,14 +345,14 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return ReportHtmlFootnote
 	 */
-	function createFootnote($style = "") {
+	public function createFootnote($style = "") {
 		return new ReportHtmlFootnote($style);
 	}
 
 	/**
 	 * @return ReportHtmlPageheader
 	 */
-	function createPageHeader() {
+	public function createPageHeader() {
 		return new ReportHtmlPageheader;
 	}
 
@@ -367,7 +367,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return ReportHtmlImage
 	 */
-	function createImage($file, $x, $y, $w, $h, $align, $ln) {
+	public function createImage($file, $x, $y, $w, $h, $align, $ln) {
 		return new ReportHtmlImage($file, $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -382,7 +382,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return ReportHtmlImage
 	 */
-	function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln) {
+	public function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln) {
 		return new ReportHtmlImage($mediaobject->getHtmlUrlDirect('thumb'), $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -394,7 +394,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return ReportHtmlLine
 	 */
-	function createLine($x1, $y1, $x2, $y2) {
+	public function createLine($x1, $y1, $x2, $y2) {
 		return new ReportHtmlLine($x1, $y1, $x2, $y2);
 	}
 
@@ -404,14 +404,14 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return ReportHtmlHtml
 	 */
-	function createHTML($tag, $attrs) {
+	public function createHTML($tag, $attrs) {
 		return new ReportHtmlHtml($tag, $attrs);
 	}
 
 	/**
 	 * Clear the Header - ReportHtml
 	 */
-	function clearHeader() {
+	public function clearHeader() {
 		$this->headerElements = array();
 	}
 
@@ -422,7 +422,7 @@ class ReportHtml extends ReportBase {
 	/**
 	 * Update the Page Number and set a new Y if max Y is larger - ReportHtml
 	 */
-	function addPage() {
+	public function addPage() {
 		$this->pageN++;
 		// Add a little margin to max Y "between pages"
 		$this->maxY += 10;
@@ -441,7 +441,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @param float $y
 	 */
-	function addMaxY($y) {
+	public function addMaxY($y) {
 		if ($this->maxY < $y) {
 			$this->maxY = $y;
 		}
@@ -452,7 +452,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return integer
 	 */
-	function addPageHeader($element) {
+	public function addPageHeader($element) {
 		$this->pageHeaderElements[] = $element;
 		return count($this->headerElements) - 1;
 	}
@@ -464,7 +464,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return boolean false if not numbered before | object if already numbered
 	 */
-	function checkFootnote($footnote) {
+	public function checkFootnote($footnote) {
 		$ct = count($this->printedfootnotes);
 		$i = 0;
 		$val = $footnote->getValue();
@@ -487,7 +487,7 @@ class ReportHtml extends ReportBase {
 	/**
 	 * Clear the Page Header - ReportHtml
 	 */
-	function clearPageHeader() {
+	public function clearPageHeader() {
 		$this->pageHeaderElements = array();
 	}
 
@@ -498,7 +498,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return integer Number of lines. 0 if empty line
 	 */
-	function countLines($str) {
+	public function countLines($str) {
 		if ($str == "") {
 			return 0;
 		}
@@ -508,14 +508,14 @@ class ReportHtml extends ReportBase {
 	/**
 	 * @return string
 	 */
-	function getCurrentStyle() {
+	public function getCurrentStyle() {
 		return $this->currentStyle;
 	}
 
 	/**
 	 * @return integer
 	 */
-	function getCurrentStyleHeight() {
+	public function getCurrentStyleHeight() {
 		if (empty($this->currentStyle)) {
 			return $this->defaultFontSize;
 		}
@@ -528,7 +528,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return integer
 	 */
-	function getFootnotesHeight($cellWidth) {
+	public function getFootnotesHeight($cellWidth) {
 		$h = 0;
 		foreach ($this->printedfootnotes as $element) {
 			$h += $element->getFootnoteHeight($this, $cellWidth);
@@ -541,14 +541,14 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return float
 	 */
-	function getRemainingWidth() {
+	public function getRemainingWidth() {
 		return $this->noMarginWidth - $this->X;
 	}
 
 	/**
 	 * @return float
 	 */
-	function getPageHeight() {
+	public function getPageHeight() {
 		return $this->pageh - $this->topmargin;
 	}
 
@@ -557,7 +557,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return integer
 	 */
-	function getStringWidth($text) {
+	public function getStringWidth($text) {
 		$style = $this->getStyle($this->currentStyle);
 		return mb_strlen($text) * ($style['size'] / 2);
 	}
@@ -569,7 +569,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return integer
 	 */
-	function getTextCellHeight($str) {
+	public function getTextCellHeight($str) {
 		// Count the number of lines to calculate the height
 		$nl = $this->countLines($str);
 		// Calculate the cell height
@@ -581,7 +581,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return float
 	 */
-	function getX() {
+	public function getX() {
 		return $this->X;
 	}
 
@@ -590,7 +590,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return float
 	 */
-	function getY() {
+	public function getY() {
 		return $this->Y;
 	}
 
@@ -599,14 +599,14 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return integer
 	 */
-	function pageNo() {
+	public function pageNo() {
 		return $this->pageN;
 	}
 
 	/**
 	 * @param $s
 	 */
-	function setCurrentStyle($s) {
+	public function setCurrentStyle($s) {
 		$this->currentStyle = $s;
 	}
 
@@ -615,7 +615,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @param float $x
 	 */
-	function setX($x) {
+	public function setX($x) {
 		$this->X = $x;
 	}
 
@@ -626,7 +626,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @param float $y
 	 */
-	function setY($y) {
+	public function setY($y) {
 		$this->Y = $y;
 		if ($this->maxY < $y) {
 			$this->maxY = $y;
@@ -641,7 +641,7 @@ class ReportHtml extends ReportBase {
 	 * @param float $x
 	 * @param float $y
 	 */
-	function setXy($x, $y) {
+	public function setXy($x, $y) {
 		$this->setX($x);
 		$this->setY($y);
 	}
@@ -654,7 +654,7 @@ class ReportHtml extends ReportBase {
 	 *
 	 * @return string
 	 */
-	function textWrap($str, $width) {
+	public function textWrap($str, $width) {
 		// Calculate the line width
 		$lw = (int) ($width / ($this->getCurrentStyleHeight() / 2));
 		// Wordwrap each line
@@ -681,7 +681,7 @@ class ReportHtml extends ReportBase {
 	 * @param string  $color HTML RGB color code (Ex: #001122)
 	 * @param boolean $useclass
 	 */
-	function write($text, $color = '', $useclass = true) {
+	public function write($text, $color = '', $useclass = true) {
 		$style = $this->getStyle($this->getCurrentStyle());
 		$htmlcode = '<span dir="' . I18N::direction() . '"';
 		if ($useclass) {
diff --git a/app/Report/ReportHtmlCell.php b/app/Report/ReportHtmlCell.php
index 5800eca193..f0acc03e45 100644
--- a/app/Report/ReportHtmlCell.php
+++ b/app/Report/ReportHtmlCell.php
@@ -27,7 +27,7 @@ class ReportHtmlCell extends ReportBaseCell {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		if (strpos($this->text, "{{:ptp:}}") !== false) {
 			return;
 		}
diff --git a/app/Report/ReportHtmlFootnote.php b/app/Report/ReportHtmlFootnote.php
index db78fe4ebd..cdc565ec13 100644
--- a/app/Report/ReportHtmlFootnote.php
+++ b/app/Report/ReportHtmlFootnote.php
@@ -27,7 +27,7 @@ class ReportHtmlFootnote extends ReportBaseFootnote {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		$renderer->setCurrentStyle("footnotenum");
 		echo "<a href=\"#footnote", $this->num, "\"><sup>";
 		$renderer->write($renderer->entityRTL . $this->num);
@@ -42,7 +42,7 @@ class ReportHtmlFootnote extends ReportBaseFootnote {
 	 *
 	 * @return void
 	 */
-	function renderFootnote($html) {
+	public function renderFootnote($html) {
 
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);
@@ -66,7 +66,7 @@ class ReportHtmlFootnote extends ReportBaseFootnote {
 	 *
 	 * @return integer   Footnote height in points
 	 */
-	function getFootnoteHeight($html, $cellWidth = 0) {
+	public function getFootnoteHeight($html, $cellWidth = 0) {
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);
 		}
@@ -88,7 +88,7 @@ class ReportHtmlFootnote extends ReportBaseFootnote {
 	 *
 	 * @return array
 	 */
-	function getWidth($html) {
+	public function getWidth($html) {
 		// Setup the style name
 		$html->setCurrentStyle("footnotenum");
 
diff --git a/app/Report/ReportHtmlHtml.php b/app/Report/ReportHtmlHtml.php
index a34d5bdafe..ff6546b47a 100644
--- a/app/Report/ReportHtmlHtml.php
+++ b/app/Report/ReportHtmlHtml.php
@@ -27,7 +27,7 @@ class ReportHtmlHtml extends ReportBaseHtml {
 	 *
 	 * @return string
 	 */
-	function render($renderer, $sub = false, $inat = true) {
+	public function render($renderer, $sub = false, $inat = true) {
 		if (!empty($this->attrs["wt_style"])) {
 			$renderer->setCurrentStyle($this->attrs["wt_style"]);
 		}
diff --git a/app/Report/ReportHtmlImage.php b/app/Report/ReportHtmlImage.php
index 3294428504..e8ad0bc8e5 100644
--- a/app/Report/ReportHtmlImage.php
+++ b/app/Report/ReportHtmlImage.php
@@ -27,7 +27,7 @@ class ReportHtmlImage extends ReportBaseImage {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
 
 		// Get the current positions
@@ -83,7 +83,7 @@ class ReportHtmlImage extends ReportBaseImage {
 	 *
 	 * @return float
 	 */
-	function getHeight($html) {
+	public function getHeight($html) {
 		return $this->height + ($html->cPadding * 2);
 	}
 
diff --git a/app/Report/ReportHtmlLine.php b/app/Report/ReportHtmlLine.php
index 17bb6f89dd..16d4d1a7e5 100644
--- a/app/Report/ReportHtmlLine.php
+++ b/app/Report/ReportHtmlLine.php
@@ -27,7 +27,7 @@ class ReportHtmlLine extends ReportBaseLine {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		if ($this->x1 == '.') {
 			$this->x1 = $renderer->getX();
 		}
diff --git a/app/Report/ReportHtmlPageheader.php b/app/Report/ReportHtmlPageheader.php
index 01056f9d36..cbdd4aece9 100644
--- a/app/Report/ReportHtmlPageheader.php
+++ b/app/Report/ReportHtmlPageheader.php
@@ -25,7 +25,7 @@ class ReportHtmlPageheader extends ReportBasePageheader {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		$renderer->clearPageHeader();
 		foreach ($this->elements as $element) {
 			$renderer->addPageHeader($element);
diff --git a/app/Report/ReportHtmlText.php b/app/Report/ReportHtmlText.php
index e8fefd19ae..18a42091cb 100644
--- a/app/Report/ReportHtmlText.php
+++ b/app/Report/ReportHtmlText.php
@@ -27,7 +27,7 @@ class ReportHtmlText extends ReportBaseText {
 	 *
 	 * @return void
 	 */
-	function render($renderer, $curx = 0, $attrib = true) {
+	public function render($renderer, $curx = 0, $attrib = true) {
 
 		// Setup the style name
 		if ($renderer->getCurrentStyle() != $this->styleName) {
@@ -79,7 +79,7 @@ class ReportHtmlText extends ReportBaseText {
 	 *
 	 * @return float
 	 */
-	function getHeight($html) {
+	public function getHeight($html) {
 		$ct = substr_count($this->text, "\n");
 		if ($ct > 0) {
 			$ct += 1;
@@ -95,7 +95,7 @@ class ReportHtmlText extends ReportBaseText {
 	 *
 	 * @return array
 	 */
-	function getWidth($html) {
+	public function getWidth($html) {
 		// Setup the style name
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);
diff --git a/app/Report/ReportHtmlTextbox.php b/app/Report/ReportHtmlTextbox.php
index 9ce170a35c..a379631c3a 100644
--- a/app/Report/ReportHtmlTextbox.php
+++ b/app/Report/ReportHtmlTextbox.php
@@ -25,7 +25,7 @@ class ReportHtmlTextbox extends ReportBaseTextbox {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		// checkFootnote
 		$newelements = array();
 		$lastelement = array();
diff --git a/app/Report/ReportPdf.php b/app/Report/ReportPdf.php
index 822697f1ed..d85cde54b3 100644
--- a/app/Report/ReportPdf.php
+++ b/app/Report/ReportPdf.php
@@ -55,7 +55,7 @@ class ReportPdf extends ReportBase {
 	/**
 	 * PDF Setup - ReportPdf
 	 */
-	function setup() {
+	public function setup() {
 		parent::setup();
 
 		// Setup the PDF class with custom size pages because WT supports more page sizes. If WT sends an unknown size name then the default would be A4
@@ -107,7 +107,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return integer
 	 */
-	function addElement($element) {
+	public function addElement($element) {
 		if ($this->processing == "B") {
 			return $this->pdf->addBody($element);
 		} elseif ($this->processing == "H") {
@@ -122,7 +122,7 @@ class ReportPdf extends ReportBase {
 	/**
 	 *
 	 */
-	function run() {
+	public function run() {
 		$this->pdf->body();
 		header('Expires:');
 		header('Pragma:');
@@ -133,14 +133,14 @@ class ReportPdf extends ReportBase {
 	/**
 	 * Clear the Header - ReportPdf
 	 */
-	function clearHeader() {
+	public function clearHeader() {
 		$this->pdf->clearHeader();
 	}
 
 	/**
 	 * Clear the Page Header - ReportPdf
 	 */
-	function clearPageHeader() {
+	public function clearPageHeader() {
 		$this->pdf->clearPageHeader();
 	}
 
@@ -164,7 +164,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfCell
 	 */
-	function createCell(
+	public function createCell(
 		$width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth
 	) {
 		return new ReportPdfCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
@@ -188,7 +188,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfTextbox
 	 */
-	function createTextBox(
+	public function createTextBox(
 		$width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth
 	) {
 		return new ReportPdfTextbox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth);
@@ -202,7 +202,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfText
 	 */
-	function createText($style, $color) {
+	public function createText($style, $color) {
 		return new ReportPdfText($style, $color);
 	}
 
@@ -213,7 +213,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfFootnote
 	 */
-	function createFootnote($style) {
+	public function createFootnote($style) {
 		return new ReportPdfFootnote($style);
 	}
 
@@ -222,7 +222,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfPageheader
 	 */
-	function createPageHeader() {
+	public function createPageHeader() {
 		return new ReportPdfPageheader;
 	}
 
@@ -239,7 +239,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfImage
 	 */
-	function createImage($file, $x, $y, $w, $h, $align, $ln) {
+	public function createImage($file, $x, $y, $w, $h, $align, $ln) {
 		return new ReportPdfImage($file, $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -256,7 +256,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfImage
 	 */
-	function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln) {
+	public function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln) {
 		return new ReportPdfImage($mediaobject->getServerFilename('thumb'), $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -270,7 +270,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfLine
 	 */
-	function createLine($x1, $y1, $x2, $y2) {
+	public function createLine($x1, $y1, $x2, $y2) {
 		return new ReportPdfLine($x1, $y1, $x2, $y2);
 	}
 
@@ -280,7 +280,7 @@ class ReportPdf extends ReportBase {
 	 *
 	 * @return ReportPdfHtml
 	 */
-	function createHTML($tag, $attrs) {
+	public function createHTML($tag, $attrs) {
 		return new ReportPdfHtml($tag, $attrs);
 	}
 }
diff --git a/app/Report/ReportPdfCell.php b/app/Report/ReportPdfCell.php
index 4c1000f9d8..669d03a5f9 100644
--- a/app/Report/ReportPdfCell.php
+++ b/app/Report/ReportPdfCell.php
@@ -27,7 +27,7 @@ class ReportPdfCell extends ReportBaseCell {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 
 		// Set up the text style
 		if (($renderer->getCurrentStyle()) != ($this->styleName)) {
diff --git a/app/Report/ReportPdfFootnote.php b/app/Report/ReportPdfFootnote.php
index 4d0df1e549..a79412b21f 100644
--- a/app/Report/ReportPdfFootnote.php
+++ b/app/Report/ReportPdfFootnote.php
@@ -27,7 +27,7 @@ class ReportPdfFootnote extends ReportBaseFootnote {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		$renderer->setCurrentStyle("footnotenum");
 		$renderer->Write($renderer->getCurrentStyleHeight(), $this->numText, $this->addlink); //source link numbers after name
 	}
@@ -40,7 +40,7 @@ class ReportPdfFootnote extends ReportBaseFootnote {
 	 *
 	 * @return void
 	 */
-	function renderFootnote($pdf) {
+	public function renderFootnote($pdf) {
 		if ($pdf->getCurrentStyle() != $this->styleName) {
 			$pdf->setCurrentStyle($this->styleName);
 		}
@@ -66,7 +66,7 @@ class ReportPdfFootnote extends ReportBaseFootnote {
 	 *
 	 * @return float $h
 	 */
-	function getFootnoteHeight($renderer) {
+	public function getFootnoteHeight($renderer) {
 		return 0;
 	}
 
@@ -78,7 +78,7 @@ class ReportPdfFootnote extends ReportBaseFootnote {
 	 *
 	 * @return array
 	 */
-	function getWidth($pdf) {
+	public function getWidth($pdf) {
 		// Setup the style name, a font must be selected to calculate the width
 		$pdf->setCurrentStyle("footnotenum");
 
diff --git a/app/Report/ReportPdfHtml.php b/app/Report/ReportPdfHtml.php
index a980283662..fced9b1a75 100644
--- a/app/Report/ReportPdfHtml.php
+++ b/app/Report/ReportPdfHtml.php
@@ -26,7 +26,7 @@ class ReportPdfHtml extends ReportBaseHtml {
 	 *
 	 * @return integer|string
 	 */
-	function render($renderer, $sub = false) {
+	public function render($renderer, $sub = false) {
 		if (!empty($this->attrs['style'])) {
 			$renderer->setCurrentStyle($this->attrs['style']);
 		}
diff --git a/app/Report/ReportPdfImage.php b/app/Report/ReportPdfImage.php
index ef5ec5614a..37e9ef7e37 100644
--- a/app/Report/ReportPdfImage.php
+++ b/app/Report/ReportPdfImage.php
@@ -27,7 +27,7 @@ class ReportPdfImage extends ReportBaseImage {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
 
 		// Check for a pagebreak first
@@ -103,7 +103,7 @@ class ReportPdfImage extends ReportBaseImage {
 	 *
 	 * @return float
 	 */
-	function getHeight($pdf) {
+	public function getHeight($pdf) {
 		return $this->height;
 	}
 
@@ -112,7 +112,7 @@ class ReportPdfImage extends ReportBaseImage {
 	 *
 	 * @return float
 	 */
-	function getWidth($pdf) {
+	public function getWidth($pdf) {
 		return $this->width;
 	}
 }
diff --git a/app/Report/ReportPdfLine.php b/app/Report/ReportPdfLine.php
index f00f639a51..d5120e7b00 100644
--- a/app/Report/ReportPdfLine.php
+++ b/app/Report/ReportPdfLine.php
@@ -27,7 +27,7 @@ class ReportPdfLine extends ReportBaseLine {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		if ($this->x1 == ".") {
 			$this->x1 = $renderer->GetX();
 		}
diff --git a/app/Report/ReportPdfPageheader.php b/app/Report/ReportPdfPageheader.php
index 7b43c5a298..fdc502eb28 100644
--- a/app/Report/ReportPdfPageheader.php
+++ b/app/Report/ReportPdfPageheader.php
@@ -27,7 +27,7 @@ class ReportPdfPageheader extends ReportBasePageheader {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		$renderer->clearPageHeader();
 		foreach ($this->elements as $element) {
 			$renderer->addPageHeader($element);
diff --git a/app/Report/ReportPdfText.php b/app/Report/ReportPdfText.php
index 18659ce25f..2655a4a776 100644
--- a/app/Report/ReportPdfText.php
+++ b/app/Report/ReportPdfText.php
@@ -27,7 +27,7 @@ class ReportPdfText extends ReportBaseText {
 	 *
 	 * @return void
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 		// Set up the style
 		if ($renderer->getCurrentStyle() != $this->styleName) {
 			$renderer->setCurrentStyle($this->styleName);
@@ -73,7 +73,7 @@ class ReportPdfText extends ReportBaseText {
 	 *
 	 * @return float 0
 	 */
-	function getHeight($pdf) {
+	public function getHeight($pdf) {
 		return 0;
 	}
 
@@ -84,7 +84,7 @@ class ReportPdfText extends ReportBaseText {
 	 *
 	 * @return array
 	 */
-	function getWidth($pdf) {
+	public function getWidth($pdf) {
 		// Setup the style name, a font must be selected to calculate the width
 		if ($pdf->getCurrentStyle() != $this->styleName) {
 			$pdf->setCurrentStyle($this->styleName);
diff --git a/app/Report/ReportPdfTextbox.php b/app/Report/ReportPdfTextbox.php
index fdf76fb8ac..799804c45a 100644
--- a/app/Report/ReportPdfTextbox.php
+++ b/app/Report/ReportPdfTextbox.php
@@ -27,7 +27,7 @@ class ReportPdfTextbox extends ReportBaseTextbox {
 	 *
 	 * @return boolean|integer
 	 */
-	function render($renderer) {
+	public function render($renderer) {
 
 		$newelements = array();
 		$lastelement = "";
diff --git a/app/Report/ReportTcpdf.php b/app/Report/ReportTcpdf.php
index 38db60d1a1..acc19b9672 100644
--- a/app/Report/ReportTcpdf.php
+++ b/app/Report/ReportTcpdf.php
@@ -56,7 +56,7 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * PDF Header -PDF
 	 */
-	function header() {
+	public function header() {
 		foreach ($this->headerElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -80,7 +80,7 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * PDF Body -PDF
 	 */
-	function body() {
+	public function body() {
 		$this->AddPage();
 		foreach ($this->bodyElements as $key => $element) {
 			if (is_object($element)) {
@@ -98,7 +98,7 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * PDF Footnotes -PDF
 	 */
-	function footnotes() {
+	public function footnotes() {
 		foreach ($this->printedfootnotes as $element) {
 			if (($this->GetY() + $element->getFootnoteHeight($this)) > $this->getPageHeight()) {
 				$this->AddPage();
@@ -113,7 +113,7 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * PDF Footer -PDF
 	 */
-	function footer() {
+	public function footer() {
 		foreach ($this->footerElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -132,7 +132,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return integer The number of the Header elements
 	 */
-	function addHeader($element) {
+	public function addHeader($element) {
 		$this->headerElements[] = $element;
 
 		return count($this->headerElements) - 1;
@@ -145,7 +145,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return integer The number of the Page Header elements
 	 */
-	function addPageHeader($element) {
+	public function addPageHeader($element) {
 		$this->pageHeaderElements[] = $element;
 
 		return count($this->pageHeaderElements) - 1;
@@ -158,7 +158,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return integer The number of the Body elements
 	 */
-	function addBody($element) {
+	public function addBody($element) {
 		$this->bodyElements[] = $element;
 
 		return count($this->bodyElements) - 1;
@@ -171,7 +171,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return integer The number of the Footer elements
 	 */
-	function addFooter($element) {
+	public function addFooter($element) {
 		$this->footerElements[] = $element;
 
 		return count($this->footerElements) - 1;
@@ -180,35 +180,35 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * @param $index
 	 */
-	function removeHeader($index) {
+	public function removeHeader($index) {
 		unset($this->headerElements[$index]);
 	}
 
 	/**
 	 * @param $index
 	 */
-	function removePageHeader($index) {
+	public function removePageHeader($index) {
 		unset($this->pageHeaderElements[$index]);
 	}
 
 	/**
 	 * @param $index
 	 */
-	function removeBody($index) {
+	public function removeBody($index) {
 		unset($this->bodyElements[$index]);
 	}
 
 	/**
 	 * @param $index
 	 */
-	function removeFooter($index) {
+	public function removeFooter($index) {
 		unset($this->footerElements[$index]);
 	}
 
 	/**
 	 * Clear the Header -PDF
 	 */
-	function clearHeader() {
+	public function clearHeader() {
 		unset($this->headerElements);
 		$this->headerElements = array();
 	}
@@ -216,7 +216,7 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * Clear the Page Header -PDF
 	 */
-	function clearPageHeader() {
+	public function clearPageHeader() {
 		unset($this->pageHeaderElements);
 		$this->pageHeaderElements = array();
 	}
@@ -224,7 +224,7 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * @param $r
 	 */
-	function setReport($r) {
+	public function setReport($r) {
 		$this->wt_report = $r;
 	}
 
@@ -233,7 +233,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return string
 	 */
-	function getCurrentStyle() {
+	public function getCurrentStyle() {
 		return $this->currentStyle;
 	}
 
@@ -242,7 +242,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @param string $s Style name
 	 */
-	function setCurrentStyle($s) {
+	public function setCurrentStyle($s) {
 		$this->currentStyle = $s;
 		$style = $this->wt_report->getStyle($s);
 		$this->SetFont($style['font'], $style['style'], $style['size']);
@@ -255,7 +255,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return array
 	 */
-	function getStyle($s) {
+	public function getStyle($s) {
 		if (!isset($this->wt_report->Styles[$s])) {
 			$s = $this->getCurrentStyle();
 			$this->wt_report->Styles[$s] = $s;
@@ -272,7 +272,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return float
 	 */
-	function addMarginX($x) {
+	public function addMarginX($x) {
 		$m = $this->getMargins();
 		if ($this->getRTL()) {
 			$x += $m['right'];
@@ -290,7 +290,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return float
 	 */
-	function getMaxLineWidth() {
+	public function getMaxLineWidth() {
 		$m = $this->getMargins();
 		if ($this->getRTL()) {
 			return ($this->getRemainingWidth() + $m['right']);
@@ -302,7 +302,7 @@ class ReportTcpdf extends TCPDF {
 	/**
 	 * @return integer
 	 */
-	function getFootnotesHeight() {
+	public function getFootnotesHeight() {
 		$h = 0;
 		foreach ($this->printedfootnotes as $element) {
 			$h += $element->getHeight($this);
@@ -316,7 +316,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return integer
 	 */
-	function getCurrentStyleHeight() {
+	public function getCurrentStyleHeight() {
 		if (empty($this->currentStyle)) {
 			return $this->wt_report->defaultFontSize;
 		}
@@ -332,7 +332,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return boolean false if not numbered befor | object if already numbered
 	 */
-	function checkFootnote($footnote) {
+	public function checkFootnote($footnote) {
 		$ct = count($this->printedfootnotes);
 		$val = $footnote->getValue();
 		$i = 0;
@@ -358,7 +358,7 @@ class ReportTcpdf extends TCPDF {
 	 * Used this function instead of AddPage()
 	 * This function will make sure that images will not be overwritten
 	 */
-	function newPage() {
+	public function newPage() {
 		if ($this->lastpicpage > $this->getPage()) {
 			$this->setPage($this->lastpicpage);
 		}
@@ -377,7 +377,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return boolean true in case of page break, false otherwise
 	 */
-	function checkPageBreakPDF($height) {
+	public function checkPageBreakPDF($height) {
 		return $this->checkPageBreak($height);
 	}
 
@@ -386,7 +386,7 @@ class ReportTcpdf extends TCPDF {
 	 *
 	 * @return float Remaining width
 	 */
-	function getRemainingWidthPDF() {
+	public function getRemainingWidthPDF() {
 		return $this->getRemainingWidth();
 	}
 }
diff --git a/app/Soundex.php b/app/Soundex.php
index 3f4e4f6cca..d09de7bc7a 100644
--- a/app/Soundex.php
+++ b/app/Soundex.php
@@ -165,517 +165,517 @@ class Soundex {
 	 * @var string[][]
 	 */
 	private static $dmsounds = array(
-		'A' => array('1', '0', '', ''), 
-		'À' => array('1', '0', '', ''), 
-		'Á' => array('1', '0', '', ''), 
-		'Â' => array('1', '0', '', ''), 
-		'Ã' => array('1', '0', '', ''), 
-		'Ä' => array('1', '0', '1', '', '0', '', ''), 
-		'Å' => array('1', '0', '', ''), 
-		'Ă' => array('1', '0', '', ''), 
-		'Ą' => array('1', '', '', '', '', '', '6'), 
-		'Ạ' => array('1', '0', '', ''), 
-		'Ả' => array('1', '0', '', ''), 
-		'Ấ' => array('1', '0', '', ''), 
-		'Ầ' => array('1', '0', '', ''), 
-		'Ẩ' => array('1', '0', '', ''), 
-		'Ẫ' => array('1', '0', '', ''), 
-		'Ậ' => array('1', '0', '', ''), 
-		'Ắ' => array('1', '0', '', ''), 
-		'Ằ' => array('1', '0', '', ''), 
-		'Ẳ' => array('1', '0', '', ''), 
-		'Ẵ' => array('1', '0', '', ''), 
-		'Ặ' => array('1', '0', '', ''), 
-		'AE' => array('1', '0', '1', ''), 
-		'Æ' => array('1', '0', '1', ''), 
-		'AI' => array('1', '0', '1', ''), 
-		'AJ' => array('1', '0', '1', ''), 
-		'AU' => array('1', '0', '7', ''), 
-		'AV' => array('1', '0', '7', '', '7', '7', '7'), 
-		'ÄU' => array('1', '0', '1', ''), 
-		'AY' => array('1', '0', '1', ''), 
-		'B' => array('0', '7', '7', '7'), 
-		'C' => array('0', '5', '5', '5', '34', '4', '4'), 
-		'Ć' => array('0', '4', '4', '4'), 
-		'Č' => array('0', '4', '4', '4'), 
-		'Ç' => array('0', '4', '4', '4'), 
-		'CH' => array('0', '5', '5', '5', '34', '4', '4'), 
-		'CHS' => array('0', '5', '54', '54'), 
-		'CK' => array('0', '5', '5', '5', '45', '45', '45'), 
-		'CCS' => array('0', '4', '4', '4'), 
-		'CS' => array('0', '4', '4', '4'), 
-		'CSZ' => array('0', '4', '4', '4'), 
-		'CZ' => array('0', '4', '4', '4'), 
-		'CZS' => array('0', '4', '4', '4'), 
-		'D' => array('0', '3', '3', '3'), 
-		'Ď' => array('0', '3', '3', '3'), 
-		'Đ' => array('0', '3', '3', '3'), 
-		'DRS' => array('0', '4', '4', '4'), 
-		'DRZ' => array('0', '4', '4', '4'), 
-		'DS' => array('0', '4', '4', '4'), 
-		'DSH' => array('0', '4', '4', '4'), 
-		'DSZ' => array('0', '4', '4', '4'), 
-		'DT' => array('0', '3', '3', '3'), 
-		'DDZ' => array('0', '4', '4', '4'), 
-		'DDZS' => array('0', '4', '4', '4'), 
-		'DZ' => array('0', '4', '4', '4'), 
-		'DŹ' => array('0', '4', '4', '4'), 
-		'DŻ' => array('0', '4', '4', '4'), 
-		'DZH' => array('0', '4', '4', '4'), 
-		'DZS' => array('0', '4', '4', '4'), 
-		'E' => array('1', '0', '', ''), 
-		'È' => array('1', '0', '', ''), 
-		'É' => array('1', '0', '', ''), 
-		'Ê' => array('1', '0', '', ''), 
-		'Ë' => array('1', '0', '', ''), 
-		'Ĕ' => array('1', '0', '', ''), 
-		'Ė' => array('1', '0', '', ''), 
-		'Ę' => array('1', '', '', '6', '', '', ''), 
-		'Ẹ' => array('1', '0', '', ''), 
-		'Ẻ' => array('1', '0', '', ''), 
-		'Ẽ' => array('1', '0', '', ''), 
-		'Ế' => array('1', '0', '', ''), 
-		'Ề' => array('1', '0', '', ''), 
-		'Ể' => array('1', '0', '', ''), 
-		'Ễ' => array('1', '0', '', ''), 
-		'Ệ' => array('1', '0', '', ''), 
-		'EAU' => array('1', '0', '', ''), 
-		'EI' => array('1', '0', '1', ''), 
-		'EJ' => array('1', '0', '1', ''), 
-		'EU' => array('1', '1', '1', ''), 
-		'EY' => array('1', '0', '1', ''), 
-		'F' => array('0', '7', '7', '7'), 
-		'FB' => array('0', '7', '7', '7'), 
-		'G' => array('0', '5', '5', '5', '34', '4', '4'), 
-		'Ğ' => array('0', '', '', ''), 
-		'GGY' => array('0', '5', '5', '5'), 
-		'GY' => array('0', '5', '5', '5'), 
-		'H' => array('0', '5', '5', '', '5', '5', '5'), 
-		'I' => array('1', '0', '', ''), 
-		'Ì' => array('1', '0', '', ''), 
-		'Í' => array('1', '0', '', ''), 
-		'Î' => array('1', '0', '', ''), 
-		'Ï' => array('1', '0', '', ''), 
-		'Ĩ' => array('1', '0', '', ''), 
-		'Į' => array('1', '0', '', ''), 
-		'İ' => array('1', '0', '', ''), 
-		'Ỉ' => array('1', '0', '', ''), 
-		'Ị' => array('1', '0', '', ''), 
-		'IA' => array('1', '1', '', ''), 
-		'IE' => array('1', '1', '', ''), 
-		'IO' => array('1', '1', '', ''), 
-		'IU' => array('1', '1', '', ''), 
-		'J' => array('0', '1', '', '', '4', '4', '4', '5', '5', ''), 
-		'K' => array('0', '5', '5', '5'), 
-		'KH' => array('0', '5', '5', '5'), 
-		'KS' => array('0', '5', '54', '54'), 
-		'L' => array('0', '8', '8', '8'), 
-		'Ľ' => array('0', '8', '8', '8'), 
-		'Ĺ' => array('0', '8', '8', '8'), 
-		'Ł' => array('0', '7', '7', '7', '8', '8', '8'), 
-		'LL' => array('0', '8', '8', '8', '58', '8', '8', '1', '8', '8'), 
-		'LLY' => array('0', '8', '8', '8', '1', '8', '8'), 
-		'LY' => array('0', '8', '8', '8', '1', '8', '8'), 
-		'M' => array('0', '6', '6', '6'), 
-		'MĔ' => array('0', '66', '66', '66'), 
-		'MN' => array('0', '66', '66', '66'), 
-		'N' => array('0', '6', '6', '6'), 
-		'Ń' => array('0', '6', '6', '6'), 
-		'Ň' => array('0', '6', '6', '6'), 
-		'Ñ' => array('0', '6', '6', '6'), 
-		'NM' => array('0', '66', '66', '66'), 
-		'O' => array('1', '0', '', ''), 
-		'Ò' => array('1', '0', '', ''), 
-		'Ó' => array('1', '0', '', ''), 
-		'Ô' => array('1', '0', '', ''), 
-		'Õ' => array('1', '0', '', ''), 
-		'Ö' => array('1', '0', '', ''), 
-		'Ø' => array('1', '0', '', ''), 
-		'Ő' => array('1', '0', '', ''), 
-		'Œ' => array('1', '0', '', ''), 
-		'Ơ' => array('1', '0', '', ''), 
-		'Ọ' => array('1', '0', '', ''), 
-		'Ỏ' => array('1', '0', '', ''), 
-		'Ố' => array('1', '0', '', ''), 
-		'Ồ' => array('1', '0', '', ''), 
-		'Ổ' => array('1', '0', '', ''), 
-		'Ỗ' => array('1', '0', '', ''), 
-		'Ộ' => array('1', '0', '', ''), 
-		'Ớ' => array('1', '0', '', ''), 
-		'Ờ' => array('1', '0', '', ''), 
-		'Ở' => array('1', '0', '', ''), 
-		'Ỡ' => array('1', '0', '', ''), 
-		'Ợ' => array('1', '0', '', ''), 
-		'OE' => array('1', '0', '', ''), 
-		'OI' => array('1', '0', '1', ''), 
-		'OJ' => array('1', '0', '1', ''), 
-		'OU' => array('1', '0', '', ''), 
-		'OY' => array('1', '0', '1', ''), 
-		'P' => array('0', '7', '7', '7'), 
-		'PF' => array('0', '7', '7', '7'), 
-		'PH' => array('0', '7', '7', '7'), 
-		'Q' => array('0', '5', '5', '5'), 
-		'R' => array('0', '9', '9', '9'), 
-		'Ř' => array('0', '4', '4', '4'), 
-		'RS' => array('0', '4', '4', '4', '94', '94', '94'), 
-		'RZ' => array('0', '4', '4', '4', '94', '94', '94'), 
-		'S' => array('0', '4', '4', '4'), 
-		'Ś' => array('0', '4', '4', '4'), 
-		'Š' => array('0', '4', '4', '4'), 
-		'Ş' => array('0', '4', '4', '4'), 
-		'SC' => array('0', '2', '4', '4'), 
-		'ŠČ' => array('0', '2', '4', '4'), 
-		'SCH' => array('0', '4', '4', '4'), 
-		'SCHD' => array('0', '2', '43', '43'), 
-		'SCHT' => array('0', '2', '43', '43'), 
-		'SCHTCH' => array('0', '2', '4', '4'), 
-		'SCHTSCH' => array('0', '2', '4', '4'), 
-		'SCHTSH' => array('0', '2', '4', '4'), 
-		'SD' => array('0', '2', '43', '43'), 
-		'SH' => array('0', '4', '4', '4'), 
-		'SHCH' => array('0', '2', '4', '4'), 
-		'SHD' => array('0', '2', '43', '43'), 
-		'SHT' => array('0', '2', '43', '43'), 
-		'SHTCH' => array('0', '2', '4', '4'), 
-		'SHTSH' => array('0', '2', '4', '4'), 
-		'ß' => array('0', '', '4', '4'), 
-		'ST' => array('0', '2', '43', '43'), 
-		'STCH' => array('0', '2', '4', '4'), 
-		'STRS' => array('0', '2', '4', '4'), 
-		'STRZ' => array('0', '2', '4', '4'), 
-		'STSCH' => array('0', '2', '4', '4'), 
-		'STSH' => array('0', '2', '4', '4'), 
-		'SSZ' => array('0', '4', '4', '4'), 
-		'SZ' => array('0', '4', '4', '4'), 
-		'SZCS' => array('0', '2', '4', '4'), 
-		'SZCZ' => array('0', '2', '4', '4'), 
-		'SZD' => array('0', '2', '43', '43'), 
-		'SZT' => array('0', '2', '43', '43'), 
-		'T' => array('0', '3', '3', '3'), 
-		'Ť' => array('0', '3', '3', '3'), 
-		'Ţ' => array('0', '3', '3', '3', '4', '4', '4'), 
-		'TC' => array('0', '4', '4', '4'), 
-		'TCH' => array('0', '4', '4', '4'), 
-		'TH' => array('0', '3', '3', '3'), 
-		'TRS' => array('0', '4', '4', '4'), 
-		'TRZ' => array('0', '4', '4', '4'), 
-		'TS' => array('0', '4', '4', '4'), 
-		'TSCH' => array('0', '4', '4', '4'), 
-		'TSH' => array('0', '4', '4', '4'), 
-		'TSZ' => array('0', '4', '4', '4'), 
-		'TTCH' => array('0', '4', '4', '4'), 
-		'TTS' => array('0', '4', '4', '4'), 
-		'TTSCH' => array('0', '4', '4', '4'), 
-		'TTSZ' => array('0', '4', '4', '4'), 
-		'TTZ' => array('0', '4', '4', '4'), 
-		'TZ' => array('0', '4', '4', '4'), 
-		'TZS' => array('0', '4', '4', '4'), 
-		'U' => array('1', '0', '', ''), 
-		'Ù' => array('1', '0', '', ''), 
-		'Ú' => array('1', '0', '', ''), 
-		'Û' => array('1', '0', '', ''), 
-		'Ü' => array('1', '0', '', ''), 
-		'Ũ' => array('1', '0', '', ''), 
-		'Ū' => array('1', '0', '', ''), 
-		'Ů' => array('1', '0', '', ''), 
-		'Ű' => array('1', '0', '', ''), 
-		'Ų' => array('1', '0', '', ''), 
-		'Ư' => array('1', '0', '', ''), 
-		'Ụ' => array('1', '0', '', ''), 
-		'Ủ' => array('1', '0', '', ''), 
-		'Ứ' => array('1', '0', '', ''), 
-		'Ừ' => array('1', '0', '', ''), 
-		'Ử' => array('1', '0', '', ''), 
-		'Ữ' => array('1', '0', '', ''), 
-		'Ự' => array('1', '0', '', ''), 
-		'UE' => array('1', '0', '', ''), 
-		'UI' => array('1', '0', '1', ''), 
-		'UJ' => array('1', '0', '1', ''), 
-		'UY' => array('1', '0', '1', ''), 
-		'UW' => array('1', '0', '1', '', '0', '7', '7'), 
-		'V' => array('0', '7', '7', '7'), 
-		'W' => array('0', '7', '7', '7'), 
-		'X' => array('0', '5', '54', '54'), 
-		'Y' => array('1', '1', '', ''), 
-		'Ý' => array('1', '1', '', ''), 
-		'Ỳ' => array('1', '1', '', ''), 
-		'Ỵ' => array('1', '1', '', ''), 
-		'Ỷ' => array('1', '1', '', ''), 
-		'Ỹ' => array('1', '1', '', ''), 
-		'Z' => array('0', '4', '4', '4'), 
-		'Ź' => array('0', '4', '4', '4'), 
-		'Ż' => array('0', '4', '4', '4'), 
-		'Ž' => array('0', '4', '4', '4'), 
-		'ZD' => array('0', '2', '43', '43'), 
-		'ZDZ' => array('0', '2', '4', '4'), 
-		'ZDZH' => array('0', '2', '4', '4'), 
-		'ZH' => array('0', '4', '4', '4'), 
-		'ZHD' => array('0', '2', '43', '43'), 
-		'ZHDZH' => array('0', '2', '4', '4'), 
-		'ZS' => array('0', '4', '4', '4'), 
-		'ZSCH' => array('0', '4', '4', '4'), 
-		'ZSH' => array('0', '4', '4', '4'), 
-		'ZZS' => array('0', '4', '4', '4'), 
+		'A' => array('1', '0', '', ''),
+		'À' => array('1', '0', '', ''),
+		'Á' => array('1', '0', '', ''),
+		'Â' => array('1', '0', '', ''),
+		'Ã' => array('1', '0', '', ''),
+		'Ä' => array('1', '0', '1', '', '0', '', ''),
+		'Å' => array('1', '0', '', ''),
+		'Ă' => array('1', '0', '', ''),
+		'Ą' => array('1', '', '', '', '', '', '6'),
+		'Ạ' => array('1', '0', '', ''),
+		'Ả' => array('1', '0', '', ''),
+		'Ấ' => array('1', '0', '', ''),
+		'Ầ' => array('1', '0', '', ''),
+		'Ẩ' => array('1', '0', '', ''),
+		'Ẫ' => array('1', '0', '', ''),
+		'Ậ' => array('1', '0', '', ''),
+		'Ắ' => array('1', '0', '', ''),
+		'Ằ' => array('1', '0', '', ''),
+		'Ẳ' => array('1', '0', '', ''),
+		'Ẵ' => array('1', '0', '', ''),
+		'Ặ' => array('1', '0', '', ''),
+		'AE' => array('1', '0', '1', ''),
+		'Æ' => array('1', '0', '1', ''),
+		'AI' => array('1', '0', '1', ''),
+		'AJ' => array('1', '0', '1', ''),
+		'AU' => array('1', '0', '7', ''),
+		'AV' => array('1', '0', '7', '', '7', '7', '7'),
+		'ÄU' => array('1', '0', '1', ''),
+		'AY' => array('1', '0', '1', ''),
+		'B' => array('0', '7', '7', '7'),
+		'C' => array('0', '5', '5', '5', '34', '4', '4'),
+		'Ć' => array('0', '4', '4', '4'),
+		'Č' => array('0', '4', '4', '4'),
+		'Ç' => array('0', '4', '4', '4'),
+		'CH' => array('0', '5', '5', '5', '34', '4', '4'),
+		'CHS' => array('0', '5', '54', '54'),
+		'CK' => array('0', '5', '5', '5', '45', '45', '45'),
+		'CCS' => array('0', '4', '4', '4'),
+		'CS' => array('0', '4', '4', '4'),
+		'CSZ' => array('0', '4', '4', '4'),
+		'CZ' => array('0', '4', '4', '4'),
+		'CZS' => array('0', '4', '4', '4'),
+		'D' => array('0', '3', '3', '3'),
+		'Ď' => array('0', '3', '3', '3'),
+		'Đ' => array('0', '3', '3', '3'),
+		'DRS' => array('0', '4', '4', '4'),
+		'DRZ' => array('0', '4', '4', '4'),
+		'DS' => array('0', '4', '4', '4'),
+		'DSH' => array('0', '4', '4', '4'),
+		'DSZ' => array('0', '4', '4', '4'),
+		'DT' => array('0', '3', '3', '3'),
+		'DDZ' => array('0', '4', '4', '4'),
+		'DDZS' => array('0', '4', '4', '4'),
+		'DZ' => array('0', '4', '4', '4'),
+		'DŹ' => array('0', '4', '4', '4'),
+		'DŻ' => array('0', '4', '4', '4'),
+		'DZH' => array('0', '4', '4', '4'),
+		'DZS' => array('0', '4', '4', '4'),
+		'E' => array('1', '0', '', ''),
+		'È' => array('1', '0', '', ''),
+		'É' => array('1', '0', '', ''),
+		'Ê' => array('1', '0', '', ''),
+		'Ë' => array('1', '0', '', ''),
+		'Ĕ' => array('1', '0', '', ''),
+		'Ė' => array('1', '0', '', ''),
+		'Ę' => array('1', '', '', '6', '', '', ''),
+		'Ẹ' => array('1', '0', '', ''),
+		'Ẻ' => array('1', '0', '', ''),
+		'Ẽ' => array('1', '0', '', ''),
+		'Ế' => array('1', '0', '', ''),
+		'Ề' => array('1', '0', '', ''),
+		'Ể' => array('1', '0', '', ''),
+		'Ễ' => array('1', '0', '', ''),
+		'Ệ' => array('1', '0', '', ''),
+		'EAU' => array('1', '0', '', ''),
+		'EI' => array('1', '0', '1', ''),
+		'EJ' => array('1', '0', '1', ''),
+		'EU' => array('1', '1', '1', ''),
+		'EY' => array('1', '0', '1', ''),
+		'F' => array('0', '7', '7', '7'),
+		'FB' => array('0', '7', '7', '7'),
+		'G' => array('0', '5', '5', '5', '34', '4', '4'),
+		'Ğ' => array('0', '', '', ''),
+		'GGY' => array('0', '5', '5', '5'),
+		'GY' => array('0', '5', '5', '5'),
+		'H' => array('0', '5', '5', '', '5', '5', '5'),
+		'I' => array('1', '0', '', ''),
+		'Ì' => array('1', '0', '', ''),
+		'Í' => array('1', '0', '', ''),
+		'Î' => array('1', '0', '', ''),
+		'Ï' => array('1', '0', '', ''),
+		'Ĩ' => array('1', '0', '', ''),
+		'Į' => array('1', '0', '', ''),
+		'İ' => array('1', '0', '', ''),
+		'Ỉ' => array('1', '0', '', ''),
+		'Ị' => array('1', '0', '', ''),
+		'IA' => array('1', '1', '', ''),
+		'IE' => array('1', '1', '', ''),
+		'IO' => array('1', '1', '', ''),
+		'IU' => array('1', '1', '', ''),
+		'J' => array('0', '1', '', '', '4', '4', '4', '5', '5', ''),
+		'K' => array('0', '5', '5', '5'),
+		'KH' => array('0', '5', '5', '5'),
+		'KS' => array('0', '5', '54', '54'),
+		'L' => array('0', '8', '8', '8'),
+		'Ľ' => array('0', '8', '8', '8'),
+		'Ĺ' => array('0', '8', '8', '8'),
+		'Ł' => array('0', '7', '7', '7', '8', '8', '8'),
+		'LL' => array('0', '8', '8', '8', '58', '8', '8', '1', '8', '8'),
+		'LLY' => array('0', '8', '8', '8', '1', '8', '8'),
+		'LY' => array('0', '8', '8', '8', '1', '8', '8'),
+		'M' => array('0', '6', '6', '6'),
+		'MĔ' => array('0', '66', '66', '66'),
+		'MN' => array('0', '66', '66', '66'),
+		'N' => array('0', '6', '6', '6'),
+		'Ń' => array('0', '6', '6', '6'),
+		'Ň' => array('0', '6', '6', '6'),
+		'Ñ' => array('0', '6', '6', '6'),
+		'NM' => array('0', '66', '66', '66'),
+		'O' => array('1', '0', '', ''),
+		'Ò' => array('1', '0', '', ''),
+		'Ó' => array('1', '0', '', ''),
+		'Ô' => array('1', '0', '', ''),
+		'Õ' => array('1', '0', '', ''),
+		'Ö' => array('1', '0', '', ''),
+		'Ø' => array('1', '0', '', ''),
+		'Ő' => array('1', '0', '', ''),
+		'Œ' => array('1', '0', '', ''),
+		'Ơ' => array('1', '0', '', ''),
+		'Ọ' => array('1', '0', '', ''),
+		'Ỏ' => array('1', '0', '', ''),
+		'Ố' => array('1', '0', '', ''),
+		'Ồ' => array('1', '0', '', ''),
+		'Ổ' => array('1', '0', '', ''),
+		'Ỗ' => array('1', '0', '', ''),
+		'Ộ' => array('1', '0', '', ''),
+		'Ớ' => array('1', '0', '', ''),
+		'Ờ' => array('1', '0', '', ''),
+		'Ở' => array('1', '0', '', ''),
+		'Ỡ' => array('1', '0', '', ''),
+		'Ợ' => array('1', '0', '', ''),
+		'OE' => array('1', '0', '', ''),
+		'OI' => array('1', '0', '1', ''),
+		'OJ' => array('1', '0', '1', ''),
+		'OU' => array('1', '0', '', ''),
+		'OY' => array('1', '0', '1', ''),
+		'P' => array('0', '7', '7', '7'),
+		'PF' => array('0', '7', '7', '7'),
+		'PH' => array('0', '7', '7', '7'),
+		'Q' => array('0', '5', '5', '5'),
+		'R' => array('0', '9', '9', '9'),
+		'Ř' => array('0', '4', '4', '4'),
+		'RS' => array('0', '4', '4', '4', '94', '94', '94'),
+		'RZ' => array('0', '4', '4', '4', '94', '94', '94'),
+		'S' => array('0', '4', '4', '4'),
+		'Ś' => array('0', '4', '4', '4'),
+		'Š' => array('0', '4', '4', '4'),
+		'Ş' => array('0', '4', '4', '4'),
+		'SC' => array('0', '2', '4', '4'),
+		'ŠČ' => array('0', '2', '4', '4'),
+		'SCH' => array('0', '4', '4', '4'),
+		'SCHD' => array('0', '2', '43', '43'),
+		'SCHT' => array('0', '2', '43', '43'),
+		'SCHTCH' => array('0', '2', '4', '4'),
+		'SCHTSCH' => array('0', '2', '4', '4'),
+		'SCHTSH' => array('0', '2', '4', '4'),
+		'SD' => array('0', '2', '43', '43'),
+		'SH' => array('0', '4', '4', '4'),
+		'SHCH' => array('0', '2', '4', '4'),
+		'SHD' => array('0', '2', '43', '43'),
+		'SHT' => array('0', '2', '43', '43'),
+		'SHTCH' => array('0', '2', '4', '4'),
+		'SHTSH' => array('0', '2', '4', '4'),
+		'ß' => array('0', '', '4', '4'),
+		'ST' => array('0', '2', '43', '43'),
+		'STCH' => array('0', '2', '4', '4'),
+		'STRS' => array('0', '2', '4', '4'),
+		'STRZ' => array('0', '2', '4', '4'),
+		'STSCH' => array('0', '2', '4', '4'),
+		'STSH' => array('0', '2', '4', '4'),
+		'SSZ' => array('0', '4', '4', '4'),
+		'SZ' => array('0', '4', '4', '4'),
+		'SZCS' => array('0', '2', '4', '4'),
+		'SZCZ' => array('0', '2', '4', '4'),
+		'SZD' => array('0', '2', '43', '43'),
+		'SZT' => array('0', '2', '43', '43'),
+		'T' => array('0', '3', '3', '3'),
+		'Ť' => array('0', '3', '3', '3'),
+		'Ţ' => array('0', '3', '3', '3', '4', '4', '4'),
+		'TC' => array('0', '4', '4', '4'),
+		'TCH' => array('0', '4', '4', '4'),
+		'TH' => array('0', '3', '3', '3'),
+		'TRS' => array('0', '4', '4', '4'),
+		'TRZ' => array('0', '4', '4', '4'),
+		'TS' => array('0', '4', '4', '4'),
+		'TSCH' => array('0', '4', '4', '4'),
+		'TSH' => array('0', '4', '4', '4'),
+		'TSZ' => array('0', '4', '4', '4'),
+		'TTCH' => array('0', '4', '4', '4'),
+		'TTS' => array('0', '4', '4', '4'),
+		'TTSCH' => array('0', '4', '4', '4'),
+		'TTSZ' => array('0', '4', '4', '4'),
+		'TTZ' => array('0', '4', '4', '4'),
+		'TZ' => array('0', '4', '4', '4'),
+		'TZS' => array('0', '4', '4', '4'),
+		'U' => array('1', '0', '', ''),
+		'Ù' => array('1', '0', '', ''),
+		'Ú' => array('1', '0', '', ''),
+		'Û' => array('1', '0', '', ''),
+		'Ü' => array('1', '0', '', ''),
+		'Ũ' => array('1', '0', '', ''),
+		'Ū' => array('1', '0', '', ''),
+		'Ů' => array('1', '0', '', ''),
+		'Ű' => array('1', '0', '', ''),
+		'Ų' => array('1', '0', '', ''),
+		'Ư' => array('1', '0', '', ''),
+		'Ụ' => array('1', '0', '', ''),
+		'Ủ' => array('1', '0', '', ''),
+		'Ứ' => array('1', '0', '', ''),
+		'Ừ' => array('1', '0', '', ''),
+		'Ử' => array('1', '0', '', ''),
+		'Ữ' => array('1', '0', '', ''),
+		'Ự' => array('1', '0', '', ''),
+		'UE' => array('1', '0', '', ''),
+		'UI' => array('1', '0', '1', ''),
+		'UJ' => array('1', '0', '1', ''),
+		'UY' => array('1', '0', '1', ''),
+		'UW' => array('1', '0', '1', '', '0', '7', '7'),
+		'V' => array('0', '7', '7', '7'),
+		'W' => array('0', '7', '7', '7'),
+		'X' => array('0', '5', '54', '54'),
+		'Y' => array('1', '1', '', ''),
+		'Ý' => array('1', '1', '', ''),
+		'Ỳ' => array('1', '1', '', ''),
+		'Ỵ' => array('1', '1', '', ''),
+		'Ỷ' => array('1', '1', '', ''),
+		'Ỹ' => array('1', '1', '', ''),
+		'Z' => array('0', '4', '4', '4'),
+		'Ź' => array('0', '4', '4', '4'),
+		'Ż' => array('0', '4', '4', '4'),
+		'Ž' => array('0', '4', '4', '4'),
+		'ZD' => array('0', '2', '43', '43'),
+		'ZDZ' => array('0', '2', '4', '4'),
+		'ZDZH' => array('0', '2', '4', '4'),
+		'ZH' => array('0', '4', '4', '4'),
+		'ZHD' => array('0', '2', '43', '43'),
+		'ZHDZH' => array('0', '2', '4', '4'),
+		'ZS' => array('0', '4', '4', '4'),
+		'ZSCH' => array('0', '4', '4', '4'),
+		'ZSH' => array('0', '4', '4', '4'),
+		'ZZS' => array('0', '4', '4', '4'),
 		// Cyrillic alphabet
-		'А' => array('1', '0', '', ''), 
-		'Б' => array('0', '7', '7', '7'), 
-		'В' => array('0', '7', '7', '7'), 
-		'Г' => array('0', '5', '5', '5'), 
-		'Д' => array('0', '3', '3', '3'), 
-		'ДЗ' => array('0', '4', '4', '4'), 
-		'Е' => array('1', '0', '', ''), 
-		'Ё' => array('1', '0', '', ''), 
-		'Ж' => array('0', '4', '4', '4'), 
-		'З' => array('0', '4', '4', '4'), 
-		'И' => array('1', '0', '', ''), 
-		'Й' => array('1', '1', '', '', '4', '4', '4'), 
-		'К' => array('0', '5', '5', '5'), 
-		'Л' => array('0', '8', '8', '8'), 
-		'М' => array('0', '6', '6', '6'), 
-		'Н' => array('0', '6', '6', '6'), 
-		'О' => array('1', '0', '', ''), 
-		'П' => array('0', '7', '7', '7'), 
-		'Р' => array('0', '9', '9', '9'), 
-		'РЖ' => array('0', '4', '4', '4'), 
-		'С' => array('0', '4', '4', '4'), 
-		'Т' => array('0', '3', '3', '3'), 
-		'У' => array('1', '0', '', ''), 
-		'Ф' => array('0', '7', '7', '7'), 
-		'Х' => array('0', '5', '5', '5'), 
-		'Ц' => array('0', '4', '4', '4'), 
-		'Ч' => array('0', '4', '4', '4'), 
-		'Ш' => array('0', '4', '4', '4'), 
-		'Щ' => array('0', '2', '4', '4'), 
-		'Ъ' => array('0', '', '', ''), 
-		'Ы' => array('0', '1', '', ''), 
-		'Ь' => array('0', '', '', ''), 
-		'Э' => array('1', '0', '', ''), 
-		'Ю' => array('0', '1', '', ''), 
-		'Я' => array('0', '1', '', ''), 
+		'А' => array('1', '0', '', ''),
+		'Б' => array('0', '7', '7', '7'),
+		'В' => array('0', '7', '7', '7'),
+		'Г' => array('0', '5', '5', '5'),
+		'Д' => array('0', '3', '3', '3'),
+		'ДЗ' => array('0', '4', '4', '4'),
+		'Е' => array('1', '0', '', ''),
+		'Ё' => array('1', '0', '', ''),
+		'Ж' => array('0', '4', '4', '4'),
+		'З' => array('0', '4', '4', '4'),
+		'И' => array('1', '0', '', ''),
+		'Й' => array('1', '1', '', '', '4', '4', '4'),
+		'К' => array('0', '5', '5', '5'),
+		'Л' => array('0', '8', '8', '8'),
+		'М' => array('0', '6', '6', '6'),
+		'Н' => array('0', '6', '6', '6'),
+		'О' => array('1', '0', '', ''),
+		'П' => array('0', '7', '7', '7'),
+		'Р' => array('0', '9', '9', '9'),
+		'РЖ' => array('0', '4', '4', '4'),
+		'С' => array('0', '4', '4', '4'),
+		'Т' => array('0', '3', '3', '3'),
+		'У' => array('1', '0', '', ''),
+		'Ф' => array('0', '7', '7', '7'),
+		'Х' => array('0', '5', '5', '5'),
+		'Ц' => array('0', '4', '4', '4'),
+		'Ч' => array('0', '4', '4', '4'),
+		'Ш' => array('0', '4', '4', '4'),
+		'Щ' => array('0', '2', '4', '4'),
+		'Ъ' => array('0', '', '', ''),
+		'Ы' => array('0', '1', '', ''),
+		'Ь' => array('0', '', '', ''),
+		'Э' => array('1', '0', '', ''),
+		'Ю' => array('0', '1', '', ''),
+		'Я' => array('0', '1', '', ''),
 		// Greek alphabet
-		'Α' => array('1', '0', '', ''), 
-		'Ά' => array('1', '0', '', ''), 
-		'ΑΙ' => array('1', '0', '1', ''), 
-		'ΑΥ' => array('1', '0', '1', ''), 
-		'Β' => array('0', '7', '7', '7'), 
-		'Γ' => array('0', '5', '5', '5'), 
-		'Δ' => array('0', '3', '3', '3'), 
-		'Ε' => array('1', '0', '', ''), 
-		'Έ' => array('1', '0', '', ''), 
-		'ΕΙ' => array('1', '0', '1', ''), 
-		'ΕΥ' => array('1', '1', '1', ''), 
-		'Ζ' => array('0', '4', '4', '4'), 
-		'Η' => array('1', '0', '', ''), 
-		'Ή' => array('1', '0', '', ''), 
-		'Θ' => array('0', '3', '3', '3'), 
-		'Ι' => array('1', '0', '', ''), 
-		'Ί' => array('1', '0', '', ''), 
-		'Ϊ' => array('1', '0', '', ''), 
-		'ΐ' => array('1', '0', '', ''), 
-		'Κ' => array('0', '5', '5', '5'), 
-		'Λ' => array('0', '8', '8', '8'), 
-		'Μ' => array('0', '6', '6', '6'), 
-		'ΜΠ' => array('0', '7', '7', '7'), 
-		'Ν' => array('0', '6', '6', '6'), 
-		'ΝΤ' => array('0', '3', '3', '3'), 
-		'Ξ' => array('0', '5', '54', '54'), 
-		'Ο' => array('1', '0', '', ''), 
-		'Ό' => array('1', '0', '', ''), 
-		'ΟΙ' => array('1', '0', '1', ''), 
-		'ΟΥ' => array('1', '0', '1', ''), 
-		'Π' => array('0', '7', '7', '7'), 
-		'Ρ' => array('0', '9', '9', '9'), 
-		'Σ' => array('0', '4', '4', '4'), 
-		'ς' => array('0', '', '', '4'), 
-		'Τ' => array('0', '3', '3', '3'), 
-		'ΤΖ' => array('0', '4', '4', '4'), 
-		'ΤΣ' => array('0', '4', '4', '4'), 
-		'Υ' => array('1', '1', '', ''), 
-		'Ύ' => array('1', '1', '', ''), 
-		'Ϋ' => array('1', '1', '', ''), 
-		'ΰ' => array('1', '1', '', ''), 
-		'ΥΚ' => array('1', '5', '5', '5'), 
-		'ΥΥ' => array('1', '65', '65', '65'), 
-		'Φ' => array('0', '7', '7', '7'), 
-		'Χ' => array('0', '5', '5', '5'), 
-		'Ψ' => array('0', '7', '7', '7'), 
-		'Ω' => array('1', '0', '', ''), 
-		'Ώ' => array('1', '0', '', ''), 
+		'Α' => array('1', '0', '', ''),
+		'Ά' => array('1', '0', '', ''),
+		'ΑΙ' => array('1', '0', '1', ''),
+		'ΑΥ' => array('1', '0', '1', ''),
+		'Β' => array('0', '7', '7', '7'),
+		'Γ' => array('0', '5', '5', '5'),
+		'Δ' => array('0', '3', '3', '3'),
+		'Ε' => array('1', '0', '', ''),
+		'Έ' => array('1', '0', '', ''),
+		'ΕΙ' => array('1', '0', '1', ''),
+		'ΕΥ' => array('1', '1', '1', ''),
+		'Ζ' => array('0', '4', '4', '4'),
+		'Η' => array('1', '0', '', ''),
+		'Ή' => array('1', '0', '', ''),
+		'Θ' => array('0', '3', '3', '3'),
+		'Ι' => array('1', '0', '', ''),
+		'Ί' => array('1', '0', '', ''),
+		'Ϊ' => array('1', '0', '', ''),
+		'ΐ' => array('1', '0', '', ''),
+		'Κ' => array('0', '5', '5', '5'),
+		'Λ' => array('0', '8', '8', '8'),
+		'Μ' => array('0', '6', '6', '6'),
+		'ΜΠ' => array('0', '7', '7', '7'),
+		'Ν' => array('0', '6', '6', '6'),
+		'ΝΤ' => array('0', '3', '3', '3'),
+		'Ξ' => array('0', '5', '54', '54'),
+		'Ο' => array('1', '0', '', ''),
+		'Ό' => array('1', '0', '', ''),
+		'ΟΙ' => array('1', '0', '1', ''),
+		'ΟΥ' => array('1', '0', '1', ''),
+		'Π' => array('0', '7', '7', '7'),
+		'Ρ' => array('0', '9', '9', '9'),
+		'Σ' => array('0', '4', '4', '4'),
+		'ς' => array('0', '', '', '4'),
+		'Τ' => array('0', '3', '3', '3'),
+		'ΤΖ' => array('0', '4', '4', '4'),
+		'ΤΣ' => array('0', '4', '4', '4'),
+		'Υ' => array('1', '1', '', ''),
+		'Ύ' => array('1', '1', '', ''),
+		'Ϋ' => array('1', '1', '', ''),
+		'ΰ' => array('1', '1', '', ''),
+		'ΥΚ' => array('1', '5', '5', '5'),
+		'ΥΥ' => array('1', '65', '65', '65'),
+		'Φ' => array('0', '7', '7', '7'),
+		'Χ' => array('0', '5', '5', '5'),
+		'Ψ' => array('0', '7', '7', '7'),
+		'Ω' => array('1', '0', '', ''),
+		'Ώ' => array('1', '0', '', ''),
 		// Hebrew alphabet
-		'א' => array('1', '0', '', ''), 
-		'או' => array('1', '0', '7', ''), 
-		'אג' => array('1', '4', '4', '4', '5', '5', '5', '34', '34', '34'), 
-		'בב' => array('0', '7', '7', '7', '77', '77', '77'), 
-		'ב' => array('0', '7', '7', '7'), 
-		'גג' => array('0', '4', '4', '4', '5', '5', '5', '45', '45', '45', '55', '55', '55', '54', '54', '54'), 
-		'גד' => array('0', '43', '43', '43', '53', '53', '53'), 
-		'גה' => array('0', '45', '45', '45', '55', '55', '55'), 
-		'גז' => array('0', '44', '44', '44', '45', '45', '45'), 
-		'גח' => array('0', '45', '45', '45', '55', '55', '55'), 
-		'גכ' => array('0', '45', '45', '45', '55', '55', '55'), 
-		'גך' => array('0', '45', '45', '45', '55', '55', '55'), 
-		'גצ' => array('0', '44', '44', '44', '45', '45', '45'), 
-		'גץ' => array('0', '44', '44', '44', '45', '45', '45'), 
-		'גק' => array('0', '45', '45', '45', '54', '54', '54'), 
-		'גש' => array('0', '44', '44', '44', '54', '54', '54'), 
-		'גת' => array('0', '43', '43', '43', '53', '53', '53'), 
-		'ג' => array('0', '4', '4', '4', '5', '5', '5'), 
-		'דז' => array('0', '4', '4', '4'), 
-		'דד' => array('0', '3', '3', '3', '33', '33', '33'), 
-		'דט' => array('0', '33', '33', '33'), 
-		'דש' => array('0', '4', '4', '4'), 
-		'דצ' => array('0', '4', '4', '4'), 
-		'דץ' => array('0', '4', '4', '4'), 
-		'ד' => array('0', '3', '3', '3'), 
-		'הג' => array('0', '54', '54', '54', '55', '55', '55'), 
-		'הכ' => array('0', '55', '55', '55'), 
-		'הח' => array('0', '55', '55', '55'), 
-		'הק' => array('0', '55', '55', '55', '5', '5', '5'), 
-		'הה' => array('0', '5', '5', '', '55', '55', ''), 
-		'ה' => array('0', '5', '5', ''), 
-		'וי' => array('1', '', '', '', '7', '7', '7'), 
-		'ו' => array('1', '7', '7', '7', '7', '', ''), 
-		'וו' => array('1', '7', '7', '7', '7', '', ''), 
-		'וופ' => array('1', '7', '7', '7', '77', '77', '77'), 
-		'זש' => array('0', '4', '4', '4', '44', '44', '44'), 
-		'זדז' => array('0', '2', '4', '4'), 
-		'ז' => array('0', '4', '4', '4'), 
-		'זג' => array('0', '44', '44', '44', '45', '45', '45'), 
-		'זז' => array('0', '4', '4', '4', '44', '44', '44'), 
-		'זס' => array('0', '44', '44', '44'), 
-		'זצ' => array('0', '44', '44', '44'), 
-		'זץ' => array('0', '44', '44', '44'), 
-		'חג' => array('0', '54', '54', '54', '53', '53', '53'), 
-		'חח' => array('0', '5', '5', '5', '55', '55', '55'), 
-		'חק' => array('0', '55', '55', '55', '5', '5', '5'), 
-		'חכ' => array('0', '45', '45', '45', '55', '55', '55'), 
-		'חס' => array('0', '5', '54', '54'), 
-		'חש' => array('0', '5', '54', '54'), 
-		'ח' => array('0', '5', '5', '5'), 
-		'טש' => array('0', '4', '4', '4'), 
-		'טד' => array('0', '33', '33', '33'), 
-		'טי' => array('0', '3', '3', '3', '4', '4', '4', '3', '3', '34'), 
-		'טת' => array('0', '33', '33', '33'), 
-		'טט' => array('0', '3', '3', '3', '33', '33', '33'), 
-		'ט' => array('0', '3', '3', '3'), 
-		'י' => array('1', '1', '', ''), 
-		'יא' => array('1', '1', '', '', '1', '1', '1'), 
-		'כג' => array('0', '55', '55', '55', '54', '54', '54'), 
-		'כש' => array('0', '5', '54', '54'), 
-		'כס' => array('0', '5', '54', '54'), 
-		'ככ' => array('0', '5', '5', '5', '55', '55', '55'), 
-		'כך' => array('0', '5', '5', '5', '55', '55', '55'), 
-		'כ' => array('0', '5', '5', '5'), 
-		'כח' => array('0', '55', '55', '55', '5', '5', '5'), 
-		'ך' => array('0', '', '5', '5'), 
-		'ל' => array('0', '8', '8', '8'), 
-		'לל' => array('0', '88', '88', '88', '8', '8', '8'), 
-		'מנ' => array('0', '66', '66', '66'), 
-		'מן' => array('0', '66', '66', '66'), 
-		'ממ' => array('0', '6', '6', '6', '66', '66', '66'), 
-		'מם' => array('0', '6', '6', '6', '66', '66', '66'), 
-		'מ' => array('0', '6', '6', '6'), 
-		'ם' => array('0', '', '6', '6'), 
-		'נמ' => array('0', '66', '66', '66'), 
-		'נם' => array('0', '66', '66', '66'), 
-		'ננ' => array('0', '6', '6', '6', '66', '66', '66'), 
-		'נן' => array('0', '6', '6', '6', '66', '66', '66'), 
-		'נ' => array('0', '6', '6', '6'), 
-		'ן' => array('0', '', '6', '6'), 
-		'סתש' => array('0', '2', '4', '4'), 
-		'סתז' => array('0', '2', '4', '4'), 
-		'סטז' => array('0', '2', '4', '4'), 
-		'סטש' => array('0', '2', '4', '4'), 
-		'סצד' => array('0', '2', '4', '4'), 
-		'סט' => array('0', '2', '4', '4', '43', '43', '43'), 
-		'סת' => array('0', '2', '4', '4', '43', '43', '43'), 
-		'סג' => array('0', '44', '44', '44', '4', '4', '4'), 
-		'סס' => array('0', '4', '4', '4', '44', '44', '44'), 
-		'סצ' => array('0', '44', '44', '44'), 
-		'סץ' => array('0', '44', '44', '44'), 
-		'סז' => array('0', '44', '44', '44'), 
-		'סש' => array('0', '44', '44', '44'), 
-		'ס' => array('0', '4', '4', '4'), 
-		'ע' => array('1', '0', '', ''), 
-		'פב' => array('0', '7', '7', '7', '77', '77', '77'), 
-		'פוו' => array('0', '7', '7', '7', '77', '77', '77'), 
-		'פפ' => array('0', '7', '7', '7', '77', '77', '77'), 
-		'פף' => array('0', '7', '7', '7', '77', '77', '77'), 
-		'פ' => array('0', '7', '7', '7'), 
-		'ף' => array('0', '', '7', '7'), 
-		'צג' => array('0', '44', '44', '44', '45', '45', '45'), 
-		'צז' => array('0', '44', '44', '44'), 
-		'צס' => array('0', '44', '44', '44'), 
-		'צצ' => array('0', '4', '4', '4', '5', '5', '5', '44', '44', '44', '54', '54', '54', '45', '45', '45'), 
-		'צץ' => array('0', '4', '4', '4', '5', '5', '5', '44', '44', '44', '54', '54', '54'), 
-		'צש' => array('0', '44', '44', '44', '4', '4', '4', '5', '5', '5'), 
-		'צ' => array('0', '4', '4', '4', '5', '5', '5'), 
-		'ץ' => array('0', '', '4', '4'), 
-		'קה' => array('0', '55', '55', '5'), 
-		'קס' => array('0', '5', '54', '54'), 
-		'קש' => array('0', '5', '54', '54'), 
-		'קק' => array('0', '5', '5', '5', '55', '55', '55'), 
-		'קח' => array('0', '55', '55', '55'), 
-		'קכ' => array('0', '55', '55', '55'), 
-		'קך' => array('0', '55', '55', '55'), 
-		'קג' => array('0', '55', '55', '55', '54', '54', '54'), 
-		'ק' => array('0', '5', '5', '5'), 
-		'רר' => array('0', '99', '99', '99', '9', '9', '9'), 
-		'ר' => array('0', '9', '9', '9'), 
-		'שטז' => array('0', '2', '4', '4'), 
-		'שתש' => array('0', '2', '4', '4'), 
-		'שתז' => array('0', '2', '4', '4'), 
-		'שטש' => array('0', '2', '4', '4'), 
-		'שד' => array('0', '2', '43', '43'), 
-		'שז' => array('0', '44', '44', '44'), 
-		'שס' => array('0', '44', '44', '44'), 
-		'שת' => array('0', '2', '43', '43'), 
-		'שג' => array('0', '4', '4', '4', '44', '44', '44', '4', '43', '43'), 
-		'שט' => array('0', '2', '43', '43', '44', '44', '44'), 
-		'שצ' => array('0', '44', '44', '44', '45', '45', '45'), 
-		'שץ' => array('0', '44', '', '44', '45', '', '45'), 
-		'שש' => array('0', '4', '4', '4', '44', '44', '44'), 
-		'ש' => array('0', '4', '4', '4'), 
-		'תג' => array('0', '34', '34', '34'), 
-		'תז' => array('0', '34', '34', '34'), 
-		'תש' => array('0', '4', '4', '4'), 
-		'תת' => array('0', '3', '3', '3', '4', '4', '4', '33', '33', '33', '44', '44', '44', '34', '34', '34', '43', '43', '43'), 
-		'ת' => array('0', '3', '3', '3', '4', '4', '4'), 
+		'א' => array('1', '0', '', ''),
+		'או' => array('1', '0', '7', ''),
+		'אג' => array('1', '4', '4', '4', '5', '5', '5', '34', '34', '34'),
+		'בב' => array('0', '7', '7', '7', '77', '77', '77'),
+		'ב' => array('0', '7', '7', '7'),
+		'גג' => array('0', '4', '4', '4', '5', '5', '5', '45', '45', '45', '55', '55', '55', '54', '54', '54'),
+		'גד' => array('0', '43', '43', '43', '53', '53', '53'),
+		'גה' => array('0', '45', '45', '45', '55', '55', '55'),
+		'גז' => array('0', '44', '44', '44', '45', '45', '45'),
+		'גח' => array('0', '45', '45', '45', '55', '55', '55'),
+		'גכ' => array('0', '45', '45', '45', '55', '55', '55'),
+		'גך' => array('0', '45', '45', '45', '55', '55', '55'),
+		'גצ' => array('0', '44', '44', '44', '45', '45', '45'),
+		'גץ' => array('0', '44', '44', '44', '45', '45', '45'),
+		'גק' => array('0', '45', '45', '45', '54', '54', '54'),
+		'גש' => array('0', '44', '44', '44', '54', '54', '54'),
+		'גת' => array('0', '43', '43', '43', '53', '53', '53'),
+		'ג' => array('0', '4', '4', '4', '5', '5', '5'),
+		'דז' => array('0', '4', '4', '4'),
+		'דד' => array('0', '3', '3', '3', '33', '33', '33'),
+		'דט' => array('0', '33', '33', '33'),
+		'דש' => array('0', '4', '4', '4'),
+		'דצ' => array('0', '4', '4', '4'),
+		'דץ' => array('0', '4', '4', '4'),
+		'ד' => array('0', '3', '3', '3'),
+		'הג' => array('0', '54', '54', '54', '55', '55', '55'),
+		'הכ' => array('0', '55', '55', '55'),
+		'הח' => array('0', '55', '55', '55'),
+		'הק' => array('0', '55', '55', '55', '5', '5', '5'),
+		'הה' => array('0', '5', '5', '', '55', '55', ''),
+		'ה' => array('0', '5', '5', ''),
+		'וי' => array('1', '', '', '', '7', '7', '7'),
+		'ו' => array('1', '7', '7', '7', '7', '', ''),
+		'וו' => array('1', '7', '7', '7', '7', '', ''),
+		'וופ' => array('1', '7', '7', '7', '77', '77', '77'),
+		'זש' => array('0', '4', '4', '4', '44', '44', '44'),
+		'זדז' => array('0', '2', '4', '4'),
+		'ז' => array('0', '4', '4', '4'),
+		'זג' => array('0', '44', '44', '44', '45', '45', '45'),
+		'זז' => array('0', '4', '4', '4', '44', '44', '44'),
+		'זס' => array('0', '44', '44', '44'),
+		'זצ' => array('0', '44', '44', '44'),
+		'זץ' => array('0', '44', '44', '44'),
+		'חג' => array('0', '54', '54', '54', '53', '53', '53'),
+		'חח' => array('0', '5', '5', '5', '55', '55', '55'),
+		'חק' => array('0', '55', '55', '55', '5', '5', '5'),
+		'חכ' => array('0', '45', '45', '45', '55', '55', '55'),
+		'חס' => array('0', '5', '54', '54'),
+		'חש' => array('0', '5', '54', '54'),
+		'ח' => array('0', '5', '5', '5'),
+		'טש' => array('0', '4', '4', '4'),
+		'טד' => array('0', '33', '33', '33'),
+		'טי' => array('0', '3', '3', '3', '4', '4', '4', '3', '3', '34'),
+		'טת' => array('0', '33', '33', '33'),
+		'טט' => array('0', '3', '3', '3', '33', '33', '33'),
+		'ט' => array('0', '3', '3', '3'),
+		'י' => array('1', '1', '', ''),
+		'יא' => array('1', '1', '', '', '1', '1', '1'),
+		'כג' => array('0', '55', '55', '55', '54', '54', '54'),
+		'כש' => array('0', '5', '54', '54'),
+		'כס' => array('0', '5', '54', '54'),
+		'ככ' => array('0', '5', '5', '5', '55', '55', '55'),
+		'כך' => array('0', '5', '5', '5', '55', '55', '55'),
+		'כ' => array('0', '5', '5', '5'),
+		'כח' => array('0', '55', '55', '55', '5', '5', '5'),
+		'ך' => array('0', '', '5', '5'),
+		'ל' => array('0', '8', '8', '8'),
+		'לל' => array('0', '88', '88', '88', '8', '8', '8'),
+		'מנ' => array('0', '66', '66', '66'),
+		'מן' => array('0', '66', '66', '66'),
+		'ממ' => array('0', '6', '6', '6', '66', '66', '66'),
+		'מם' => array('0', '6', '6', '6', '66', '66', '66'),
+		'מ' => array('0', '6', '6', '6'),
+		'ם' => array('0', '', '6', '6'),
+		'נמ' => array('0', '66', '66', '66'),
+		'נם' => array('0', '66', '66', '66'),
+		'ננ' => array('0', '6', '6', '6', '66', '66', '66'),
+		'נן' => array('0', '6', '6', '6', '66', '66', '66'),
+		'נ' => array('0', '6', '6', '6'),
+		'ן' => array('0', '', '6', '6'),
+		'סתש' => array('0', '2', '4', '4'),
+		'סתז' => array('0', '2', '4', '4'),
+		'סטז' => array('0', '2', '4', '4'),
+		'סטש' => array('0', '2', '4', '4'),
+		'סצד' => array('0', '2', '4', '4'),
+		'סט' => array('0', '2', '4', '4', '43', '43', '43'),
+		'סת' => array('0', '2', '4', '4', '43', '43', '43'),
+		'סג' => array('0', '44', '44', '44', '4', '4', '4'),
+		'סס' => array('0', '4', '4', '4', '44', '44', '44'),
+		'סצ' => array('0', '44', '44', '44'),
+		'סץ' => array('0', '44', '44', '44'),
+		'סז' => array('0', '44', '44', '44'),
+		'סש' => array('0', '44', '44', '44'),
+		'ס' => array('0', '4', '4', '4'),
+		'ע' => array('1', '0', '', ''),
+		'פב' => array('0', '7', '7', '7', '77', '77', '77'),
+		'פוו' => array('0', '7', '7', '7', '77', '77', '77'),
+		'פפ' => array('0', '7', '7', '7', '77', '77', '77'),
+		'פף' => array('0', '7', '7', '7', '77', '77', '77'),
+		'פ' => array('0', '7', '7', '7'),
+		'ף' => array('0', '', '7', '7'),
+		'צג' => array('0', '44', '44', '44', '45', '45', '45'),
+		'צז' => array('0', '44', '44', '44'),
+		'צס' => array('0', '44', '44', '44'),
+		'צצ' => array('0', '4', '4', '4', '5', '5', '5', '44', '44', '44', '54', '54', '54', '45', '45', '45'),
+		'צץ' => array('0', '4', '4', '4', '5', '5', '5', '44', '44', '44', '54', '54', '54'),
+		'צש' => array('0', '44', '44', '44', '4', '4', '4', '5', '5', '5'),
+		'צ' => array('0', '4', '4', '4', '5', '5', '5'),
+		'ץ' => array('0', '', '4', '4'),
+		'קה' => array('0', '55', '55', '5'),
+		'קס' => array('0', '5', '54', '54'),
+		'קש' => array('0', '5', '54', '54'),
+		'קק' => array('0', '5', '5', '5', '55', '55', '55'),
+		'קח' => array('0', '55', '55', '55'),
+		'קכ' => array('0', '55', '55', '55'),
+		'קך' => array('0', '55', '55', '55'),
+		'קג' => array('0', '55', '55', '55', '54', '54', '54'),
+		'ק' => array('0', '5', '5', '5'),
+		'רר' => array('0', '99', '99', '99', '9', '9', '9'),
+		'ר' => array('0', '9', '9', '9'),
+		'שטז' => array('0', '2', '4', '4'),
+		'שתש' => array('0', '2', '4', '4'),
+		'שתז' => array('0', '2', '4', '4'),
+		'שטש' => array('0', '2', '4', '4'),
+		'שד' => array('0', '2', '43', '43'),
+		'שז' => array('0', '44', '44', '44'),
+		'שס' => array('0', '44', '44', '44'),
+		'שת' => array('0', '2', '43', '43'),
+		'שג' => array('0', '4', '4', '4', '44', '44', '44', '4', '43', '43'),
+		'שט' => array('0', '2', '43', '43', '44', '44', '44'),
+		'שצ' => array('0', '44', '44', '44', '45', '45', '45'),
+		'שץ' => array('0', '44', '', '44', '45', '', '45'),
+		'שש' => array('0', '4', '4', '4', '44', '44', '44'),
+		'ש' => array('0', '4', '4', '4'),
+		'תג' => array('0', '34', '34', '34'),
+		'תז' => array('0', '34', '34', '34'),
+		'תש' => array('0', '4', '4', '4'),
+		'תת' => array('0', '3', '3', '3', '4', '4', '4', '33', '33', '33', '44', '44', '44', '34', '34', '34', '43', '43', '43'),
+		'ת' => array('0', '3', '3', '3', '4', '4', '4'),
 		// Arabic alphabet
-		'ا' => array('1', '0', '', ''), 
-		'ب' => array('0', '7', '7', '7'), 
-		'ت' => array('0', '3', '3', '3'), 
-		'ث' => array('0', '3', '3', '3'), 
-		'ج' => array('0', '4', '4', '4'), 
-		'ح' => array('0', '5', '5', '5'), 
-		'خ' => array('0', '5', '5', '5'), 
-		'د' => array('0', '3', '3', '3'), 
-		'ذ' => array('0', '3', '3', '3'), 
-		'ر' => array('0', '9', '9', '9'), 
-		'ز' => array('0', '4', '4', '4'), 
-		'س' => array('0', '4', '4', '4'), 
-		'ش' => array('0', '4', '4', '4'), 
-		'ص' => array('0', '4', '4', '4'), 
-		'ض' => array('0', '3', '3', '3'), 
-		'ط' => array('0', '3', '3', '3'), 
-		'ظ' => array('0', '4', '4', '4'), 
-		'ع' => array('1', '0', '', ''), 
-		'غ' => array('0', '0', '', ''), 
-		'ف' => array('0', '7', '7', '7'), 
-		'ق' => array('0', '5', '5', '5'), 
-		'ك' => array('0', '5', '5', '5'), 
-		'ل' => array('0', '8', '8', '8'), 
-		'لا' => array('0', '8', '8', '8'), 
-		'م' => array('0', '6', '6', '6'), 
-		'ن' => array('0', '6', '6', '6'), 
-		'هن' => array('0', '66', '66', '66'), 
-		'ه' => array('0', '5', '5', ''), 
-		'و' => array('1', '', '', '', '7', '', ''), 
-		'ي' => array('0', '1', '', ''), 
-		'آ' => array('0', '1', '', ''), 
-		'ة' => array('0', '', '', '3'), 
-		'ی' => array('0', '1', '', ''), 
-		'ى' => array('1', '1', '', ''), 
+		'ا' => array('1', '0', '', ''),
+		'ب' => array('0', '7', '7', '7'),
+		'ت' => array('0', '3', '3', '3'),
+		'ث' => array('0', '3', '3', '3'),
+		'ج' => array('0', '4', '4', '4'),
+		'ح' => array('0', '5', '5', '5'),
+		'خ' => array('0', '5', '5', '5'),
+		'د' => array('0', '3', '3', '3'),
+		'ذ' => array('0', '3', '3', '3'),
+		'ر' => array('0', '9', '9', '9'),
+		'ز' => array('0', '4', '4', '4'),
+		'س' => array('0', '4', '4', '4'),
+		'ش' => array('0', '4', '4', '4'),
+		'ص' => array('0', '4', '4', '4'),
+		'ض' => array('0', '3', '3', '3'),
+		'ط' => array('0', '3', '3', '3'),
+		'ظ' => array('0', '4', '4', '4'),
+		'ع' => array('1', '0', '', ''),
+		'غ' => array('0', '0', '', ''),
+		'ف' => array('0', '7', '7', '7'),
+		'ق' => array('0', '5', '5', '5'),
+		'ك' => array('0', '5', '5', '5'),
+		'ل' => array('0', '8', '8', '8'),
+		'لا' => array('0', '8', '8', '8'),
+		'م' => array('0', '6', '6', '6'),
+		'ن' => array('0', '6', '6', '6'),
+		'هن' => array('0', '66', '66', '66'),
+		'ه' => array('0', '5', '5', ''),
+		'و' => array('1', '', '', '', '7', '', ''),
+		'ي' => array('0', '1', '', ''),
+		'آ' => array('0', '1', '', ''),
+		'ة' => array('0', '', '', '3'),
+		'ی' => array('0', '1', '', ''),
+		'ى' => array('1', '1', '', ''),
 	);
 
 	/**
diff --git a/app/Theme/AdministrationTheme.php b/app/Theme/AdministrationTheme.php
index 16208889ba..a33e3ac220 100644
--- a/app/Theme/AdministrationTheme.php
+++ b/app/Theme/AdministrationTheme.php
@@ -208,7 +208,7 @@ class AdministrationTheme extends BaseTheme {
 
 	/** {@inheritdoc} */
 	protected function secondaryMenuContent(array $menus) {
-		return implode('', array_map(function($menu) { return $menu->bootstrap(); }, $menus));
+		return implode('', array_map(function ($menu) { return $menu->bootstrap(); }, $menus));
 	}
 
 	/** {@inheritdoc} */
diff --git a/app/Theme/BaseTheme.php b/app/Theme/BaseTheme.php
index 799c17939b..57eb1b5b04 100644
--- a/app/Theme/BaseTheme.php
+++ b/app/Theme/BaseTheme.php
@@ -818,7 +818,7 @@ abstract class BaseTheme {
 				$event = $individual->getFirstFact($tag);
 				if (!is_null($event)) {
 					$html .= $event->summary();
-					unset ($opt_tags[$key]);
+					unset($opt_tags[$key]);
 				}
 			}
 		}
@@ -828,7 +828,7 @@ abstract class BaseTheme {
 			if ($event) {
 				$html .= $event->summary();
 				if (in_array($deattag, $opt_tags)) {
-					unset ($opt_tags[array_search($deattag, $opt_tags)]);
+					unset($opt_tags[array_search($deattag, $opt_tags)]);
 				}
 				break;
 			}
@@ -907,7 +907,7 @@ abstract class BaseTheme {
 			$this->menuChartTimeline($individual),
 		));
 
-		usort($menus, function(Menu $x, Menu $y) {
+		usort($menus, function (Menu $x, Menu $y) {
 			return I18N::strcasecmp($x->getLabel(), $y->getLabel());
 		});
 
@@ -1059,7 +1059,7 @@ abstract class BaseTheme {
 				$this->menuChartTimeline($individual),
 			));
 
-			usort($submenus, function(Menu $x, Menu $y) {
+			usort($submenus, function (Menu $x, Menu $y) {
 				return I18N::strcasecmp($x->getLabel(), $y->getLabel());
 			});
 
@@ -1397,7 +1397,7 @@ abstract class BaseTheme {
 			}
 		}
 
-		uasort($menulist, function(Menu $x, Menu $y) {
+		uasort($menulist, function (Menu $x, Menu $y) {
 			return I18N::strcasecmp($x->getLabel(), $y->getLabel());
 		});
 
@@ -1687,7 +1687,7 @@ abstract class BaseTheme {
 				$submenus[] = $submenu;
 			}
 
-			usort($submenus, function(Menu $x, Menu $y) {
+			usort($submenus, function (Menu $x, Menu $y) {
 				return I18N::strcasecmp($x->getLabel(), $y->getLabel());
 			});
 
@@ -1943,7 +1943,7 @@ abstract class BaseTheme {
 	 * @return string
 	 */
 	protected function primaryMenuContent(array $menus) {
-		return implode('', array_map(function($menu) { return $menu->getMenuAsList(); }, $menus));
+		return implode('', array_map(function ($menu) { return $menu->getMenuAsList(); }, $menus));
 	}
 
 	/**
@@ -1982,7 +1982,7 @@ abstract class BaseTheme {
 	 * @return string
 	 */
 	protected function secondaryMenuContent(array $menus) {
-		return implode('', array_map(function($menu) { return $menu->getMenuAsList(); }, $menus));
+		return implode('', array_map(function ($menu) { return $menu->getMenuAsList(); }, $menus));
 	}
 
 	/**
diff --git a/app/User.php b/app/User.php
index dfd1603ea6..c635482775 100644
--- a/app/User.php
+++ b/app/User.php
@@ -259,7 +259,7 @@ class User {
 	/**
 	 * Delete a user
 	 */
-	function delete() {
+	public function delete() {
 		// Don't delete the logs.
 		Database::prepare("UPDATE `##log` SET user_id=NULL WHERE user_id =?")->execute(array($this->user_id));
 		// Take over the user’s pending changes. (What else could we do with them?)
diff --git a/includes/functions/functions_date.php b/includes/functions/functions_date.php
index 480f0f0b71..d540dcde7b 100644
--- a/includes/functions/functions_date.php
+++ b/includes/functions/functions_date.php
@@ -35,7 +35,7 @@ function get_age_at_event($age_string, $show_years) {
 			array(
 				'/(\d+)([ymwd])/',
 			),
-			function($match) use ($age_string, $show_years) {
+			function ($match) use ($age_string, $show_years) {
 				switch ($match[2]) {
 				case 'y':
 					if ($show_years || preg_match('/[dm]/', $age_string)) {
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index 3640f4c327..2bb9afb5ef 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -562,23 +562,23 @@ function add_simple_tag($tag, $upperlevel = '', $label = '', $extra = null, Indi
 			echo I18N::translate('yes');
 		}
 
-	} else if ($fact === 'TEMP') {
+	} elseif ($fact === 'TEMP') {
 		echo select_edit_control($element_name, GedcomCodeTemp::templeNames(), I18N::translate('No temple - living ordinance'), $value);
-	} else if ($fact === 'ADOP') {
+	} elseif ($fact === 'ADOP') {
 		echo edit_field_adop($element_name, $value, '', $person);
-	} else if ($fact === 'PEDI') {
+	} elseif ($fact === 'PEDI') {
 		echo edit_field_pedi($element_name, $value, '', $person);
-	} else if ($fact === 'STAT') {
+	} elseif ($fact === 'STAT') {
 		echo select_edit_control($element_name, GedcomCodeStat::statusNames($upperlevel), '', $value);
-	} else if ($fact === 'RELA') {
+	} elseif ($fact === 'RELA') {
 		echo edit_field_rela($element_name, strtolower($value));
-	} else if ($fact === 'QUAY') {
+	} elseif ($fact === 'QUAY') {
 		echo select_edit_control($element_name, GedcomCodeQuay::getValues(), '', $value);
-	} else if ($fact === '_WT_USER') {
+	} elseif ($fact === '_WT_USER') {
 		echo edit_field_username($element_name, $value);
-	} else if ($fact === 'RESN') {
+	} elseif ($fact === 'RESN') {
 		echo edit_field_resn($element_name, $value);
-	} else if ($fact === '_PRIM') {
+	} elseif ($fact === '_PRIM') {
 		echo '<select id="', $element_id, '" name="', $element_name, '" >';
 		echo '<option value=""></option>';
 		echo '<option value="Y" ';
@@ -593,7 +593,7 @@ function add_simple_tag($tag, $upperlevel = '', $label = '', $extra = null, Indi
 		echo '>', /* I18N: option in list box “never use this image” */ I18N::translate('never'), '</option>';
 		echo '</select>';
 		echo '<p class="small text-muted">', I18N::translate('Use this image for charts and on the individual’s page.'), '</p>';
-	} else if ($fact === 'SEX') {
+	} elseif ($fact === 'SEX') {
 		echo '<select id="', $element_id, '" name="', $element_name, '"><option value="M" ';
 		if ($value === 'M') {
 			echo 'selected';
@@ -607,7 +607,7 @@ function add_simple_tag($tag, $upperlevel = '', $label = '', $extra = null, Indi
 			echo 'selected';
 		}
 		echo '>', I18N::translateContext('unknown gender', 'Unknown'), '</option></select>';
-	} else if ($fact === 'TYPE' && $level === 3) {
+	} elseif ($fact === 'TYPE' && $level === 3) {
 		//-- Build the selector for the Media 'TYPE' Fact
 		echo '<select name="text[]"><option selected value="" ></option>';
 		$selectedValue = strtolower($value);
@@ -622,7 +622,7 @@ function add_simple_tag($tag, $upperlevel = '', $label = '', $extra = null, Indi
 			echo '>', $typeValue, '</option>';
 		}
 		echo '</select>';
-	} else if (($fact === 'NAME' && $upperlevel !== 'REPO') || $fact === '_MARNM') {
+	} elseif (($fact === 'NAME' && $upperlevel !== 'REPO') || $fact === '_MARNM') {
 		// Populated in javascript from sub-tags
 		echo '<input type="hidden" id="', $element_id, '" name="', $element_name, '" onchange="updateTextName(\'', $element_id, '\');" value="', Filter::escapeHtml($value), '" class="', $fact, '">';
 		echo '<span id="', $element_id, '_display" dir="auto">', Filter::escapeHtml($value), '</span>';
@@ -1607,11 +1607,11 @@ function insert_missing_subtags($level1tag, $add_date = false) {
 				add_simple_tag('2 ' . $key . ' ' . strtoupper(date('d M Y')), $level1tag);
 			} elseif ($level1tag === '_TODO' && $key === '_WT_USER') {
 				add_simple_tag('2 ' . $key . ' ' . Auth::user()->getUserName(), $level1tag);
-			} else if ($level1tag === 'TITL' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
+			} elseif ($level1tag === 'TITL' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
 				add_simple_tag('2 ' . $key, $level1tag);
-			} else if ($level1tag === 'NAME' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
+			} elseif ($level1tag === 'NAME' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
 				add_simple_tag('2 ' . $key, $level1tag);
-			} else if ($level1tag !== 'TITL' && $level1tag !== 'NAME') {
+			} elseif ($level1tag !== 'TITL' && $level1tag !== 'NAME') {
 				add_simple_tag('2 ' . $key, $level1tag);
 			}
 			// Add level 3/4 tags as appropriate
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index beaedaba3f..748af1b2fd 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -590,7 +590,7 @@ function import_record($gedrec, Tree $tree, $update) {
 
 	// import different types of records
 	if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedrec, $match)) {
-		list(,$xref, $type) = $match;
+		list(, $xref, $type) = $match;
 		// check for a _UID, if the record doesn't have one, add one
 		if ($tree->getPreference('GENERATE_UIDS') && !strpos($gedrec, "\n1 _UID ")) {
 			$gedrec .= "\n1 _UID " . GedcomTag::createUid();
@@ -1013,7 +1013,7 @@ function create_media_object($level, $gedrec, Tree $tree) {
 	if (!$xref) {
 		$xref = $tree->getNewXref('OBJE');
 		// renumber the lines
-		$gedrec = preg_replace_callback('/\n(\d+)/', function($m) use ($level) { return "\n" . ($m[1] - $level); }, $gedrec);
+		$gedrec = preg_replace_callback('/\n(\d+)/', function ($m) use ($level) { return "\n" . ($m[1] - $level); }, $gedrec);
 		// convert to an object
 		$gedrec = str_replace("\n0 OBJE\n", '0 @' . $xref . "@ OBJE\n", $gedrec);
 		// Fix Legacy GEDCOMS
@@ -1086,7 +1086,7 @@ function reject_all_changes(GedcomRecord $record) {
  */
 function update_record($gedrec, $ged_id, $delete) {
 	if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedrec, $match)) {
-		list(,$gid, $type) = $match;
+		list(, $gid, $type) = $match;
 	} else {
 		echo "ERROR: Invalid gedcom record.";
 		return;
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 827c3dff08..e2d3dbae6a 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -652,7 +652,7 @@ function print_add_new_fact($id, $usedfacts, $type) {
 	foreach ($addfacts as $addfact) {
 		$translated_addfacts[$addfact] = GedcomTag::getLabel($addfact);
 	}
-	uasort($translated_addfacts, function($x, $y) {
+	uasort($translated_addfacts, function ($x, $y) {
 		return I18N::strcasecmp(I18N::translate($x), I18N::translate($y));
 	});
 	echo '<tr><td class="descriptionbox">';
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index b768086c60..db8a8f4054 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -687,8 +687,7 @@ function print_main_sources(Fact $fact, $level) {
 				} else {
 					echo GedcomTag::getLabel($factname, $parent);
 				}
-			} else
-			if ($can_edit) {
+			} elseif ($can_edit) {
 				echo "<a onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"", I18N::translate('Edit'), '">';
 					if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
 						if ($level == 1) {
@@ -952,7 +951,7 @@ function print_main_notes(Fact $fact, $level) {
 				} else {
 					echo GedcomTag::getLabel($factname, $parent);
 				}
-			} else if ($factname != 'NOTE') {
+			} elseif ($factname != 'NOTE') {
 				// Note is already printed
 				echo GedcomTag::getLabel($factname, $parent);
 				if ($note) {
@@ -1064,8 +1063,7 @@ function print_main_media(Fact $fact, $level) {
 				} else {
 					echo GedcomTag::getLabel($factname, $parent);
 				}
-			} else
-			if ($can_edit) {
+			} elseif ($can_edit) {
 				echo '<a onclick="window.open(\'addmedia.php?action=editmedia&amp;pid=', $media->getXref(), '\', \'_blank\', edit_window_specs); return false;" href="#" title="', I18N::translate('Edit'), '">';
 				echo GedcomTag::getLabel($factname, $parent), '</a>';
 				echo '<div class="editfacts">';
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index 6b7d847daf..bcfdf93204 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -1649,7 +1649,7 @@ function format_surname_list($surnames, $style, $totals, $script, Tree $tree) {
 			if ($first_spfxsurn) {
 				if (I18N::strtoupper($spfxsurn) == I18N::strtoupper($first_spfxsurn)) {
 					$surns[$first_spfxsurn] = array_merge($surns[$first_spfxsurn], $surns[$spfxsurn]);
-					unset ($surns[$spfxsurn]);
+					unset($surns[$spfxsurn]);
 				}
 			} else {
 				$first_spfxsurn = $spfxsurn;
@@ -2076,7 +2076,7 @@ function print_events_list($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_l
 		// Data is already sorted by anniversary date
 		break;
 	case 'alpha':
-		uasort($filtered_events, function(Fact $x, Fact $y) {
+		uasort($filtered_events, function (Fact $x, Fact $y) {
 			return GedcomRecord::compare($x->getParent(), $y->getParent());
 		});
 		break;
diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php
index be58106555..5dc68d2d50 100644
--- a/includes/functions/functions_rtl.php
+++ b/includes/functions/functions_rtl.php
@@ -114,7 +114,7 @@ function spanLTRRTL($inputText, $direction = 'BOTH', $class = '') {
 					}
 				}
 				breakCurrentSpan($result);
-			} else if ($waitingText == '') {
+			} elseif ($waitingText == '') {
 				$result .= $element;
 			} else {
 				$waitingText .= $element;
@@ -164,7 +164,7 @@ function spanLTRRTL($inputText, $direction = 'BOTH', $class = '') {
 					// This is not a digit.  Is it numeric punctuation?
 					if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
 						$offset += 6; // This could be numeric punctuation
-					} else if (strpos($numberPunctuation, $charArray['letter']) !== false) {
+					} elseif (strpos($numberPunctuation, $charArray['letter']) !== false) {
 						$offset += $charArray['length']; // This could be numeric punctuation
 					}
 					// If the next character is a digit, the current character is numeric punctuation
@@ -193,7 +193,7 @@ function spanLTRRTL($inputText, $direction = 'BOTH', $class = '') {
 							$currentLetter = WT_UTF8_LRE . $currentLetter;
 						}
 					}
-				} else if (strpos($numbers, $currentLetter) !== false) {
+				} elseif (strpos($numbers, $currentLetter) !== false) {
 					$numberState = true; // The current letter is a digit
 					if ($currentState == 'RTL') {
 						$currentLetter = WT_UTF8_LRE . $currentLetter;
@@ -650,10 +650,10 @@ function finishCurrentSpan(&$result, $theEnd = false) {
 		if ($posBlank === false) {
 			$posSeparator    = $posNbsp;
 			$lengthSeparator = 6;
-		} else if ($posNbsp === false) {
+		} elseif ($posNbsp === false) {
 			$posSeparator    = $posBlank;
 			$lengthSeparator = 1;
-		} else if ($posBlank < $posNbsp) {
+		} elseif ($posBlank < $posNbsp) {
 			$posSeparator    = $posBlank;
 			$lengthSeparator = 1;
 		} else {
diff --git a/includes/session.php b/includes/session.php
index 4013bbfed3..b7bd5124d8 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -205,7 +205,7 @@ $path = substr($path, 0, stripos($path, WT_SCRIPT_NAME));
 define('WT_BASE_URL', $protocol . '://' . $host . $port . $path);
 
 // Convert PHP errors into exceptions
-set_error_handler(function($errno, $errstr, $errfile, $errline) {
+set_error_handler(function ($errno, $errstr, $errfile, $errline) {
 	if (error_reporting() & $errno) {
 		throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
 	} else {
@@ -213,13 +213,13 @@ set_error_handler(function($errno, $errstr, $errfile, $errline) {
 	}
 });
 
-set_exception_handler(function(\Exception $ex) {
+set_exception_handler(function (\Exception $ex) {
 	$long_message = '';
 	$short_message = '';
 
 	foreach ($ex->getTrace() as $level => $frame) {
 		$frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
-		array_walk($frame['args'], function(&$arg) {
+		array_walk($frame['args'], function (&$arg) {
 			switch (gettype($arg)) {
 			case 'boolean':
 			case 'integer':
@@ -289,7 +289,7 @@ if (file_exists(WT_ROOT . 'data/config.ini.php')) {
 // What is the remote client's IP address
 if (Filter::server('HTTP_CLIENT_IP') !== null) {
 	define('WT_CLIENT_IP', Filter::server('HTTP_CLIENT_IP'));
-} else if (Filter::server('HTTP_X_FORWARDED_FOR') !== null) {
+} elseif (Filter::server('HTTP_X_FORWARDED_FOR') !== null) {
 	define('WT_CLIENT_IP', Filter::server('HTTP_X_FORWARDED_FOR'));
 } else {
 	define('WT_CLIENT_IP', Filter::server('REMOTE_ADDR'));
@@ -364,19 +364,19 @@ case '':
 // Store our session data in the database.
 session_set_save_handler(
 	// open
-	function() {
+	function () {
 		return true;
 	},
 	// close
-	function() {
+	function () {
 		return true;
 	},
 	// read
-	function($id) {
+	function ($id) {
 		return Database::prepare("SELECT session_data FROM `##session` WHERE session_id=?")->execute(array($id))->fetchOne();
 	},
 	// write
-	function($id, $data) {
+	function ($id, $data) {
 		// Only update the session table once per minute, unless the session data has actually changed.
 		Database::prepare(
 			"INSERT INTO `##session` (session_id, user_id, ip_address, session_data, session_time)" .
@@ -391,13 +391,13 @@ session_set_save_handler(
 		return true;
 	},
 	// destroy
-	function($id) {
+	function ($id) {
 		Database::prepare("DELETE FROM `##session` WHERE session_id=?")->execute(array($id));
 
 		return true;
 	},
 	// gc
-	function($maxlifetime) {
+	function ($maxlifetime) {
 		Database::prepare("DELETE FROM `##session` WHERE session_time < DATE_SUB(NOW(), INTERVAL ? SECOND)")->execute(array($maxlifetime));
 
 		return true;
diff --git a/individual.php b/individual.php
index deb4a96650..6bd8956844 100644
--- a/individual.php
+++ b/individual.php
@@ -244,3 +244,4 @@ echo
 		$sidebar_html;
 	}
 	echo '</div>'; // close #main
+
diff --git a/medialist.php b/medialist.php
index beaacb6708..82b6eae5dc 100644
--- a/medialist.php
+++ b/medialist.php
@@ -314,4 +314,3 @@ if ($action === 'submit') {
 	echo '</div>';
 }
 echo '</div>';
-
diff --git a/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php b/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php
index b86a0f0491..fdbb593eb1 100644
--- a/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php
+++ b/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php
@@ -86,7 +86,7 @@ if (!empty($NOTE)) {
 	for ($k = 0; $k < count($newlines); $k++) {
 		if ($k == 0 && count($newlines) > 1) {
 			$newgedrec = "0 @XREF@ NOTE $newlines[$k]\n";
-		} else if ($k == 0) {
+		} elseif ($k == 0) {
 			$newgedrec = "0 @XREF@ NOTE $newlines[$k]\n1 CONT\n";
 		} else {
 			$newgedrec .= "1 CONT $newlines[$k]\n";
diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php
index 2dd5ccb428..748f65eba5 100644
--- a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php
+++ b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php
@@ -175,3 +175,4 @@ if ($action == "filter") {
 }
 echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
 echo "</div>"; // Close div that centers table
+
diff --git a/modules_v3/user_blog/db_schema/db_schema_1_2.php b/modules_v3/user_blog/db_schema/db_schema_1_2.php
index b522fb97aa..313ca7097b 100644
--- a/modules_v3/user_blog/db_schema/db_schema_1_2.php
+++ b/modules_v3/user_blog/db_schema/db_schema_1_2.php
@@ -71,4 +71,3 @@ try {
 
 // Update the version to indicate success
 Site::setPreference($schema_name, $next_version);
-
diff --git a/pedigree.php b/pedigree.php
index c3a08ce02c..cfb3d0f135 100644
--- a/pedigree.php
+++ b/pedigree.php
@@ -230,3 +230,4 @@ foreach ($controller->nodes as $i => $node) {
 echo '<canvas id="pedigree_canvas" width="' . $controller->chartsize['x'] . '" height="' . $controller->chartsize['y'] . '"><p>No lines between boxes? Unfortunately your browser does not support the HTML5 canvas feature.</p></canvas>';
 echo '</div>'; //close #pedigree_chart
 echo '</div>'; //close #pedigree-page
+
diff --git a/placelist.php b/placelist.php
index e613fa4ea2..58e760658d 100644
--- a/placelist.php
+++ b/placelist.php
@@ -244,3 +244,4 @@ case 'hierarchy':
 }
 
 echo '</div>'; // <div id="place-hierarchy">
+
diff --git a/repo.php b/repo.php
index ae8af7fa3e..af329f1ce1 100644
--- a/repo.php
+++ b/repo.php
@@ -97,7 +97,7 @@ echo '<div id="repo-tabs">
 		// Sort the facts
 		usort(
 			$facts,
-			function(Fact $x, Fact $y) {
+			function (Fact $x, Fact $y) {
 				static $order = array(
 					'NAME' => 0,
 					'ADDR' => 1,
diff --git a/search_advanced.php b/search_advanced.php
index 5adf474a14..6e4d285c80 100644
--- a/search_advanced.php
+++ b/search_advanced.php
@@ -147,7 +147,7 @@ echo '</script>';
 			$currentFieldSearch = $controller->getField($i); // Get this field’s name and the search criterion
 			$currentField = substr($currentFieldSearch, 0, strrpos($currentFieldSearch, ':')); // Get the actual field name
 			?>
-				<input type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo Filter::escapeHtml($controller->getValue($i)); ?>"<?php echo (substr($controller->getField($i), -4) == 'PLAC') ? 'data-autocomplete-type="PLAC"' : ''; ?>>
+				<input type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo Filter::escapeHtml($controller->getValue($i)); ?>"<?php echo substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : ''; ?>>
 			<?php if (preg_match("/^NAME:/", $currentFieldSearch) > 0) { ?>
 				<select name="fields[<?php echo $i; ?>]">
 					<option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
diff --git a/source.php b/source.php
index 841af20f1d..6cd9dbf762 100644
--- a/source.php
+++ b/source.php
@@ -117,7 +117,7 @@ echo '<div id="source-tabs">
 		// Sort the facts
 		usort(
 			$facts,
-			function(Fact $x, Fact $y) {
+			function (Fact $x, Fact $y) {
 				static $order = array(
 					'TITL' => 0,
 					'ABBR' => 1,
@@ -180,3 +180,4 @@ echo '<div id="source-tabs">
 	}
 echo '</div>'; //close div "source-tabs"
 echo '</div>'; //close div "source-details"
+
diff --git a/statistics.php b/statistics.php
index a147d5b2c8..880933a548 100644
--- a/statistics.php
+++ b/statistics.php
@@ -201,7 +201,7 @@ if (!$ajax) {
 			</tr>
 		</table>
 		</fieldset>';
-	} else if ($tab == 1) {
+	} elseif ($tab == 1) {
 		echo '<fieldset>
 		<legend>', I18N::translate('Total families: %s', $stats->totalFamilies()), '</legend>
 		<b>', I18N::translate('Events'), '</b>
@@ -339,7 +339,7 @@ if (!$ajax) {
 			</tr>
 		</table>
 		</fieldset>';
-	} else if ($tab == 2) {
+	} elseif ($tab == 2) {
 		echo '<fieldset>
 		<legend>', I18N::translate('Records'), ': ', $stats->totalRecords(), '</legend>
 		<table class="facts_table">
@@ -422,7 +422,7 @@ if (!$ajax) {
 			</tr>
 		</table>
 		</fieldset>';
-	} else if ($tab == 3) {
+	} elseif ($tab == 3) {
 		echo '<fieldset>
 		<legend>', I18N::translate('Create your own chart'), '</legend>';
 		?>
diff --git a/statisticsplot.php b/statisticsplot.php
index b3886d37ca..8ec9c43c25 100644
--- a/statisticsplot.php
+++ b/statisticsplot.php
@@ -48,7 +48,7 @@ function month_of_birth($z_axis, array $z_boundaries, Stats $stats) {
 				}
 			}
 		}
-	} else if ($z_axis === 301) {
+	} 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) {
@@ -56,7 +56,7 @@ function month_of_birth($z_axis, array $z_boundaries, Stats $stats) {
 					if ($values['i_sex'] === 'M') {
 						fill_y_data(0, $key, $values['total']);
 						$total += $values['total'];
-					} else if ($values['i_sex'] === 'F') {
+					} elseif ($values['i_sex'] === 'F') {
 						fill_y_data(1, $key, $values['total']);
 						$total += $values['total'];
 					}
@@ -105,7 +105,7 @@ function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stat
 				}
 			}
 		}
-	} else if ($z_axis === 301) {
+	} 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) {
@@ -113,7 +113,7 @@ function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stat
 					if ($values['i_sex'] === 'M') {
 						fill_y_data(0, $key, $values['total']);
 						$total += $values['total'];
-					} else if ($values['i_sex'] === 'F') {
+					} elseif ($values['i_sex'] === 'F') {
 						fill_y_data(1, $key, $values['total']);
 						$total += $values['total'];
 					}
@@ -162,7 +162,7 @@ function month_of_death($z_axis, array $z_boundaries, Stats $stats) {
 				}
 			}
 		}
-	} else if ($z_axis === 301) {
+	} 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) {
@@ -170,7 +170,7 @@ function month_of_death($z_axis, array $z_boundaries, Stats $stats) {
 					if ($values['i_sex'] === 'M') {
 						fill_y_data(0, $key, $values['total']);
 						$total += $values['total'];
-					} else if ($values['i_sex'] === 'F') {
+					} elseif ($values['i_sex'] === 'F') {
 						fill_y_data(1, $key, $values['total']);
 						$total += $values['total'];
 					}
@@ -311,7 +311,7 @@ function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats) {
 				$total++;
 			}
 		}
-	} else if ($z_axis === 301) {
+	} elseif ($z_axis === 301) {
 		$num = $stats->statsAgeQuery(false, 'BIRT', 'M');
 		foreach ($num as $values) {
 			foreach ($values as $age_value) {
@@ -363,7 +363,7 @@ function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats) {
 				$total++;
 			}
 		}
-	} else if ($z_axis === 301) {
+	} elseif ($z_axis === 301) {
 		$num = $stats->statsAgeQuery(false, 'DEAT', 'M');
 		foreach ($num as $values) {
 			foreach ($values as $age_value) {
@@ -418,7 +418,7 @@ function age_at_marriage($z_axis, array $z_boundaries, Stats $stats) {
 			fill_y_data(0, (int) ($values['age'] / 365.25), 1);
 			$total++;
 		}
-	} else if ($z_axis === 301) {
+	} elseif ($z_axis === 301) {
 		$num = $stats->statsMarrAgeQuery(false, 'M');
 		foreach ($num as $values) {
 			fill_y_data(0, (int) ($values['age'] / 365.25), 1);
@@ -480,7 +480,7 @@ function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
 				$indi[] = $values['d_gid'];
 			}
 		}
-	} else if ($z_axis === 301) {
+	} elseif ($z_axis === 301) {
 		$num  = $stats->statsMarrAgeQuery(false, 'M');
 		$indi = array();
 		foreach ($num as $values) {
@@ -544,7 +544,7 @@ function number_of_children($z_axis, array $z_boundaries, Stats $stats) {
 			fill_y_data(0, $values['f_numchil'], $values['total']);
 			$total += $values['f_numchil'] * $values['total'];
 		}
-	} else if ($z_axis === 301) {
+	} elseif ($z_axis === 301) {
 		$num = $stats->statsChildrenQuery(false, 'M');
 		foreach ($num as $values) {
 			fill_y_data(0, $values['num'], $values['total']);
@@ -712,7 +712,7 @@ function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend) {
 	$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';
-	} else if (count($ydata) < 2) {
+	} elseif (count($ydata) < 2) {
 		$imgurl .= '45,1';
 	} else {
 		$imgurl .= '20,3';
@@ -779,7 +779,7 @@ function calculate_axis($x_axis_boundaries) {
 		if (($hulpar[$i] - $hulpar[$i1]) === 1) {
 			$xdata[$i]        = $hulpar[$i1];
 			$x_boundaries[$i] = $hulpar[$i1];
-		} else if ($hulpar[$i1] === $hulpar[0]) {
+		} elseif ($hulpar[$i1] === $hulpar[0]) {
 			$xdata[$i]        = $hulpar[$i1] . '-' . $hulpar[$i];
 			$x_boundaries[$i] = $hulpar[$i];
 		} else {
diff --git a/tests/app/DatabaseTest.php b/tests/app/DatabaseTest.php
index 3be5ffba50..22a05109cf 100644
--- a/tests/app/DatabaseTest.php
+++ b/tests/app/DatabaseTest.php
@@ -21,7 +21,7 @@ use PHPUnit_Framework_TestCase;
 /**
  * Test harness for the class Statement
  */
-class DBStatementTest extends PHPUnit_Framework_TestCase {
+class DatabaseTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 *
diff --git a/tests/app/Report/ReportHTMLTest.php b/tests/app/Report/ReportHTMLTest.php
index e9559230d8..e60852026c 100644
--- a/tests/app/Report/ReportHTMLTest.php
+++ b/tests/app/Report/ReportHTMLTest.php
@@ -21,7 +21,7 @@ use PHPUnit_Framework_TestCase;
 /**
  * Test harness for the class ReportHtml
  */
-class ReportHtmlTest extends PHPUnit_Framework_TestCase {
+class ReportHTMLTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 *
diff --git a/tests/app/Report/ReportPDFTest.php b/tests/app/Report/ReportPDFTest.php
index 4811797050..3b915caf4f 100644
--- a/tests/app/Report/ReportPDFTest.php
+++ b/tests/app/Report/ReportPDFTest.php
@@ -21,7 +21,7 @@ use PHPUnit_Framework_TestCase;
 /**
  * Test harness for the class ReportPdf
  */
-class ReportPdfTest extends PHPUnit_Framework_TestCase {
+class ReportPDFTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 *
diff --git a/tests/app/StatementTest.php b/tests/app/StatementTest.php
index 611e0be6b2..64305ea22d 100644
--- a/tests/app/StatementTest.php
+++ b/tests/app/StatementTest.php
@@ -21,7 +21,7 @@ use PHPUnit_Framework_TestCase;
 /**
  * Test harness for the class Statement
  */
-class DBTest extends PHPUnit_Framework_TestCase {
+class StatementTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 *
diff --git a/themes/_custom/theme.php b/themes/_custom/theme.php
index a02f65df75..17bae08ea0 100644
--- a/themes/_custom/theme.php
+++ b/themes/_custom/theme.php
@@ -82,7 +82,7 @@ class CustomTheme extends WebtreesTheme {
 			// Start with the default "Lists" menu.
 			$menu = parent::menuLists();
 			// Remove the "notes" sub-menu.
-			$submenus = array_filter($menu->getSubmenus(), function(Menu $menu) {
+			$submenus = array_filter($menu->getSubmenus(), function (Menu $menu) {
 				return $menu->getClass() !== 'menu-list-note';
 			});
 			// Replace the sub-menus
@@ -98,3 +98,4 @@ class CustomTheme extends WebtreesTheme {
 }
 
 return new CustomTheme; // This script must return a theme object.
+