Tidy up whitespace/indents

22 files changed, 192 insertions, 212 deletions

diff --git a/includes/authentication.php b/includes/authentication.php
index 63c057b0f3..15f0aea04a 100644
--- a/includes/authentication.php
+++ b/includes/authentication.php
@@ -102,7 +102,7 @@ function basicHTTPAuthenticateUser() {
 
 /**
  * logs a user out of the system
- * @param string $user_id	logout a specific user
+ * @param string $user_id logout a specific user
  */
 function userLogout($user_id) {
 	set_user_setting($user_id, 'loggedin', false);
@@ -117,7 +117,7 @@ function userLogout($user_id) {
  * Updates the login time in the database of the given user
  * The login time is used to automatically logout users who have been
  * inactive for the defined session time
- * @param string $username	the username to update the login info for
+ * @param string $username the username to update the login info for
  */
 function userUpdateLogin($user_id) {
 	set_user_setting($user_id, 'sessiontime', time());
@@ -211,7 +211,7 @@ function userCanEdit($user_id=WT_USER_ID, $ged_id=WT_GED_ID) {
  *
  * takes a username and checks if the user has write privileges to
  * change the gedcom data and accept changes
- * @param string $username	the username of the user check privileges
+ * @param string $username the username of the user check privileges
  * @return boolean true if user can accept false if user cannot accept
  */
 function userCanAccept($user_id=WT_USER_ID, $ged_id=WT_GED_ID) {
@@ -553,5 +553,3 @@ function getNewsItem($news_id) {
 		return null;
 	}
 }
-
-?>
diff --git a/includes/config_data.php b/includes/config_data.php
index f83608cddf..3a97e9666e 100644
--- a/includes/config_data.php
+++ b/includes/config_data.php
@@ -361,10 +361,10 @@ $STATUS_CODES = array(
 
 // RESN tags - restriction status
 $RESN_CODES = array(
-	'none'			=>i18n::translate_c('Restriction status', 'None'),
-	'locked'		=>i18n::translate_c('Restriction status', 'Do not change'),
-	'privacy'		=>i18n::translate_c('Restriction status', 'Privacy'),
-	'confidential'	=>i18n::translate_c('Restriction status', 'Confidential')
+	'none'        =>i18n::translate_c('Restriction status', 'None'),
+	'locked'      =>i18n::translate_c('Restriction status', 'Do not change'),
+	'privacy'     =>i18n::translate_c('Restriction status', 'Privacy'),
+	'confidential'=>i18n::translate_c('Restriction status', 'Confidential')
 );
 
 // NPFX tags - name prefixes
diff --git a/includes/dmsounds_UTF8.php b/includes/dmsounds_UTF8.php
index 431b500533..2c9df8bd8b 100644
--- a/includes/dmsounds_UTF8.php
+++ b/includes/dmsounds_UTF8.php
@@ -75,46 +75,46 @@ define('VAV_YOD', 'ױ');
  * function call to achieve the desired transformations.
  *
  * Note about the use of "\x01":
- *		This code, which can't legitimately occur in the kind of text we're dealing with,
- *		is used as a place-holder so that conditional string replacements can be done.
+ * This code, which can't legitimately occur in the kind of text we're dealing with,
+ * is used as a place-holder so that conditional string replacements can be done.
  */
 $transformNameTable = array(
 	// Force Yiddish ligatures to be treated as separate letters
-	array(DOUBLE_VAV,		VAV.VAV),
-	array(DOUBLE_YOD,		YOD.YOD),
-	array(VAV_YOD,			VAV.YOD),
+	array(DOUBLE_VAV,    VAV.VAV),
+	array(DOUBLE_YOD,    YOD.YOD),
+	array(VAV_YOD,       VAV.YOD),
 	// Feature request 1511090, bullet (a)
-	array(BET.VAV,			BET.AYIN),
-	array(PE.VAV,			PE.AYIN),
-	array(VAV.MEM,			AYIN.MEM),
-	array(VAV.FINAL_MEM,	AYIN.FINAL_MEM),
-	array(VAV.NUN,			AYIN.NUN),
-	array(VAV.FINAL_NUN,	AYIN.FINAL_NUN),
+	array(BET.VAV,       BET.AYIN),
+	array(PE.VAV,        PE.AYIN),
+	array(VAV.MEM,       AYIN.MEM),
+	array(VAV.FINAL_MEM, AYIN.FINAL_MEM),
+	array(VAV.NUN,       AYIN.NUN),
+	array(VAV.FINAL_NUN, AYIN.FINAL_NUN),
 	// Feature request 1511090, bullet (b)
-	array(VAV.VAV,			BET),
+	array(VAV.VAV,       BET),
 	// Feature request 1511090, bullet (c)
-	array("\x01",			''),
-	array(YOD.YOD.HE.'$',	"\x01".HE),
-	array(YOD.YOD.AYIN.'$',	"\x01".AYIN),
-	array(YOD.YOD,			AYIN),
-	array("\x01",			YOD.YOD)
+	array("\x01",        ''),
+	array(YOD.YOD.HE.'$', "\x01".HE),
+	array(YOD.YOD.AYIN.'$', "\x01".AYIN),
+	array(YOD.YOD,       AYIN),
+	array("\x01",        YOD.YOD)
 	);
 
-$maxchar = 7;		// Max. table key length (in ASCII bytes -- NOT in UTF-8 characters!)
+$maxchar = 7; // Max. table key length (in ASCII bytes -- NOT in UTF-8 characters!)
 
 /**
  * The DM sound coding table is organized this way:
- *		key:	a variable-length string that corresponds to the UTF-8 character sequence
- *				represented by the table entry.  Currently, that string can be up to 7
- *				bytes long.  This maximum length is defined by the value of global variable
- *				$maxchar.
- *		value:	an array as follows:
- *				[0]:  zero if not a vowel
- *				[1]:  sound value when this string is at the beginning of the word
- *				[2]:  sound value when this string is followed by a vowel
- *				[3]:  sound value for other cases
- *				[1],[2],[3] can be repeated several times to create branches in the code
- *				an empty sound value means "ignore in this state"
+ * key: a variable-length string that corresponds to the UTF-8 character sequence
+ *  represented by the table entry.  Currently, that string can be up to 7
+ *  bytes long.  This maximum length is defined by the value of global variable
+ *  $maxchar.
+ * value: an array as follows:
+ *  [0]:  zero if not a vowel
+ *  [1]:  sound value when this string is at the beginning of the word
+ *  [2]:  sound value when this string is followed by a vowel
+ *  [3]:  sound value for other cases
+ *  [1],[2],[3] can be repeated several times to create branches in the code
+ *  an empty sound value means "ignore in this state"
  */
 $dmsounds = array();
 
@@ -498,7 +498,7 @@ $dmsounds[HE.GIMEL] = array('0',   '54','54','54',   '55','55','55');
 $dmsounds[HE.KAF] = array('0',   '55','55','55');
 $dmsounds[HE.HET] = array('0',   '55','55','55');
 $dmsounds[HE.QOF] = array('0',   '55','55','55',   '5','5','5');
-$dmsounds[HE.HE] = array('0',   '5','5','',   '55','55','');	// -- added by GK
+$dmsounds[HE.HE] = array('0',   '5','5','',   '55','55',''); // -- added by GK
 $dmsounds[HE] = array('0',   '5','5','');
 $dmsounds[VAV.YOD] = array('1',   '','','',   '7','7','7');
 $dmsounds[VAV] = array('1',   '7','7','7',   '7','','');
@@ -525,15 +525,15 @@ $dmsounds[TET.SHIN] = array('0',   '4','4','4');
 $dmsounds[TET.DALET] = array('0',   '33','33','33');
 $dmsounds[TET.YOD] = array('0',   '3','3','3',   '4','4','4',   '3','3','34');
 $dmsounds[TET.TAV] = array('0',   '33','33','33');
-$dmsounds[TET.TET] = array('0',   '3','3','3',   '33','33','33');	// -- added by GK
+$dmsounds[TET.TET] = array('0',   '3','3','3',   '33','33','33'); // -- added by GK
 $dmsounds[TET] = array('0',   '3','3','3');
 $dmsounds[YOD] = array('1',   '1','','');
 $dmsounds[YOD.ALEF] = array('1',   '1','','',   '1','1','1');
 $dmsounds[KAF.GIMEL] = array('0',   '55','55','55',   '54','54','54');
 $dmsounds[KAF.SHIN] = array('0',   '5','54','54');
 $dmsounds[KAF.SAMEKH] = array('0',   '5','54','54');
-$dmsounds[KAF.KAF] = array('0',   '5','5','5',   '55','55','55');	// == added by GK
-$dmsounds[KAF.FINAL_KAF] = array('0',   '5','5','5',   '55','55','55');	// == added by GK
+$dmsounds[KAF.KAF] = array('0',   '5','5','5',   '55','55','55'); // == added by GK
+$dmsounds[KAF.FINAL_KAF] = array('0',   '5','5','5',   '55','55','55'); // == added by GK
 $dmsounds[KAF] = array('0',   '5','5','5');
 $dmsounds[KAF.HET] = array('0',   '55','55','55',   '5','5','5');
 $dmsounds[FINAL_KAF] = array('0',   '','5','5');
@@ -543,14 +543,14 @@ $dmsounds[MEM.NUN] = array('0',   '66','66','66');
 $dmsounds[MEM.FINAL_NUN] = array('0',   '66','66','66');
 //$dmsounds[MEM.MEM] = array('0',   '66','66','66');
 $dmsounds[MEM.MEM] = array('0',   '6','6','6',   '66','66','66');
-$dmsounds[MEM.FINAL_MEM] = array('0',   '6','6','6',   '66','66','66');	// -- added by GK
+$dmsounds[MEM.FINAL_MEM] = array('0',   '6','6','6',   '66','66','66'); // -- added by GK
 $dmsounds[MEM] = array('0',   '6','6','6');
 $dmsounds[FINAL_MEM] = array('0',   '','6','6');
 $dmsounds[NUN.MEM] = array('0',   '66','66','66');
 $dmsounds[NUN.FINAL_MEM] = array('0',   '66','66','66');
 //$dmsounds[NUN.NUN] = array('0',   '66','66','66');
 $dmsounds[NUN.NUN] = array('0',   '6','6','6',   '66','66','66');
-$dmsounds[NUN.FINAL_NUN] = array('0',   '6','6','6',   '66','66','66');	// -- added by GK
+$dmsounds[NUN.FINAL_NUN] = array('0',   '6','6','6',   '66','66','66'); // -- added by GK
 $dmsounds[NUN] = array('0',   '6','6','6');
 $dmsounds[FINAL_NUN] = array('0',   '','6','6');
 $dmsounds[SAMEKH.TAV.SHIN] = array('0',   '2','4','4');
@@ -572,7 +572,7 @@ $dmsounds[AYIN] = array('1',   '0','','');
 $dmsounds[PE.BET] = array('0',   '7','7','7',   '77','77','77');
 $dmsounds[PE.VAV.VAV] = array('0',   '7','7','7',   '77','77','77');
 $dmsounds[PE.PE] = array('0',   '7','7','7',   '77','77','77');
-$dmsounds[PE.FINAL_PE] = array('0',   '7','7','7',   '77','77','77');	// -- added by GK
+$dmsounds[PE.FINAL_PE] = array('0',   '7','7','7',   '77','77','77'); // -- added by GK
 $dmsounds[PE] = array('0',   '7','7','7');
 $dmsounds[FINAL_PE] = array('0',   '','7','7');
 $dmsounds[TSADI.GIMEL] = array('0',   '44','44','44',   '45','45','45');
@@ -653,5 +653,3 @@ $dmsounds["آ"] = array('0',   '1','','');
 $dmsounds["ة"] = array('0',   '','','3');
 $dmsounds["ی"] = array('0',   '1','','');
 $dmsounds["ى"] = array('1',   '1','','');
-
-?>
diff --git a/includes/media_reorder.php b/includes/media_reorder.php
index 81baa7d9e6..da1310c126 100644
--- a/includes/media_reorder.php
+++ b/includes/media_reorder.php
@@ -52,7 +52,7 @@ require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 		<input type="hidden" name="action" value="reorder_media_update" />
 		<input type="hidden" name="pid" value="<?php print $pid; ?>" />
 		<input type="hidden" name="currtab" value="<?php print $currtab; ?>" />
-<!--		<input type="hidden" name="option" value="bybirth" /> -->
+<!-- <input type="hidden" name="option" value="bybirth" /> -->
 
 		<p><center>
 		<button type="submit" title="<?php print i18n::translate('Saves the sorted media to the database');?>"><?php print i18n::translate('Save');?></button>
@@ -214,5 +214,3 @@ print "\n";
 	<button type="submit" title="<?php print i18n::translate('Quit and return');?>" onclick="window.close();"><?php print i18n::translate('Cancel');?></button>
 	</center></p>
 	</form>
-<?php
-?>
diff --git a/includes/reportheader.php b/includes/reportheader.php
index 68370bdb94..b83daa0ce1 100644
--- a/includes/reportheader.php
+++ b/includes/reportheader.php
@@ -24,13 +24,13 @@ define('WT_REPORTHEADER_PHP', '');
  * @global array $elementHandler
  */
 $elementHandler = array();
-$elementHandler["Report"]["start"]		= "ReportSHandler";
-$elementHandler["var"]["start"]			= "varSHandler";
-$elementHandler["Title"]["start"]		= "TitleSHandler";
-$elementHandler["Title"]["end"]			= "TitleEHandler";
-$elementHandler["Description"]["end"]	= "DescriptionEHandler";
-$elementHandler["Input"]["start"]		= "InputSHandler";
-$elementHandler["Input"]["end"]			= "InputEHandler";
+$elementHandler["Report"]["start"]   ="ReportSHandler";
+$elementHandler["var"]["start"]      ="varSHandler";
+$elementHandler["Title"]["start"]    ="TitleSHandler";
+$elementHandler["Title"]["end"]      ="TitleEHandler";
+$elementHandler["Description"]["end"]="DescriptionEHandler";
+$elementHandler["Input"]["start"]    ="InputSHandler";
+$elementHandler["Input"]["end"]      ="InputEHandler";
 
 $text = "";
 $report_array = array();
@@ -47,7 +47,7 @@ $report_array = array();
  */
 function startElement($parser, $name, $attrs) {
 // @deprecated
-//	global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
+// global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
 	global $elementHandler, $processIfs;
 
 	if (($processIfs==0) || ($name=="if")) {
@@ -66,7 +66,7 @@ function startElement($parser, $name, $attrs) {
  */
 function endElement($parser, $name) {
 	// @deprecated
-//	global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
+	// global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
 	global $elementHandler, $processIfs;
 
 	if (($processIfs==0) || ($name=="if")) {
@@ -128,7 +128,7 @@ function varSHandler($attrs) {
 
 function TitleSHandler() {
 	// @deprecated
-//	global $report_array, $text;
+	// global $report_array, $text;
 	global $text;
 
 	$text = "";
@@ -199,5 +199,3 @@ function InputEHandler() {
 	$report_array["inputs"][] = $input;
 	$text = "";
 }
-
-?>
diff --git a/includes/session_spider.php b/includes/session_spider.php
index c9dae20b1f..548d39b343 100644
--- a/includes/session_spider.php
+++ b/includes/session_spider.php
@@ -103,7 +103,7 @@ try {
 // rest of the file.
 
 global $SEARCH_SPIDER;
-$SEARCH_SPIDER = false;		// set empty at start
+$SEARCH_SPIDER = false; // set empty at start
 
 $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
 
@@ -111,7 +111,7 @@ $worms = array(
 	'oBot',
 	'Indy Library',
 	'XXX',
-//	'robotgenius',
+// 'robotgenius',
 	'Super_Ale',
 	'Wget',
 	'DataCha',
@@ -119,21 +119,21 @@ $worms = array(
 	'LWP::Simple',
 	'lwp-trivial',
 	'MJ.*bot',
-//	'ru.*rv',
+// 'ru.*rv',
 	'DotBot',
 	'HTTrack',
 	'AISearchBot',
 	'panscient.com',
 	'Plonebot',
-//	'Mozilla([^\/])|(\/[\D])',	// legitimate Mozilla-based browsers have something like "Mozilla/5.0"
-	'Mozilla[^\/]',		// legitimate Mozilla-based browsers have something like "Mozilla/5.0"
-	'Mozilla\/[^456]',	// legitimate Mozilla-based browsers have something like "Mozilla/5.0"
-	'^Mozilla\/[456]\.0$',	// legitimate Mozilla-based browsers have something following "Mozilla/5.0"
+// 'Mozilla([^\/])|(\/[\D])', // legitimate Mozilla-based browsers have something like "Mozilla/5.0"
+	'Mozilla[^\/]',  // legitimate Mozilla-based browsers have something like "Mozilla/5.0"
+	'Mozilla\/[^456]', // legitimate Mozilla-based browsers have something like "Mozilla/5.0"
+	'^Mozilla\/[456]\.0$', // legitimate Mozilla-based browsers have something following "Mozilla/5.0"
 	'Speedy.*Spider',
-	'KaloogaBot',		// Image search engines have no business searching a Genealogy site
+	'KaloogaBot',  // Image search engines have no business searching a Genealogy site
 	'DBLBot',
-	'TurnitinBot',		// Plagiarism detectors have no business searching a Genealogy site
-	'(Microsoft)|(Internet)|(Explorer)'		// Internet Explorer self-identifies with "MSIE"
+	'TurnitinBot',  // Plagiarism detectors have no business searching a Genealogy site
+	'(Microsoft)|(Internet)|(Explorer)'  // Internet Explorer self-identifies with "MSIE"
 	);
 
 $quitReason = "";
@@ -259,7 +259,7 @@ if(!$real) {
 			$y++;
 			if ($y > 70) break;
 		}
-		else if ($bot_name{$x} == ' ')	{
+		else if ($bot_name{$x} == ' ') {
 			if($valid_char) {
 				$spider_name{$y} = ' ';
 				$valid_char = false;
@@ -267,7 +267,7 @@ if(!$real) {
 				if ($y > 70) break;
 			}
 		}
-		else if ($bot_name{$x} == '.')	{
+		else if ($bot_name{$x} == '.') {
 			if($valid_char) {
 				$spider_name{$y} = '.';
 				$valid_char = true;
@@ -275,25 +275,25 @@ if(!$real) {
 				if ($y > 70) break;
 			}
 		}
-		else if ($bot_name{$x} == ':')	{
+		else if ($bot_name{$x} == ':') {
 			$spider_name{$y} = ':';
 			$valid_char = true;
 			$y++;
 			if ($y > 70) break;
 		}
-		else if ($bot_name{$x} == '/')	{
+		else if ($bot_name{$x} == '/') {
 			$spider_name{$y} = '/';
 			$valid_char = true;
 			$y++;
 			if ($y > 70) break;
 		}
-		else if ($bot_name{$x} == '-')	{
+		else if ($bot_name{$x} == '-') {
 			$spider_name{$y} = '-';
 			$valid_char = true;
 			$y++;
 			if ($y > 70) break;
 		}
-		else if ($bot_name{$x} == '_')	{
+		else if ($bot_name{$x} == '_') {
 			$spider_name{$y} = '_';
 			$valid_char = true;
 			$y++;
@@ -385,7 +385,5 @@ if(!empty($SEARCH_SPIDER)) {
 	if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 	$_SESSION['last_spider_lang'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
 
-	$_SESSION['wt_user'] = "";	// Don't allow search engine into user/admin mode.
+	$_SESSION['wt_user'] = ""; // Don't allow search engine into user/admin mode.
 }
-
-?>
diff --git a/includes/specialchars.php b/includes/specialchars.php
index b35ca72142..d076ec557a 100644
--- a/includes/specialchars.php
+++ b/includes/specialchars.php
@@ -242,7 +242,7 @@ case "de": // Deutsch
 	break;
 case "en": // English  -- limited copy of the default case (Western European set)
    $ucspecialchars = array(
-   		"&#192;" => "À",
+    "&#192;" => "À",
 		"&#193;" => "Á",
 		"&#194;" => "Â",
 		"&#195;" => "Ã",
@@ -1298,4 +1298,3 @@ $otherspecialchars = array(
 	"&#176;" => "°",  // degree symbol
 	"&#182;" => "¶",
 );
-?>
diff --git a/medialist.php b/medialist.php
index ac891b3f6d..6a15c559d6 100644
--- a/medialist.php
+++ b/medialist.php
@@ -407,7 +407,7 @@ if ($search=="yes") {
 
 if ($show == "yes") {
 	if (!empty($filtered_medialist)) {
-		$sortedMediaList = $filtered_medialist;	// Default sort (by title) has already been done
+		$sortedMediaList = $filtered_medialist; // Default sort (by title) has already been done
 		if ($sortby=='file') usort($sortedMediaList, 'filesort');
 
 		// Count the number of items in the medialist
@@ -509,7 +509,6 @@ if ($show == "yes") {
 		$imgwidth = $imgsize[0]+40;
 		$imgheight = $imgsize[1]+150;
 		$name = basename($media["TITL"]);
-//		$name1 = addslashes($media["TITL"]);
 		$showFile = WT_USER_CAN_EDIT;
 		if ($name=="") {
 			//$showFile = false;
@@ -731,4 +730,3 @@ echo "\n</div>\n";
 }
 // ************************  END = 'Print the medialist array' ************************
 print_footer();
-?>
diff --git a/pedigree.php b/pedigree.php
index e984bba89c..9a09beed2d 100644
--- a/pedigree.php
+++ b/pedigree.php
@@ -150,12 +150,12 @@ echo '</h2>';
 //-- echo the boxes
 $curgen = 1;
 $xoffset = 0;
-$yoffset = 0;			// -- used to offset the position of each box as it is generated
-$prevxoffset = 0;		// -- used to track the x position of the previous box
-$prevyoffset = 0;		// -- used to track the y position of the previous box
+$yoffset = 0;     // -- used to offset the position of each box as it is generated
+$prevxoffset = 0; // -- used to track the x position of the previous box
+$prevyoffset = 0; // -- used to track the y position of the previous box
 $maxyoffset = 0;
 $linesize = 3;
-if (!isset($brborder)) $brborder = 1;	// Avoid errors from old custom themes
+if (!isset($brborder)) $brborder = 1; // Avoid errors from old custom themes
 for($i=($controller->treesize-1); $i>=0; $i--) {
 	// -- check to see if we have moved to the next generation
 	if ($i < floor($controller->treesize / (pow(2, $curgen)))) {
@@ -222,7 +222,7 @@ for($i=($controller->treesize-1); $i>=0; $i--) {
 		// Work around a bug in FireFox that mis-places some boxes in Portrait RTL, resulting in
 		// vertical lines that themselves appear to be mis-placed.
 		if ($TEXT_DIRECTION=="rtl" && $BROWSERTYPE=="mozilla" && ($curgen <= 2)) $xoffset += 10;
-		if ($TEXT_DIRECTION=="rtl") $xoffset += $brborder;		// Account for thickness of right box border
+		if ($TEXT_DIRECTION=="rtl") $xoffset += $brborder; // Account for thickness of right box border
 
 		if ($yoffset>$maxyoffset) $maxyoffset=$yoffset;
 		$widthadd = 0;
@@ -313,7 +313,7 @@ if ($controller->rootPerson->canDisplayDetails()) {
 			echo $addxoffset, "px; top:", $yoffset, "px; width:10px; height:10px; \">";
 		}
 		else if ($talloffset == 1) {
-			if ($PEDIGREE_GENERATIONS<4)	$basexoffset += 60;
+			if ($PEDIGREE_GENERATIONS<4) $basexoffset += 60;
 			echo $basexoffset, "px; top:", $yoffset, "px; width:10px; height:10px; \">";
 		}
 		else if ($talloffset==3) {
diff --git a/pgv_to_wt.php b/pgv_to_wt.php
index f9b7848162..9fd1790bbc 100644
--- a/pgv_to_wt.php
+++ b/pgv_to_wt.php
@@ -380,22 +380,22 @@ echo '<p>pgv_gedcom => wt_gedcom ...</p>'; ob_flush(); flush(); usleep(50000);
 	try {
 		WT_DB::prepare(
 			"INSERT INTO `##user_setting` (user_id, setting_name, setting_value)".
-			"	SELECT user_id, 'canadmin', ".
+			" SELECT user_id, 'canadmin', ".
 			" CASE WHEN u_canadmin IN ('Y', 'yes') THEN 1 WHEN u_canadmin IN ('N', 'no') THEN 0 ELSE u_canadmin END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'verified', ".
+			" SELECT user_id, 'verified', ".
 			" CASE WHEN u_verified IN ('Y', 'yes') THEN 1 WHEN u_verified IN ('N', 'no') THEN 0 ELSE u_verified END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'verified_by_admin', ".
+			" SELECT user_id, 'verified_by_admin', ".
 			" CASE WHEN u_verified_by_admin IN ('Y', 'yes') THEN 1 WHEN u_verified_by_admin IN ('N', 'no') THEN 0 ELSE u_verified_by_admin END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'language', ".
+			" SELECT user_id, 'language', ".
 			" CASE u_language".
 			"  WHEN 'catalan'    THEN 'ca'".
 			"  WHEN 'english'    THEN 'en_US'".
@@ -423,20 +423,20 @@ echo '<p>pgv_gedcom => wt_gedcom ...</p>'; ob_flush(); flush(); usleep(50000);
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'pwrequested', ".
+			" SELECT user_id, 'pwrequested', ".
 			" CASE WHEN u_pwrequested IN ('Y', 'yes') THEN 1 WHEN u_pwrequested IN ('N', 'no') THEN 0 ELSE u_pwrequested END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'reg_timestamp', u_reg_timestamp".
+			" SELECT user_id, 'reg_timestamp', u_reg_timestamp".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'reg_hashcode', u_reg_hashcode".
+			" SELECT user_id, 'reg_hashcode', u_reg_hashcode".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'theme', ".
+			" SELECT user_id, 'theme', ".
 			" CASE u_theme".
 			"  WHEN ''                    THEN ''".
 			"  WHEN 'themes/cloudy/'      THEN 'themes/clouds/'".
@@ -450,51 +450,51 @@ echo '<p>pgv_gedcom => wt_gedcom ...</p>'; ob_flush(); flush(); usleep(50000);
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'loggedin', 0".
+			" SELECT user_id, 'loggedin', 0".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'sessiontime', u_sessiontime".
+			" SELECT user_id, 'sessiontime', u_sessiontime".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'contactmethod', u_contactmethod".
+			" SELECT user_id, 'contactmethod', u_contactmethod".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'visibleonline', ".
+			" SELECT user_id, 'visibleonline', ".
 			" CASE WHEN u_visibleonline IN ('Y', 'yes') THEN 1 WHEN u_visibleonline IN ('N', 'no') THEN 0 ELSE u_visibleonline END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'editaccount', ".
+			" SELECT user_id, 'editaccount', ".
 			" CASE WHEN u_editaccount IN ('Y', 'yes') THEN 1 WHEN u_editaccount IN ('N', 'no') THEN 0 ELSE u_editaccount END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'defaulttab', ".
+			" SELECT user_id, 'defaulttab', ".
 			" CASE WHEN u_defaulttab IN ('Y', 'yes') THEN 1 WHEN u_defaulttab IN ('N', 'no') THEN 0 ELSE u_defaulttab END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'comment', u_comment".
+			" SELECT user_id, 'comment', u_comment".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'comment_exp', u_comment_exp".
+			" SELECT user_id, 'comment_exp', u_comment_exp".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'relationship_privacy', ".
+			" SELECT user_id, 'relationship_privacy', ".
 			" CASE WHEN u_relationship_privacy IN ('Y', 'yes') THEN 1 WHEN u_relationship_privacy IN ('N', 'no') THEN 0 ELSE u_relationship_privacy END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'max_relation_path', u_max_relation_path".
+			" SELECT user_id, 'max_relation_path', u_max_relation_path".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)".
 			" UNION ALL".
-			"	SELECT user_id, 'auto_accept', ".
+			" SELECT user_id, 'auto_accept', ".
 			" CASE WHEN u_auto_accept IN ('Y', 'yes') THEN 1 WHEN u_auto_accept IN ('N', 'no') THEN 0 ELSE u_auto_accept END".
 			" FROM {$DBNAME}.{$TBLPREFIX}users".
 			" JOIN ##user ON (user_name=u_username COLLATE utf8_unicode_ci)"
diff --git a/placelist.php b/placelist.php
index 1116e870bf..b7d2be234e 100644
--- a/placelist.php
+++ b/placelist.php
@@ -138,18 +138,18 @@ if ($display=="hierarchy") {
 					echo "&amp;parent[$j]=", $ppart;
 				}
 			}
- 			echo "\">";
- 			if (trim($parent[$i])=="") {
- 				echo i18n::translate('unknown');
- 			} else {
- 				echo PrintReady($parent[$i]);
- 			}
+			echo "\">";
+			if (trim($parent[$i])=="") {
+				echo i18n::translate('unknown');
+			} else {
+				echo PrintReady($parent[$i]);
+			}
 			echo "</a>";
- 			if ($i>0) {
- 				echo ", ";
- 			} elseif (($TEXT_DIRECTION=="rtl" && hasRtLText($parent[$i])) || ($TEXT_DIRECTION=="ltr" &&  !hasRtLText($parent[$i]))) {
- 				echo ", ";
- 			}
+			if ($i>0) {
+				echo ", ";
+			} elseif (($TEXT_DIRECTION=="rtl" && hasRtLText($parent[$i])) || ($TEXT_DIRECTION=="ltr" &&  !hasRtLText($parent[$i]))) {
+				echo ", ";
+			}
 			if (empty($num_place)) {
 				$num_place=$parent[$i];
 			}
@@ -436,7 +436,7 @@ if ($display=="list") {
 		$i=0;
 		foreach($placelist as $indexval => $revplace) {
 			$linklevels = "";
-			$levels = explode(',', $revplace);	// -- split the place into comma seperated values
+			$levels = explode(',', $revplace); // -- split the place into comma seperated values
 			$level=0;
 			$revplace = "";
 			foreach($levels as $indexval => $place) {
@@ -489,4 +489,3 @@ else {
 echo "<br /><br /></div>";
 if ($use_googlemap && $display=="hierarchy") map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $place_names);
 print_footer();
-?>
diff --git a/search.php b/search.php
index 782765f125..322ce05080 100644
--- a/search.php
+++ b/search.php
@@ -148,7 +148,7 @@ if ($ENABLE_AUTOCOMPLETE) require WT_ROOT.'js/autocomplete.js.htm';
 
 <h2 class="center"><?php print $controller->getPageTitle(); ?></h2>
 <?php $somethingPrinted = $controller->printResults(); ?>
-<!--	/*************************************************** Search Form Outer Table **************************************************/ -->
+<!-- /*************************************************** Search Form Outer Table **************************************************/ -->
 <form method="post" name="searchform" onsubmit="return checknames(this);" action="search.php">
 <input type="hidden" name="action" value="<?php print $controller->action; ?>" />
 <input type="hidden" name="isPostBack" value="true" />
@@ -160,7 +160,7 @@ if ($ENABLE_AUTOCOMPLETE) require WT_ROOT.'js/autocomplete.js.htm';
 <table class="list_table $TEXT_DIRECTION" width="35%" border="0">
 	<tr>
 
-<!--	/**************************************************** General Search Form *************************************************************/ -->
+<!-- /**************************************************** General Search Form *************************************************************/ -->
 			<?php if($controller->action == "general") { ?>
 				<td colspan="3" class="facts_label03" style="text-align:center;">
 					<?php echo i18n::translate('General Search'), help_link('search_enter_terms'); ?>
@@ -369,7 +369,7 @@ if ($controller->action == "soundex") {
 	<!-- Individuals' names to print options (Names with hit, All names) -->
 	<!-- <tr>
 		<td class="list_label">
-			<?php 	print i18n::translate('Individuals\'<br />names to print:'); ?>
+			<?php  print i18n::translate('Individuals\'<br />names to print:'); ?>
 		</td>
 		<td class="list_value">
 			<input type="radio" name="nameprt" value="hit"
@@ -642,4 +642,3 @@ if (($controller->action != "multisite") && !$somethingPrinted ) {
 }
 
 print_footer();
-?>
diff --git a/search_advanced.php b/search_advanced.php
index d921618237..1d15393d1a 100644
--- a/search_advanced.php
+++ b/search_advanced.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2010 webtrees development team.
  *
  * Derived from PhpGedView
- * Copyright (C) 2002 to 2009	PGV Development Team. All rights reserved.
+ * Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved.
  *
  * 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
@@ -136,7 +136,7 @@ print_header(i18n::translate('Advanced search'));
 
 <h2 class="center"><?php echo $controller->getPageTitle(); ?></h2>
 <?php $somethingPrinted = $controller->PrintResults(); ?>
-<!--	/*************************************************** Search Form Outer Table **************************************************/ -->
+<!-- /*************************************************** Search Form Outer Table **************************************************/ -->
 <form method="post" name="searchform" onsubmit="return checknames(this);" action="search_advanced.php">
 <input type="hidden" name="action" value="<?php echo $controller->action; ?>" />
 <input type="hidden" name="isPostBack" value="true" />
@@ -159,8 +159,8 @@ print_header(i18n::translate('Advanced search'));
 		</td>
 		<td id="vcell<?php print $i; ?>" class="list_value">
 			<?php
-			$currentFieldSearch = $controller->getField($i);		// Get this field's name and the search criterion
-			$currentField = substr($currentFieldSearch, 0, strrpos($currentFieldSearch, ':'));		// Get the actual field name
+			$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 tabindex="<?php print $i+1; ?>" type="text" id="value<?php print $i; ?>" name="values[<?php print $i; ?>]" value="<?php print $controller->getValue($i); ?>" />
 			<?php if (preg_match("/^NAME:/", $currentFieldSearch)>0) {
@@ -195,7 +195,7 @@ print_header(i18n::translate('Advanced search'));
 			$motherSurnOption = 'SDX';
 			for($k=0; $k<$fct; $k++) {
 				$searchField = $controller->getField($k);
-				$searchOption = substr($searchField, 20);	// Assume we have something like "FAMC:HUSB:NAME:GIVN:foo"
+				$searchOption = substr($searchField, 20); // Assume we have something like "FAMC:HUSB:NAME:GIVN:foo"
 				switch (substr($searchField, 0, 20)) {
 				case 'FAMC:HUSB:NAME:GIVN:':
 					$fatherGivnOption = $searchOption;
@@ -320,4 +320,3 @@ if (!$somethingPrinted ) {
 //-- somewhere the session gedcom gets changed, so we will change it back
 $_SESSION['GEDCOM'] = $GEDCOM;
 print_footer();
-?>
diff --git a/setup.php b/setup.php
index 04b67dfc23..acaca56544 100644
--- a/setup.php
+++ b/setup.php
@@ -101,8 +101,8 @@ echo
 	'<head>',
 	'<title>webtrees setup wizard</title>',
 	'<style type="text/css">
-		body { 	color: black; background-color: white; font: 14px tahoma, arial, helvetica, sans-serif;	padding:10px; }
-		a {	color: black; font-weight: normal; text-decoration: none;}
+		body {color: black; background-color: white; font: 14px tahoma, arial, helvetica, sans-serif; padding:10px; }
+		a {color: black; font-weight: normal; text-decoration: none;}
 		a:hover {color: #81A9CB;}
 		h1 {color: #81A9CB; font-weight:normal;}
 		legend {color:#81A9CB; font-style: italic; font-weight:bold; padding: 0 5px 5px; align: top;}
diff --git a/sidebar.php b/sidebar.php
index 4402250937..39054b49dd 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -124,8 +124,8 @@ if (isset($controller)) {
 <?php
 // Sidebar state control
 // NOTE: Need config option for setting $sidebar_state.
-$sidebar_state = "open";	// "open"	= Sidebar initially open, [default]	+ normally auto pinned
-							// "closed" = Sidebar initially closed, 		+ normally auto unpinned
+$sidebar_state = "open"; // "open" = Sidebar initially open, [default] + normally auto pinned
+							// "closed" = Sidebar initially closed, + normally auto unpinned
 //
 ?>
 
@@ -174,21 +174,21 @@ jQuery(document).ready(function() {
 
 	// Sidebar Pin Function
 	jQuery('#sidebar_pin').toggle(
-   	function() {
-   		jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGES['pin-in'];?>').attr('title', '<?php echo i18n::translate('Unpin Sidebar');?>');
-   		jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=true');
-   		pinned = true;
-   	},
-   	function() {
-   		jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGES['pin-out'];?>').attr('title', '<?php echo i18n::translate('Pin Sidebar');?>');
-   	jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=false');
-   	pinned = false;
-   	}
+		function() {
+			jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGES['pin-in'];?>').attr('title', '<?php echo i18n::translate('Unpin Sidebar');?>');
+			jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=true');
+			pinned = true;
+		},
+		function() {
+			jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGES['pin-out'];?>').attr('title', '<?php echo i18n::translate('Pin Sidebar');?>');
+		jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=false');
+		pinned = false;
+		}
 	);
 	<?php if (isset($_SESSION['WT_pin']) && $_SESSION['WT_pin']) { ?>
 		jQuery('#sidebar_pin').click();
 	<?php } ?>
-   	// ---------------------
+	// ---------------------
 
 	var modsLoaded = false;
 
@@ -210,14 +210,14 @@ jQuery(document).ready(function() {
 		jQuery('#sidebarAccordion').show();
 		jQuery('#sidebar_pin').show();
 		// Shift content
-   	var newwidth = 310;
+		var newwidth = 310;
 		newwidth = jQuery('#tabs').width() - newwidth;
 		// NOTE: REM next line to avoid the "page shift" when Navigator is opened. (Purely a preference choice)
-   	jQuery('#tabs > div').css('width', newwidth+'px');
+		jQuery('#tabs > div').css('width', newwidth+'px');
 		//
-  		<?php if ($sidebar_state == "open" ) { ?>
+			<?php if ($sidebar_state == "open" ) { ?>
 			jQuery('#sidebar_pin').click();
-  		<?php } ?>
+			<?php } ?>
 
 		<?php if ($sidebar_state == "open") { ?>
 			jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=true&sb_closed=false');
@@ -243,8 +243,8 @@ jQuery(document).ready(function() {
 			jQuery('#tabs div').css('width', '');
 		//
 		<?php if ($sidebar_state == "open" ) { ?>
-  			jQuery('#sidebar_pin').click();
-  		<?php } ?>
+			jQuery('#sidebar_pin').click();
+		<?php } ?>
 
 		jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=false&sb_closed=true');
 		sb_open=false;
@@ -252,23 +252,23 @@ jQuery(document).ready(function() {
 	// -----------------------------
 
 	<?php if  ( $sidebar_state == "open" ) { ?>
- 		<?php if ( isset($_SESSION['WT_pin']) && $_SESSION['WT_pin'] || !isset($_SESSION['WT_sb_closed']) ) { ?>
+		<?php if ( isset($_SESSION['WT_pin']) && $_SESSION['WT_pin'] || !isset($_SESSION['WT_sb_closed']) ) { ?>
 			jQuery('#sidebar_open').click();
 			jQuery('#sidebar_controls').show();
 			if ( pinned == false ) {
 				jQuery('#sidebar_pin').click();
 			}
-  		<?php } else { ?>
-  			jQuery('#sidebar_controls').show();
-  		<?php } ?>
-  	<?php } ?>
+			<?php } else { ?>
+				jQuery('#sidebar_controls').show();
+			<?php } ?>
+		<?php } ?>
 
-  	<?php if ( $sidebar_state == "closed" ) { ?>
-  		if ( pinned == true) {
-  			jQuery('#sidebar_open').click();
-  		}
-  		jQuery('#sidebar_controls').show();
-  	<?php } ?>
+		<?php if ( $sidebar_state == "closed" ) { ?>
+			if ( pinned == true) {
+				jQuery('#sidebar_open').click();
+			}
+			jQuery('#sidebar_controls').show();
+		<?php } ?>
 
 });
 -->
diff --git a/site-unavailable.php b/site-unavailable.php
index 31ee5ff9d6..b43dc81b81 100644
--- a/site-unavailable.php
+++ b/site-unavailable.php
@@ -47,8 +47,8 @@ echo
 	'<head>',
 	'<title>Site Unavailable - webtrees</title>',
 	'<style type="text/css">
-		body { 	color: gray; background-color: white; font: 14px tahoma, arial, helvetica, sans-serif;	padding:10px; }
-		a {	color: #81A9CB; font-weight: bold; text-decoration: none;}
+		body {color: gray; background-color: white; font: 14px tahoma, arial, helvetica, sans-serif; padding:10px; }
+		a {color: #81A9CB; font-weight: bold; text-decoration: none;}
 		a:hover {text-decoration: underline;}
 		h1 {color: #81A9CB; font-weight:normal; text-align:center;}
 		li {line-height:2;}
diff --git a/statistics.php b/statistics.php
index 2962a385c6..f1626fab8c 100644
--- a/statistics.php
+++ b/statistics.php
@@ -540,14 +540,14 @@ if (isset($content) && $content==1) {
 			if ($plottype == "15") echo " checked=\"checked\"";
 			echo " onclick=\"{statusChecked('z_none'); statusDisable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
 			echo "\" /><label for=\"stat_15\">", i18n::translate('Month of first marriage'), "</label><br />";
-		//	echo "<input type=\"radio\" id=\"stat_14\" name=\"x-as\" value=\"14\"";
-		//	if ($plottype == "14") echo " checked=\"checked\"";
-		//	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
-		//	echo "\" /><label for=\"stat_14\">", i18n::translate('Month of birth of first child in a relation'), "</label><br />";
-		//	echo "<input type=\"radio\" id=\"stat_16\" name=\"x-as\" value=\"16\"";
-		//	if ($plottype == "16") echo " checked=\"checked\"";
-		//	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusShow('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
-		//	echo "\" /><label for=\"stat_16\">", i18n::translate('Months between marriage and first child'), "</label><br />";
+			//echo "<input type=\"radio\" id=\"stat_14\" name=\"x-as\" value=\"14\"";
+			//if ($plottype == "14") echo " checked=\"checked\"";
+			//echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+			//echo "\" /><label for=\"stat_14\">", i18n::translate('Month of birth of first child in a relation'), "</label><br />";
+			//echo "<input type=\"radio\" id=\"stat_16\" name=\"x-as\" value=\"16\"";
+			//if ($plottype == "16") echo " checked=\"checked\"";
+			//echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusShow('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+			//echo "\" /><label for=\"stat_16\">", i18n::translate('Months between marriage and first child'), "</label><br />";
 			echo "<input type=\"radio\" id=\"stat_17\" name=\"x-as\" value=\"17\"";
 			if ($plottype == "17") echo " checked=\"checked\"";
 			echo " onclick=\"{statusEnable('z_sex'); statusShow('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
@@ -788,7 +788,7 @@ if (isset($content) && $content==1) {
 			</li>
 			<li class="ui-state-default ui-corner-top">
 				<a name="pagetab2" title="<?php echo i18n::translate('Others');?>" href="statistics.php?ged=<?php echo $GEDCOM; ?>&content=1&tab=2"><span>
-					<?php echo i18n::translate('Others');?></span>	</a>
+					<?php echo i18n::translate('Others');?></span></a>
 			</li>
 			<li class="ui-state-default ui-corner-top">
 				<a name="pagetab3" title="<?php echo i18n::translate('Own charts');?>" href="statistics.php?ged=<?php echo $GEDCOM; ?>&content=1&tab=3"><span>
diff --git a/statisticsplot.php b/statisticsplot.php
index c2d7823f4e..4265be032c 100644
--- a/statisticsplot.php
+++ b/statisticsplot.php
@@ -471,8 +471,8 @@ function nuch() {
 
 function fill_ydata($z, $x, $val) {
 	global $ydata, $xmax, $xgrenzen, $zmax, $zgrenzen, $xgiven, $zgiven;
-	//--	calculate index $i out of given z value
-	//--	calculate index $j out of given x value
+	//-- calculate index $i out of given z value
+	//-- calculate index $j out of given x value
 	if ($xgiven) $j = $x;
 	else {
 		$j=0;
@@ -813,8 +813,8 @@ function print_sources_stats_chart($type){
 	}
 }
 
-//--	========= start of main program =========
-$action	= safe_REQUEST($_REQUEST, 'action', WT_REGEX_XREF);
+//-- ========= start of main program =========
+$action = safe_REQUEST($_REQUEST, 'action', WT_REGEX_XREF);
 
 if ($action=="update") {
 	$x_as = $_POST["x-as"];
@@ -901,38 +901,38 @@ $g_xas = "1,2,3,4,5,6,7,8,9,10,11,12"; //should not be needed. but just for mont
 
 switch ($x_as) {
 case '11':
-	//---------	nr, type, xgiven,	zgiven,	title, xtitle, ytitle, boundaries_x, boundaries-z, function
-	set_params(11, "IND", true, 	false, i18n::translate('Month of birth'),  i18n::translate('month'), 	$y_as, 	$g_xas, 	$zgp, "bimo");
+	//--------- nr, type, xgiven, zgiven, title, xtitle, ytitle, boundaries_x, boundaries-z, function
+	set_params(11, "IND", true, false, i18n::translate('Month of birth'),  i18n::translate('month'), $y_as, $g_xas, $zgp, "bimo");
 	break;
 case '12':
-	set_params(12, "IND", true, 	false, i18n::translate('Month of death'),  i18n::translate('month'), 	$y_as, 	$g_xas, 	$zgp, "demo");
+	set_params(12, "IND", true, false, i18n::translate('Month of death'),  i18n::translate('month'), $y_as, $g_xas, $zgp, "demo");
 	break;
 case '13':
-	set_params(13, "FAM", true, 	false, i18n::translate('Month of marriage'),  i18n::translate('month'), 	$y_as, 	$g_xas, 	$zgp, "mamo");
+	set_params(13, "FAM", true, false, i18n::translate('Month of marriage'),  i18n::translate('month'), $y_as, $g_xas, $zgp, "mamo");
 	break;
 case '14':
-	set_params(14, "FAM", true, 	false, i18n::translate('Month of birth of first child in a relation'), i18n::translate('month'), 	$y_as, 	$g_xas, 	$zgp, "bimo1");
+	set_params(14, "FAM", true, false, i18n::translate('Month of birth of first child in a relation'), i18n::translate('month'), $y_as, $g_xas, $zgp, "bimo1");
 	break;
 case '15':
-	set_params(15, "FAM", true, 	false, i18n::translate('Month of first marriage'), i18n::translate('month'), 	$y_as, 	$g_xas, 	$zgp, "mamo1");
+	set_params(15, "FAM", true, false, i18n::translate('Month of first marriage'), i18n::translate('month'), $y_as, $g_xas, $zgp, "mamo1");
 	break;
 case '16':
-	set_params(16, "FAM", false, 	false, i18n::translate('Months between marriage and first child'), i18n::translate('Months between marriage and birth of first child'), $y_as, $xgm, 	$zgp, "mamam");
+	set_params(16, "FAM", false, false, i18n::translate('Months between marriage and first child'), i18n::translate('Months between marriage and birth of first child'), $y_as, $xgm, $zgp, "mamam");
 	break;
 case '17':
-	set_params(17, "IND", false, 	false, i18n::translate('Age related to birth year'), i18n::translate('age'), 	$y_as, 	$xgl, 	$zgp, "agbi");
+	set_params(17, "IND", false, false, i18n::translate('Age related to birth year'), i18n::translate('age'), $y_as, $xgl, $zgp, "agbi");
 	break;
 case '18':
-	set_params(18, "IND", false, 	false, i18n::translate('Age related to death year'), i18n::translate('age'), 	$y_as, 	$xgl, 	$zgp, "agde");
+	set_params(18, "IND", false, false, i18n::translate('Age related to death year'), i18n::translate('age'), $y_as, $xgl, $zgp, "agde");
 	break;
 case '19':
-	set_params(19, "IND", false, 	false, i18n::translate('Age in year of marriage'), i18n::translate('age'), 	$y_as, 	$xglm, 	$zgp, "agma");
+	set_params(19, "IND", false, false, i18n::translate('Age in year of marriage'), i18n::translate('age'), $y_as, $xglm, $zgp, "agma");
 	break;
 case '20':
-	set_params(20, "IND", false, 	false, i18n::translate('Age in year of first marriage'), i18n::translate('age'), 	$y_as, 	$xglm, 	$zgp, "agma1");
+	set_params(20, "IND", false, false, i18n::translate('Age in year of first marriage'), i18n::translate('age'), $y_as, $xglm, $zgp, "agma1");
 	break;
 case '21':
-	set_params(21, "FAM", false, 	false, i18n::translate('Number of children'), i18n::translate('children'), 	$y_as, 	$xga, 	$zgp, "nuch");  //plot Number of children
+	set_params(21, "FAM", false, false, i18n::translate('Number of children'), i18n::translate('children'), $y_as, $xga, $zgp, "nuch");  //plot Number of children
 	break;
 case '1':
 	echo $stats->chartDistribution($chart_shows, $chart_type, $surname);
diff --git a/timeline.php b/timeline.php
index de3bdf24fc..09fb75ec1b 100644
--- a/timeline.php
+++ b/timeline.php
@@ -283,8 +283,8 @@ $controller->checkPrivacy();
 				echo $indi->getSexImage('large', '', i18n::translate_c('unknown gender', 'Unknown'));
 			}
 		?>
- 			<a href="individual.php?pid=<?php echo $pid; ?>">&nbsp;<?php echo PrintReady($indi->getFullName()); ?><br /><br />
- 			<?php $addname = $indi->getAddName(); if (strlen($addname) > 0) echo PrintReady($addname); ?>
+			<a href="individual.php?pid=<?php echo $pid; ?>">&nbsp;<?php echo PrintReady($indi->getFullName()); ?><br /><br />
+			<?php $addname = $indi->getAddName(); if (strlen($addname) > 0) echo PrintReady($addname); ?>
 			</a>
 			<input type="hidden" name="pids[<?php echo $p; ?>]" value="<?php echo htmlentities($pid, ENT_COMPAT, 'UTF-8'); ?>" />
 				<a href="timeline.php?<?php echo $controller->pidlinks; ?>&amp;scale=<?php echo $controller->scale; ?>&amp;remove=<?php echo $pid;?>" >
diff --git a/uploadmedia.php b/uploadmedia.php
index c8179d63e2..755b724e4d 100644
--- a/uploadmedia.php
+++ b/uploadmedia.php
@@ -39,7 +39,7 @@ require_once WT_ROOT.'includes/functions/functions_mediadb.php';
 function dir_is_writable($dir) {
 	$err_write = false;
 	$handle = @fopen(filename_decode($dir."x.y"),"w+");
-	if	($handle) {
+	if ($handle) {
 		$i = fclose($handle);
 		$err_write = true;
 		@unlink(filename_decode($dir."x.y"));
@@ -84,7 +84,6 @@ if (!dir_is_writable($MEDIA_DIRECTORY) || !$MULTI_MEDIA) {
 	print i18n::translate('Uploading media files is not allowed because multi-media items have been disabled or because the media directory is not writable.');
 	print "</b></span><br />";
 } else {
-	show_mediaUpload_form('uploadmedia.php', false);		// We have the green light to upload media, print the form
+	show_mediaUpload_form('uploadmedia.php', false); // We have the green light to upload media, print the form
 }
 print_footer();
-?>
diff --git a/useradmin.php b/useradmin.php
index c2d0658289..e51fe499a8 100644
--- a/useradmin.php
+++ b/useradmin.php
@@ -186,7 +186,8 @@ if ($action=='createuser' || $action=='edituser2') {
 				$message["method"]="messaging2";
 				addMessage($message);
 				// and send a copy to the admin
-/*				$message=array();
+				/*
+				$message=array();
 				$message["to"]=WT_USER_NAME;
 				$headers="From: ".$WEBTREES_EMAIL;
 				$message["from"]=$username; // fake the from address - so the admin can "reply" to it.
@@ -204,7 +205,7 @@ if ($action=='createuser' || $action=='edituser2') {
 } else {
 	print_header(i18n::translate('User administration'));
 
-//	if ($ENABLE_AUTOCOMPLETE) require WT_ROOT.'js/autocomplete.js.htm'; Removed becasue it doesn't work here for multiple GEDCOMs. Can be reinstated when fixed (https://bugs.launchpad.net/webtrees/+bug/613235)
+// if ($ENABLE_AUTOCOMPLETE) require WT_ROOT.'js/autocomplete.js.htm'; Removed becasue it doesn't work here for multiple GEDCOMs. Can be reinstated when fixed (https://bugs.launchpad.net/webtrees/+bug/613235)
 }
 
 // Print the form to edit a user
@@ -832,7 +833,7 @@ if ($action == "cleanup") {
 	</tr>
 	<?php
 	// Check for idle users
-//	if (!isset($month)) $month = 1;
+	//if (!isset($month)) $month = 1;
 	$month = safe_GET_integer('month', 1, 12, 6);
 	echo "<tr><td class=\"descriptionbox\">", i18n::translate('Number of months since the last login for a user\'s account to be considered inactive: '), "</td>";
 	echo "<td class=\"optionbox\"><select onchange=\"document.location=options[selectedIndex].value;\">";
@@ -968,13 +969,13 @@ echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return t
 	<tr>
 	<td class="optionbox" colspan="3">
 	<?php
-	$totusers = 0;			// Total number of users
-	$warnusers = 0;			// Users with warning
-	$applusers = 0;			// Users who have not verified themselves
-	$nverusers = 0;			// Users not verified by admin but verified themselves
-	$adminusers = 0;		// Administrators
-	$userlang = array();	// Array for user languages
-	$gedadmin = array();	// Array for gedcom admins
+	$totusers = 0;       // Total number of users
+	$warnusers = 0;      // Users with warning
+	$applusers = 0;      // Users who have not verified themselves
+	$nverusers = 0;      // Users not verified by admin but verified themselves
+	$adminusers = 0;     // Administrators
+	$userlang = array(); // Array for user languages
+	$gedadmin = array(); // Array for gedcom admins
 	foreach(get_all_users() as $user_id=>$user_name) {
 		$totusers = $totusers + 1;
 		if (((date("U") - (int)get_user_setting($user_id, 'reg_timestamp')) > 604800) && !get_user_setting($user_id, 'verified')) $warnusers++;
diff --git a/wtinfo.php b/wtinfo.php
index fe172eb7d5..6efe469c9b 100644
--- a/wtinfo.php
+++ b/wtinfo.php
@@ -76,12 +76,8 @@ if ($action == "phpinfo") {
 	$php_info = substr($php_info, $offset);
 
 	echo $php_info;
-
 	echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return to Administration page'), '" onclick="javascript:window.location=\'admin.php\'" /></p>';
 	echo '</div>';
-
-	//	exit;
 }
 
 print_footer();
-?>