author: fisharebest <fisharebest@gmail.com> 2010-09-25 19:25:10 +0000
committer: fisharebest <fisharebest@gmail.com> 2010-09-25 19:25:10 +0000
commit: 8e34d70b279a52c64eec2f2b727416f7b1b1bca3 (patch)
tree: c4b382be493795aa5c0b1bccce173b0897540970
parent: c3c1e07595f0efb20d13c858d96810dc7ed295ad (diff)
download: webtrees-8e34d70b279a52c64eec2f2b727416f7b1b1bca3.tar.gz
webtrees-8e34d70b279a52c64eec2f2b727416f7b1b1bca3.tar.bz2
webtrees-8e34d70b279a52c64eec2f2b727416f7b1b1bca3.zip
95 files changed, 758 insertions, 781 deletions
diff --git a/edit_interface.php b/edit_interface.php
index 82c73706ef..6f21b3792c 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -1128,7 +1128,7 @@ case 'editnote':
 					$event = new Event(get_sub_record(1, "1 CHAN", $gedrec));
 					echo format_fact_date($event, false, true);
 					echo "</td></tr>\n";
-				} 
+				}
 			?>
 		</table>
 		<br /><br />
diff --git a/familybook.php b/familybook.php
index af3776cfc4..47b2c04847 100644
--- a/familybook.php
+++ b/familybook.php
@@ -63,7 +63,7 @@ function print_descendency($person, $count) {
 	}
 
 	$pid=$person->getXref();
-	
+
 	echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\">";
 	echo "<tr>";
 	echo "<td width=\"".($bwidth-2)."\">";
@@ -189,7 +189,7 @@ function print_person_pedigree($pid, $count) {
 
 function print_family_book($person, $descent) {
 	global $generations, $dgenerations, $firstrun;
-	
+
 	if ($descent==0 || !$person->canDisplayName()) {
 		return;
 	}
@@ -316,7 +316,7 @@ if ($show_spouse) echo " checked=\"checked\""; ?> />
 </td></tr></table>
 
 <?php
-	
+
 echo
 	'<div id="familybook_chart',
 	($TEXT_DIRECTION=="ltr")?"":"_rtl",
diff --git a/help_text.php b/help_text.php
index 735a37d3c1..7ae1eb7503 100644
--- a/help_text.php
+++ b/help_text.php
@@ -3414,7 +3414,7 @@ case 'edituser_realname':
 
 case 'edituser_password':
 	$title=i18n::translate('Password');
-	$text=i18n::translate('Passwords must be at least 6 characters long and are case-sensitive, so that "s3CR#t" is different to "S3CR#t".'); 
+	$text=i18n::translate('Passwords must be at least 6 characters long and are case-sensitive, so that "s3CR#t" is different to "S3CR#t".');
 	break;
 
 case 'edituser_rootid':
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 4603eb2c5b..6713c9bf2b 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -468,7 +468,7 @@ function print_header($title) {
 	}
 	$bodyOnLoad .= "\"";
 	require WT_ROOT.$headerfile;
-	
+
 	// Allow the browser to format the header/menus while we generate the page
 	flush();
 }
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index b9d7cf583f..4c9749c8f4 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -1308,7 +1308,7 @@ function format_surname_list($surnames, $style, $totals) {
 		$newcol=ceil($count/$col);
 		$html2 ='<table class="list_table"><tr>';
 		$html2.='<td class="list_value" style="padding: 14px;">';
-		
+
 		foreach ($html as $surn=>$surns) {
 			$html2.= $surns.'<br />';
 			$i++;
@@ -1318,7 +1318,7 @@ function format_surname_list($surnames, $style, $totals) {
 			}
 		}
 		$html2.='</td></tr></table>';
-		
+
 		return $html2;
 	}
 }
diff --git a/js/jw_player/flvVideo.php b/js/jw_player/flvVideo.php
index 814035f6f4..d0a439223c 100644
--- a/js/jw_player/flvVideo.php
+++ b/js/jw_player/flvVideo.php
@@ -59,17 +59,17 @@ $preview="";
 			type="application/x-shockwave-flash"
 			id="player2"
 			name="player2"
-			src="player.swf" 
-			width="400" 
+			src="player.swf"
+			width="400"
 			height="315"
-			allowscriptaccess="always" 
+			allowscriptaccess="always"
 			allowfullscreen="true"
 			flashvars="file=http://www.youtube.com/watch?v=TF6cnLnEARo"
 		/>
 	</object>
 	-->
 	<!-- END OF THE PLAYER EMBEDDING -->
-	
+
 
 	<div id="container"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this player.</div>
 	<script type="text/javascript">
@@ -81,7 +81,7 @@ $preview="";
 		s1.addParam("stretching","fill");
 		s1.addParam("flashvars","file=" +video+ "&image=" +preview+ "&autostart=true" );
 		s1.write("container");
-  </script> 
+  </script>
 
 
 
diff --git a/modules/GEDFact_assistant/CENS_ctrl.php b/modules/GEDFact_assistant/CENS_ctrl.php
index 8e6cbc9f54..3351757a35 100644
--- a/modules/GEDFact_assistant/CENS_ctrl.php
+++ b/modules/GEDFact_assistant/CENS_ctrl.php
@@ -29,9 +29,9 @@
  * @version $Id$
  */
 // require_once './config.php';
-require_once 'includes/controllers/individual_ctrl.php'; 
-$controller = new IndividualController(); 
-$controller->init(); 
+require_once 'includes/controllers/individual_ctrl.php';
+$controller = new IndividualController();
+$controller->init();
 
 global $USE_THUMBS_MAIN, $tabno;
 global $linkToID;
@@ -39,7 +39,7 @@ global $SEARCH_SPIDER, $GOOGLEMAP_PH_CONTROLS;
 
 		global $WT_IMAGES, $SHOW_AGE_DIFF;
 		global $GEDCOM, $ABBREVIATE_CHART_LABELS;
-		global $show_full; 
+		global $show_full;
 		global $famid;
 
 		$summary=$controller->indi->format_first_major_fact(WT_EVENTS_BIRT, 2);
@@ -55,4 +55,3 @@ global $SEARCH_SPIDER, $GOOGLEMAP_PH_CONTROLS;
 		$controller->census_assistant();
 
 // print_footer();
-?>
diff --git a/modules/GEDFact_assistant/MEDIA_ctrl.php b/modules/GEDFact_assistant/MEDIA_ctrl.php
index f85d9dff4d..24a379e1b0 100644
--- a/modules/GEDFact_assistant/MEDIA_ctrl.php
+++ b/modules/GEDFact_assistant/MEDIA_ctrl.php
@@ -29,9 +29,9 @@
  * @version $Id$
  */
 
-require_once WT_ROOT.'includes/controllers/individual_ctrl.php'; 
-$controller = new IndividualController(); 
-$controller->init(); 
+require_once WT_ROOT.'includes/controllers/individual_ctrl.php';
+$controller = new IndividualController();
+$controller->init();
 echo "<link href =\"modules/GEDFact_assistant/css/gf_styles.css\" rel=\"stylesheet\" type=\"text/css\" media=\"screen\" />";
 
 global $USE_THUMBS_MAIN, $tabno;
@@ -40,9 +40,9 @@ global $SEARCH_SPIDER, $GOOGLEMAP_PH_CONTROLS;
 
 		global $WT_IMAGES, $SHOW_AGE_DIFF;
 		global $GEDCOM, $ABBREVIATE_CHART_LABELS;
-		global $show_full; 
+		global $show_full;
 		global $famid, $censyear, $censdate;
-		
+
 // print_simple_header("Census");
 
 		$summary=$controller->indi->format_first_major_fact(WT_EVENTS_BIRT, 2);
diff --git a/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php b/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php
index 075fe22bfe..3d64058351 100644
--- a/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php
+++ b/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php
@@ -55,10 +55,10 @@
 	if (isset($_REQUEST['PUBL'])) $PUBL = $_REQUEST['PUBL'];
 	if (isset($_REQUEST['REPO'])) $REPO = $_REQUEST['REPO'];
 	if (isset($_REQUEST['CALN'])) $CALN = $_REQUEST['CALN'];
-	
+
 	if (isset($_REQUEST['pid_array'])) $pid_array = $_REQUEST['pid_array'];
 	if (isset($_REQUEST['pid']))  $pid = $_REQUEST['pid'];
-	
+
 	global $pid;
 
 	if (!empty($NOTE)) {
@@ -108,7 +108,7 @@
 		echo "<div class=indent> No individuals entered, close and try again </div>";
 		echo "<br /><br /><br />";
 	}
-	
+
 	if ($xref != "none") {
 		echo "<br /><br />\n".i18n::translate('New Shared Note created successfully.')." (".$xref.")<br /><br />";
 		echo "<br /><br />";
diff --git a/modules/GEDFact_assistant/_CENS/census_1_ctrl.php b/modules/GEDFact_assistant/_CENS/census_1_ctrl.php
index 98222b53f0..edb1dd8863 100644
--- a/modules/GEDFact_assistant/_CENS/census_1_ctrl.php
+++ b/modules/GEDFact_assistant/_CENS/census_1_ctrl.php
@@ -28,14 +28,14 @@
  * @subpackage Census Assistant
  * @version $Id$
  */
- 
+
  if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
 global $summary, $theme_name, $censyear, $censdate;
- 
+
 $pid = safe_get('pid');
 
 $censdate  = new GedcomDate("31 MAR 1901");
@@ -65,7 +65,7 @@ $currpid=$pid;
 <?php
 	echo WT_JS_START;
 		 echo "var TheCenYear = opener.document.getElementById('setyear').value;";
-		 echo "var TheCenCtry = opener.document.getElementById('setctry').value;"; 
+		 echo "var TheCenCtry = opener.document.getElementById('setctry').value;";
 	echo WT_JS_END;
 
 
@@ -79,9 +79,9 @@ $currpid=$pid;
 				echo "<div class=\"cens_header_right\"/>". $summary. "</div>";
 			}
 	echo "</div>";
-	
 
-	//-- Census & Source Information Area ============================================= 
+
+	//-- Census & Source Information Area =============================================
 	echo "<div class=\" cens_container\">";
 		echo "<span >";
 			include('modules/GEDFact_assistant/_CENS/census_2_source_input.php');
@@ -91,13 +91,13 @@ $currpid=$pid;
 			include('modules/GEDFact_assistant/_CENS/census_4_text.php');
 		echo "</span>";
 	echo "</div>";
-	
-	//-- Search  and Add Family Members Area ========================================== 
+
+	//-- Search  and Add Family Members Area ==========================================
 	echo "<div class=\"optionbox cens_search\" style=\"overflow:-moz-scrollbars-horizontal;overflow-x:hidden;overflow-y:scroll;\">";
 		?><!--[if lte IE 7]><style>.cens_search{margin-top:-0.7em;}</style><![EndIf]--><?php
 		include('modules/GEDFact_assistant/_CENS/census_3_search_add.php');
 	echo "</div>";
-	
+
 	//-- Census Text Input Area =======================================================
 	?>
 	<div class="optionbox cens_textinput">
@@ -109,14 +109,14 @@ $currpid=$pid;
 			<input  type="radio" name="totallyrad" value="0" checked="checked" />
 		</div>
 	<?php
-	
+
 	//-- Census Add Rows Area =========================================================
 		echo "<div class=\"cens_addrows\">";
 			include('modules/GEDFact_assistant/_CENS/census_5_input.php');
 		echo "</div>";
-		?> 
+		?>
 	</div>
-	
+
 
 <script>
 
diff --git a/modules/GEDFact_assistant/_CENS/census_2_source_input.php b/modules/GEDFact_assistant/_CENS/census_2_source_input.php
index 2b1a04be40..f17f861ee0 100644
--- a/modules/GEDFact_assistant/_CENS/census_2_source_input.php
+++ b/modules/GEDFact_assistant/_CENS/census_2_source_input.php
@@ -69,11 +69,11 @@ global $TEXT_DIRECTION;
 		} else if (cenyear == 1940) { var cendate = new Date(1940, 3, 01);    // 01 APR 1940
 		// Default Date
 		} else {
-			var cendate = new Date(1901, 2, 31); 
+			var cendate = new Date(1901, 2, 31);
 		}
 		return cendate;
 	}
-	
+
 	function getPrevCenDate(cenyear) {
 		// UK PREVIOUS CENSUS DATES
 		       if (prevcenyear == 1841) { var prevcendate = new Date(1841, 5, 06);    // 06 JUN 1841
@@ -105,7 +105,7 @@ global $TEXT_DIRECTION;
 		} else if (prevcenyear == 1940) { var prevcendate = new Date(1940, 3, 01);    // 01 APR 1940
 		// Default Date
 		} else {
-			var prevcendate = new Date(1901, 2, 31); 
+			var prevcendate = new Date(1901, 2, 31);
 		}
 		return prevcendate;
 	}
@@ -138,7 +138,7 @@ global $TEXT_DIRECTION;
 				window.opener.showchanges();
 		window.close();
 	}
-	
+
 	function changeCtry() {
 		// Change Year field Colour ----------------------------------------------
 		if (document.getElementById('censYear').value=="choose") {
@@ -150,7 +150,7 @@ global $TEXT_DIRECTION;
 	}
 
 	function changeYear(cenyear) {
-	
+
 		var cenctry=document.getElementById('censCtry').value;
 			// alert("Set Date is in the "+TheCenCtry+" --- "+"Now in "+cenctry);
 
@@ -173,7 +173,7 @@ global $TEXT_DIRECTION;
 		changeMC(cenyear);
 		changeChBorn(cenyear)
 		preview();
-		
+
 		// Toggle Countries when the preset UK Cens Date has been been used -------------
 		if (TheCenCtry=="UK") {
 			if (cenyear!=TheCenYear && cenctry!=TheCenCtry) {
@@ -227,7 +227,7 @@ global $TEXT_DIRECTION;
 
 
 	}
-	
+
 	// Change Marital Condition and Years Married based on Census Year ======================
 	function changeMC(cenyear) {
 		var cendate = getCenDate(cenyear);
@@ -236,7 +236,7 @@ global $TEXT_DIRECTION;
 		for(var i=1; i<tbl.rows.length; i++) { // start at i=1 because we need to avoid header
 			var tr = tbl.rows[i];
 			for(var j=2; j<tr.cells.length; j++){
-				if (j!=4 && j!=15) { 
+				if (j!=4 && j!=15) {
 					// 4 and 15 are the marital condition columns (fields)
 					// therefore miss out all cols except these marital condition cols
 					continue;
@@ -253,7 +253,7 @@ global $TEXT_DIRECTION;
 					var one_day   = 1000*60*60*24;
 					var one_month = (365.26*one_day)/12;
 					var one_year  = 365.26*one_day;
-					
+
 					// Date of Birth (dob) - passed as Julian Date String
 					if (dob>1721060) {
 						IJD = Math.floor(dob);
@@ -269,7 +269,7 @@ global $TEXT_DIRECTION;
 						I = 100*(N - 49) + I + L;
 						dob = (I+', '+J+', '+K);
 					}
-					// Create Date of Birth object from passed string dob 
+					// Create Date of Birth object from passed string dob
 					var jsdob = Date.parseString(dob, 'y, M, d');
 
 					// Date of Marriage (dom) - passed as Julian Date String
@@ -287,9 +287,9 @@ global $TEXT_DIRECTION;
 						I = 100*(N - 49) + I + L;
 						dom = (I+', '+J+', '+K);
 					}
-					// Create Date of Marriage object from passed string dom 
+					// Create Date of Marriage object from passed string dom
 					var jsdom = Date.parseString(dom, 'y, M, d');
-					
+
 					// Date of Death (dod) - passed as Julian Date String
 					if (dod>1721060) {
 						IJD = Math.floor(dod);
@@ -305,7 +305,7 @@ global $TEXT_DIRECTION;
 						I = 100*(N - 49) + I + L;
 						dod = (I+', '+J+', '+K);
 					}
-					// Create Date of Marriage object from passed string dom 
+					// Create Date of Marriage object from passed string dom
 					var jsdod = Date.parseString(dod, 'y, M, d');
 
 					if (cendate > jsdom) {
@@ -325,22 +325,22 @@ global $TEXT_DIRECTION;
 
 				tr.cells[j].childNodes[0].value = marrcond;
 				tr.cells[16].childNodes[0].value = yrsmarr;
-				
+
 				//-- If single and USA 1930, set Years married to "-" ------------------
 				if (marrcond=="S" && cenyear=="1930") {
 					tr.cells[20].childNodes[0].value = "-";
 				}
 				//-- If married or widowed set name to married name --------------------
 				if (marrcond=="M" || marrcond=="W") {
-					tr.cells[2].childNodes[0].value = marrnam; 
+					tr.cells[2].childNodes[0].value = marrnam;
 				}
 				//-- If single or unmarried set name to birth (full) name --------------
 				if (marrcond=="S" || marrcond=="U") {
 					tr.cells[2].childNodes[0].value = fullnam;
 				}
-				
+
 				var age = (tr.cells[7].childNodes[0].value);  // Age
-				
+
 			}
 		}
 	}
@@ -352,13 +352,13 @@ global $TEXT_DIRECTION;
 		for(var i=1; i<tbl.rows.length; i++) { // start at i=1 because we need to avoid header
 			var tr = tbl.rows[i];
 			for(var j=2; j<tr.cells.length; j++){
-				if (j!=73) { 
+				if (j!=73) {
 					// 73 is the Chil born array column
 					// therefore miss out all cols except this column's cells
 					continue;
 				} else {
 					// Calculate Children Born, Living, Died --------------------------
-					var chilBLD = (tr.cells[73].childNodes[0].value); 
+					var chilBLD = (tr.cells[73].childNodes[0].value);
 					chBLDarray = chilBLD.split('::');
 					var cdat   = calculateJD(cendate);
 					// Variables to be used ---------
@@ -376,11 +376,11 @@ global $TEXT_DIRECTION;
 						var y;
 						for (y = 0; y<chBLDarray2.length; y++) {
 							chBLD[x][y] = chBLDarray2[y];
-							if (y==2 && (cdat>(chBLD[x][1]) && chBLD[x][1]!=0) && (chBLD[x][2]==0 || cdat<(chBLD[x][2]))) { 
+							if (y==2 && (cdat>(chBLD[x][1]) && chBLD[x][1]!=0) && (chBLD[x][2]==0 || cdat<(chBLD[x][2]))) {
 								ALIVE=ALIVE+1;
-							} else if (y==2 && cdat>(chBLD[x][2]) && (chBLD[x][2])!=0) { 
+							} else if (y==2 && cdat>(chBLD[x][2]) && (chBLD[x][2])!=0) {
 								DEAD=DEAD+1;
-							} else if (y==2) { 
+							} else if (y==2) {
 								NOTBORN=NOTBORN+1;
 							}
 						}
@@ -413,9 +413,9 @@ global $TEXT_DIRECTION;
 		if (prevyr.value !="") {
 			var prevcenyear=prevyr.value;
 		} else {
-			// alert("cenyear = "+cenyear+" ... prevcenyear = base_"+base1901); 
+			// alert("cenyear = "+cenyear+" ... prevcenyear = base_"+base1901);
 		}
-		
+
 		var cendate = getCenDate(cenyear);
 
 		var one_day   = 1000*60*60*24;
@@ -468,11 +468,11 @@ global $TEXT_DIRECTION;
 						I = 100*(N - 49) + I + L;
 						dage = (I+', '+J+', '+K);
 					}
-					
+
 					// Caculate Age (or if Dead) on the selected Census Date ===================
 					var bage2 = Date.parseString(bage, 'y, M, d');
 					var dage2 = Date.parseString(dage, 'y, M, d');
-					
+
 					if (cendate > dage2) {
 						newage = "-";
 					} else if (bage2 != "Invalid Date") {
@@ -497,7 +497,7 @@ global $TEXT_DIRECTION;
 						newage = "-";
 					}
 					tr.cells[j].childNodes[0].value=newage;
-					
+
 					// Highlight in Pink the Name field and Age fields for any person not born or who died before census date -----
 					if (newage != "-") {
 						tr.cells[2].childNodes[0].style.background  = '#ffffff';
@@ -523,11 +523,11 @@ global $TEXT_DIRECTION;
 		var prev = document.getElementById('prevYear');
 		prev.value = cenyear;
 	}
-	
+
 	// Add or Remove columns ===========================
 	function changeCols(cenyear) {
 		var cens_ctry = document.getElementById('censCtry').value;
-		
+
 		var cols_0 = document.getElementsByName('col_0');
 		var cols_1 = document.getElementsByName('col_1');
 		var cols_2 = document.getElementsByName('col_2');
@@ -665,10 +665,10 @@ global $TEXT_DIRECTION;
 		var flip_66 = "none";
 		var flip_67 = "none";
 		// var flip_68 = "none";
-		
+
 		if (cens_ctry=="UK") {
-		
-			if (cenyear=="1911" || cenyear=="1921" || cenyear=="1931") { 
+
+			if (cenyear=="1911" || cenyear=="1921" || cenyear=="1931") {
 				flip_3 = "";
 				flip_4 = "";
 				flip_7 = "";
@@ -683,8 +683,8 @@ global $TEXT_DIRECTION;
 				flip_42 = "";
 				flip_50 = "";
 				flip_63 = "";
-			}else 
-			if (cenyear=="1901") { 
+			}else
+			if (cenyear=="1901") {
 				flip_3 = "";
 				flip_4 = "";
 				flip_7 = "";
@@ -694,8 +694,8 @@ global $TEXT_DIRECTION;
 				flip_42 = "";
 				flip_50 = "";
 				flip_63 = "";
-			}else 
-			if (cenyear=="1891") { 
+			}else
+			if (cenyear=="1891") {
 				flip_3 = "";
 				flip_4 = "";
 				flip_7 = "";
@@ -706,8 +706,8 @@ global $TEXT_DIRECTION;
 				flip_43 = "";
 				flip_50 = "";
 				flip_63 = "";
-			}else 
-			if (cenyear=="1881" || cenyear=="1871" || cenyear=="1861" || cenyear=="1851") { 
+			}else
+			if (cenyear=="1881" || cenyear=="1871" || cenyear=="1861" || cenyear=="1851") {
 				flip_3 = "";
 				flip_4 = "";
 				flip_7 = "";
@@ -715,17 +715,17 @@ global $TEXT_DIRECTION;
 				flip_35 = "";
 				flip_50 = "";
 				flip_63 = "";
-			}else 
-			if (cenyear=="1841") { 
+			}else
+			if (cenyear=="1841") {
 				flip_7 = "";
 				flip_9 = "";
 				flip_35 = "";
 				flip_52 = "";
 				flip_53 = "";
 			}
-			
+
 		} else if (cens_ctry=="USA") {
-			if (cenyear=="1930") { 
+			if (cenyear=="1930") {
 				flip_3 = "";
 				flip_6 = "";
 				flip_9 = "";
@@ -747,7 +747,7 @@ global $TEXT_DIRECTION;
 				flip_65 = "";
 				flip_66 = "";
 			}else
-			if (cenyear=="1920") { 
+			if (cenyear=="1920") {
 				flip_3 = "";
 				flip_5 = "";
 				flip_9 = "";
@@ -767,7 +767,7 @@ global $TEXT_DIRECTION;
 				flip_61 = "";
 				flip_62 = "";
 			}else
-			if (cenyear=="1910") { 
+			if (cenyear=="1910") {
 				flip_3 = "";
 				flip_9 = "";
 				flip_10 = "";
@@ -794,7 +794,7 @@ global $TEXT_DIRECTION;
 				flip_65 = "";
 				flip_67 = "";
 			}else
-			if (cenyear=="1900") { 
+			if (cenyear=="1900") {
 				flip_3 = "";
 				flip_8 = "";
 				flip_9 = "";
@@ -817,7 +817,7 @@ global $TEXT_DIRECTION;
 				flip_48 = "";
 				flip_49 = "";
 			}else
-			if (cenyear=="1890") { 
+			if (cenyear=="1890") {
 				flip_3 = "";
 				flip_8 = "";
 				flip_9 = "";
@@ -840,7 +840,7 @@ global $TEXT_DIRECTION;
 				flip_48 = "";
 				flip_64 = "";
 			}else
-			if (cenyear=="1880") { 
+			if (cenyear=="1880") {
 				flip_8 = "";
 				flip_9 = "";
 				flip_12 = "";
@@ -858,7 +858,7 @@ global $TEXT_DIRECTION;
 				flip_54= "";
 				flip_55 = "";
 			}else
-			if (cenyear=="1870" ) { 
+			if (cenyear=="1870" ) {
 				flip_7 = "";
 				flip_9 = "";
 				flip_10 = "";
@@ -871,7 +871,7 @@ global $TEXT_DIRECTION;
 				flip_47 = "";
 				flip_63 = "";
 			}else
-			if (cenyear=="1860" || cenyear=="1850") { 
+			if (cenyear=="1860" || cenyear=="1850") {
 				flip_7 = "";
 				flip_9 = "";
 				flip_10 = "";
@@ -882,7 +882,7 @@ global $TEXT_DIRECTION;
 				flip_47 = "";
 				flip_63 = "";
 			}
-			
+
 		}
 
 		// Hide or show ===============
@@ -955,7 +955,7 @@ global $TEXT_DIRECTION;
 			//cols_68[i].style.display = flip_68;
 		}
 	}
-	
+
 </script>
 
 <div class="optionbox cens_sour">
@@ -965,7 +965,7 @@ global $TEXT_DIRECTION;
 			<option id="UKOPT" name="UKOPT" value="UK">UK</option>
 			<option id="USOPT" name="USOPT" value="USA">USA</option>
 		</select>
-		
+
 		<script type="text/javascript">
 		if (TheCenYear=='') {
 			var censyear = new DynamicOptionList();
@@ -974,7 +974,7 @@ global $TEXT_DIRECTION;
 			censyear.forValue("USA").addOptions( "choose", "1790", "1800", "1810", "1820", "1830", "1840", "1850", "1860", "1870", "1880", "1890", "1900", "1910", "1920", "1930");
 			censyear.forValue("UK").setDefaultOptions("choose");
 			censyear.forValue("USA").setDefaultOptions("choose");
-		} 
+		}
 		else if (TheCenYear!='' && TheCenCtry=='UK') {
 			var censyear = new DynamicOptionList();
 			censyear.addDependentFields("censCtry","censYear");
@@ -984,7 +984,7 @@ global $TEXT_DIRECTION;
 			censyear.forValue("USA").setDefaultOptions("choose");
 			document.getElementById("UKOPT").selected = true;
 			document.getElementById("USOPT").selected = false;
-		} 
+		}
 		else if (TheCenYear!='' && TheCenCtry=='USA') {
 			var censyear = new DynamicOptionList();
 			censyear.addDependentFields("censCtry","censYear");
@@ -1001,7 +1001,7 @@ global $TEXT_DIRECTION;
 			<table><tr><td nowrap="nowrap">
 			<br />
 			<?php
-				// echo "&nbsp;".i18n::translate('Date').":&nbsp;&nbsp;"; 
+				// echo "&nbsp;".i18n::translate('Date').":&nbsp;&nbsp;";
 				echo "<font size=2>";
 			// Input renamed as type=hidden to hide the date field ----- //
 			// Note Input field is still required ---------------------- //
@@ -1027,7 +1027,7 @@ global $TEXT_DIRECTION;
 
 	<div class="cens_sour_scs">
 		<div class="cens_sour_1">
-			<div class="cens_sour_2">Title:</div> 
+			<div class="cens_sour_2">Title:</div>
 			<script type="text/javascript">
 				document.writeln('<input id="Titl" name="Titl" type="text" value="<?php echo "Census Transcription - ".$wholename." - Household";?>" />');
 			</script>
diff --git a/modules/GEDFact_assistant/_CENS/census_3_find.php b/modules/GEDFact_assistant/_CENS/census_3_find.php
index 0828e622bc..cd5cd165df 100644
--- a/modules/GEDFact_assistant/_CENS/census_3_find.php
+++ b/modules/GEDFact_assistant/_CENS/census_3_find.php
@@ -26,7 +26,7 @@
  * @subpackage Display
  * @version $Id$
  */
- 
+
 define('WT_SCRIPT_NAME', 'modules/GEDFact_assistant/_CENS/census_3_find.php');
 require '../../../includes/session.php';
 require WT_ROOT.'includes/functions/functions_print_lists.php';
@@ -464,17 +464,17 @@ if ($action=="filter") {
 					if (!is_null($family)) {
 						$father = $family->getHusband();
 						$mother = $family->getWife();
-						if (!is_null($father)) { 
-							$FBP = $father->getBirthPlace(); 
+						if (!is_null($father)) {
+							$FBP = $father->getBirthPlace();
 						}
-						if (!is_null($mother)) { 
-							$MBP = $mother->getBirthPlace(); 
+						if (!is_null($mother)) {
+							$MBP = $mother->getBirthPlace();
 						}
-					} 
+					}
 				}
 				if (!isset($FBP)) { $FBP = "UNK, UNK, UNK, UNK"; }
 				if (!isset($MBP)) { $MBP = "UNK, UNK, UNK, UNK"; }
-				
+
 				//-- Build Indi Spouse Family to get marriage Date ----------
 				$families = $indi->getSpouseFamilies();
 				foreach($families as $famid=>$family) {
@@ -506,13 +506,13 @@ if ($action=="filter") {
 				} else {
 					$chBLDarray = '';
 				}
-				
+
 				echo "<li>";
 					// ==============================================================================================================================
 					// NOTES = is equivalent to= function pasterow(id, nam, mnam, label, gend, cond, dom, dob, age, dod, occu, birthpl, fbirthpl, mbirthpl, chilBLD) {
 					// ==============================================================================================================================
 					echo "<a href=\"javascript:;\" onclick=\"window.opener.insertRowToTable(";
-						echo "'".$indi->getXref()."', "; // id        - Indi Id 
+						echo "'".$indi->getXref()."', "; // id        - Indi Id
 						echo "'".addslashes(strip_tags($fulln))."', "; // nam       - Name
 						echo "'".addslashes(strip_tags($fulmn))."', "; // mnam      - Married Name
 						echo "'-', "; // label     - Relation to Head of Household
diff --git a/modules/GEDFact_assistant/_CENS/census_3_search_add.php b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
index 4ab886db87..5f504d7be9 100644
--- a/modules/GEDFact_assistant/_CENS/census_3_search_add.php
+++ b/modules/GEDFact_assistant/_CENS/census_3_search_add.php
@@ -76,10 +76,10 @@ if (!defined('WT_WEBTREES')) {
 
 				<?php
 				//-- Add Family Members to Census  -------------------------------------------
-				global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION, $GEDCOM; 
+				global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION, $GEDCOM;
 				// echo "CENS = " . $censyear;
 				?>
-				
+
 				<tr>
 					<td align="center" style="border: 0px solid transparent;">
 						<table width="100%" class="fact_table" cellspacing="0" border="0">
@@ -108,7 +108,7 @@ if (!defined('WT_WEBTREES')) {
 									<font size=1><br /></font>
 								</td>
 							</tr>
-							
+
 					<?php
 
 					//-- Parents Family ---------------------------------------------------
@@ -170,7 +170,7 @@ if (!defined('WT_WEBTREES')) {
 							$slabel .= $parentlinks;
 							$submenu = new Menu($slabel);
 							$menu->addSubMenu($submenu);
-							
+
 							?>
 							<tr>
 								<td align="left" class="linkcell optionbox" width="25%">
@@ -180,7 +180,7 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 								<td align="left" class="facts_value" style="text-decoration:none;" >
 									<font size=1>
-										<?php 
+										<?php
 										print "<a href=\"".encode_url("edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom={$GEDCOM}")."\">";
 										echo $headImg2;
 										print "</a>";
@@ -192,11 +192,11 @@ if (!defined('WT_WEBTREES')) {
 									<?php
 									if ( ($people["husb"]->canDisplayDetails()) ) {
 									?>
-									<a href='javaScript:insertRowToTable("<?php 
+									<a href='javaScript:insertRowToTable("<?php
 											print PrintReady($people["husb"]->getXref()) ; // pid = PID
-										?>", "<?php 
+										?>", "<?php
 											echo addslashes($fulln); // nam = Full Name
-										?>", "<?php 
+										?>", "<?php
 											if (isset($nam[1])){
 												echo addslashes($fulmn); // mnam = Full Married Name
 											}else{
@@ -248,8 +248,8 @@ if (!defined('WT_WEBTREES')) {
 										?>");'>
 										<?php
 											print PrintReady($people["husb"]->getFullName());  // Full Name (Link)
-										?> 
-									</a> 
+										?>
+									</a>
 									<?php print "\n" ;
 									}else{
 										print i18n::translate('Private');
@@ -312,7 +312,7 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 								<td align="left" class="facts_value">
 									<font size=1>
-										<?php 
+										<?php
 										print "<a href=\"".encode_url("edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom={$GEDCOM}")."\">";
 										print $headImg2;
 										print "</a>";
@@ -326,9 +326,9 @@ if (!defined('WT_WEBTREES')) {
 										?>
 									<a href='javaScript:insertRowToTable("<?php
 											print $people["wife"]->getXref() ;  // pid = PID
-										?>", "<?php 
+										?>", "<?php
 											echo addslashes($fulln); // nam = Full Name
-										?>", "<?php 
+										?>", "<?php
 											if (isset($nam[1])){
 												echo addslashes($fulmn); // mnam = Full Married Name
 											}else{
@@ -357,10 +357,10 @@ if (!defined('WT_WEBTREES')) {
 										?>", "<?php
 											print ""; // occu = Occupation
 										?>", "<?php
-											print PrintReady($people["wife"]->getBirthPlace()); //  birthpl = Wife Place of Birth 
+											print PrintReady($people["wife"]->getBirthPlace()); //  birthpl = Wife Place of Birth
 										?>", "<?php
 											if (isset($WifeFBP)) {
-												print PrintReady($WifeFBP); // fbirthpl = Wife Father's Place of Birth 
+												print PrintReady($WifeFBP); // fbirthpl = Wife Father's Place of Birth
 											} else {
 												print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Wife Father's Place of Birth Not known
 											}
@@ -378,10 +378,10 @@ if (!defined('WT_WEBTREES')) {
 												echo PrintReady('');
 											}
 										?>");'>
-										<?php 
+										<?php
 											print PrintReady($people["wife"]->getFullName());  // Full Name (Link)
 										?>
-									</a> 
+									</a>
 									<?php print "\n" ;
 									}else{
 										print i18n::translate('Private');
@@ -395,7 +395,7 @@ if (!defined('WT_WEBTREES')) {
 
 						//-- Parents Children -------------------
 						if (isset($people["children"])) {
-						
+
 							//-- Parent's Children's Details --------------------------------------
 							$elderdate = $family->getMarriageDate();
 							foreach($people["children"] as $key=>$child) {
@@ -434,13 +434,13 @@ if (!defined('WT_WEBTREES')) {
 									$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 									$marn  = $nam[1]['surname'];
 								}
-								
+
 								$menu = new Menu($child->getLabel()."\n");
 								$slabel  = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear);
 								$slabel .= $spouselinks;
 								$submenu = new Menu($slabel);
 								$menu->addSubMenu($submenu);
-								
+
 								if ($child->getXref()==$pid) {
 									//Only print Head of Family in Immediate Family Block
 								} else {
@@ -448,7 +448,7 @@ if (!defined('WT_WEBTREES')) {
 									<tr>
 										<td align="left" class="linkcell optionbox">
 											<font size=1>
-											<?php 
+											<?php
 											if ($child->getXref()==$pid) {
 												echo $child->getLabel();
 											} else {
@@ -459,7 +459,7 @@ if (!defined('WT_WEBTREES')) {
 										</td>
 										<td align="left" class="facts_value">
 											<font size=1>
-												<?php 
+												<?php
 												print "<a href=\"".encode_url("edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$child->getXref()."&gedcom={$GEDCOM}")."\">";
 												print $headImg2;
 												print "</a>";
@@ -471,11 +471,11 @@ if (!defined('WT_WEBTREES')) {
 											<?php
 											if ( ($child->canDisplayDetails()) ) {
 												?>
-												<a href='javaScript:insertRowToTable("<?php 
+												<a href='javaScript:insertRowToTable("<?php
 														print $child->getXref(); // pid = PID
-													?>", "<?php 
+													?>", "<?php
 														echo addslashes($fulln); // nam = Full Name
-													?>", "<?php 
+													?>", "<?php
 														if (isset($nam[1])){
 															echo addslashes($fulmn); // mnam = Full Married Name
 														}else{
@@ -513,13 +513,13 @@ if (!defined('WT_WEBTREES')) {
 														print PrintReady($child->getBirthPlace()); //  birthpl = Child Place of Birt
 													?>", "<?php
 														if (isset($people["husb"])) {
-															print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth 
+															print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth
 														} else {
 															print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known
 														}
 													?>", "<?php
 														if (isset($people["wife"])) {
-															print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth 
+															print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth
 														} else {
 															print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known
 														}
@@ -549,7 +549,7 @@ if (!defined('WT_WEBTREES')) {
 							$elderdate = $child->getBirthDate(false);
 						}
 					}
-					
+
 					//-- Step families ---------------------------------------------------------
 
 					//-- Build step families ---------------------------------------------------
@@ -627,7 +627,7 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 								<td align="left" class="facts_value">
 									<font size=1>
-										<?php 
+										<?php
 										print "<a href=\"".encode_url("edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom={$GEDCOM}")."\">";
 										print $headImg2;
 										print "</a>";
@@ -641,9 +641,9 @@ if (!defined('WT_WEBTREES')) {
 									?>
 									<a href='javaScript:insertRowToTable("<?php
 											print PrintReady($people["husb"]->getXref()); // pid = PID
-										?>", "<?php 
+										?>", "<?php
 											echo addslashes($fulln); // nam = Full Name
-										?>", "<?php 
+										?>", "<?php
 											if (isset($nam[1])){
 												echo addslashes($fulmn); // mnam = Full Married Name
 											}else{
@@ -676,7 +676,7 @@ if (!defined('WT_WEBTREES')) {
 										?>", "<?php
 											print ""; // occu = Occupation
 										?>", "<?php
-											print PrintReady($people["husb"]->getBirthPlace()); //  birthpl = Step Husband Place of Birth 
+											print PrintReady($people["husb"]->getBirthPlace()); //  birthpl = Step Husband Place of Birth
 										?>", "<?php
 											if (isset($HusbFBP)) {
 												print PrintReady($HusbFBP); // fbirthpl = Step Husband Father's Place of Birth
@@ -697,10 +697,10 @@ if (!defined('WT_WEBTREES')) {
 												echo PrintReady('');
 											}
 										?>");'>
-										<?php 
+										<?php
 											print PrintReady($people["husb"]->getFullName());  // Full Name (Link)
-										?> 
-									</a> 
+										?>
+									</a>
 									<?php print "\n" ;
 									}else{
 										print i18n::translate('Private');
@@ -772,7 +772,7 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 								<td align="left" class="facts_value">
 									<font size=1>
-										<?php 
+										<?php
 										print "<a href=\"".encode_url("edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom={$GEDCOM}")."\">";
 										print $headImg2;
 										print "</a>";
@@ -786,9 +786,9 @@ if (!defined('WT_WEBTREES')) {
 									?>
 									<a href='javaScript:insertRowToTable("<?php
 											print PrintReady($people["wife"]->getXref()) ; // pid = PID
-										?>", "<?php 
+										?>", "<?php
 											echo addslashes($fulln); // nam = Full Name
-										?>", "<?php 
+										?>", "<?php
 											if (isset($nam[1])){
 												echo addslashes($fulmn); // mnam = Full Married Name
 											}else{
@@ -824,7 +824,7 @@ if (!defined('WT_WEBTREES')) {
 											print PrintReady($people["wife"]->getBirthPlace()); //  birthpl = Step Wife Place of Birth
 										?>", "<?php
 											if (isset($WifeFBP)) {
-												print PrintReady($WifeFBP); // fbirthpl = Step Wife Father's Place of Birth 
+												print PrintReady($WifeFBP); // fbirthpl = Step Wife Father's Place of Birth
 											} else {
 												print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Step Wife Father's Place of Birth Not known
 											}
@@ -842,10 +842,10 @@ if (!defined('WT_WEBTREES')) {
 												echo PrintReady('');
 											}
 										?>");'>
-										<?php 
+										<?php
 											print PrintReady($people["wife"]->getFullName());  // Full Name (Link)
 										?>
-									</a> 
+									</a>
 									<?php print "\n" ;
 									}else{
 										print i18n::translate('Private');
@@ -862,7 +862,7 @@ if (!defined('WT_WEBTREES')) {
 						if (isset($people["children"])) {
 							$elderdate = $family->getMarriageDate();
 							foreach($people["children"] as $key=>$child) {
-							
+
 								// Get Child's Children
 								$chBLDarray=Array();
 								foreach ($child->getSpouseFamilies() as $childfamily) {
@@ -879,7 +879,7 @@ if (!defined('WT_WEBTREES')) {
 										array_push($chBLDarray, $chBLD);
 									}
 								}
-							
+
 								$nam   = $child->getAllNames();
 								$fulln = rtrim($nam[0]['givn'],'*')."&nbsp;".$nam[0]['surname'];
 								$fulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $fulln);
@@ -920,9 +920,9 @@ if (!defined('WT_WEBTREES')) {
 										?>
 										<a href='javaScript:insertRowToTable("<?php
 												print PrintReady($child->getXref()) ; // pid = PID
-											?>", "<?php 
+											?>", "<?php
 												echo addslashes($fulln); // nam = Full Name
-											?>", "<?php 
+											?>", "<?php
 												if (isset($nam[1])){
 													echo addslashes($fulmn); // mnam = Full Married Name
 												}else{
@@ -947,7 +947,7 @@ if (!defined('WT_WEBTREES')) {
 											?>", "<?php
 												print ""; // occu = Occupation
 											?>", "<?php
-												print PrintReady($child->getBirthPlace()); //  birthpl = Child Place of Birth 
+												print PrintReady($child->getBirthPlace()); //  birthpl = Child Place of Birth
 											?>", "<?php
 												if (isset($people["husb"])) {
 													print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth
@@ -956,7 +956,7 @@ if (!defined('WT_WEBTREES')) {
 												}
 											?>", "<?php
 												if (isset($people["wife"])) {
-													print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth 
+													print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth
 												} else {
 													print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known
 												}
@@ -968,10 +968,10 @@ if (!defined('WT_WEBTREES')) {
 													echo PrintReady('');
 												}
 											?>");'>
-											<?php 
+											<?php
 												print PrintReady($child->getFullName());  // Full Name (Link)
-											?> 
-										</a> 
+											?>
+										</a>
 										<?php print "\n" ;
 										}else{
 											print i18n::translate('Private');
@@ -999,7 +999,7 @@ if (!defined('WT_WEBTREES')) {
 							$spousetag = 'HUSB';
 						}
 						$marrdate = $family->getMarriageDate();
-						
+
 						//-- Get Children's Name, DOB, DOD --------------------------
 						if (isset($people["children"])) {
 							$chBLDarray = Array();
@@ -1079,9 +1079,9 @@ if (!defined('WT_WEBTREES')) {
 									?>
 									<a href='javaScript:insertRowToTable("<?php
 											print $people["husb"]->getXref() ; // pid = PID
-										?>", "<?php 
+										?>", "<?php
 											echo addslashes($fulln); // nam = Full Name
-										?>", "<?php 
+										?>", "<?php
 											if (isset($nam[1])){
 												echo addslashes($fulmn); // mnam = Full Married Name
 											}else{
@@ -1114,7 +1114,7 @@ if (!defined('WT_WEBTREES')) {
 										?>", "<?php
 											print ""; // occu = Occupation
 										?>", "<?php
-											print PrintReady($people["husb"]->getBirthPlace()); //  birthpl = Husband Place of Birth 
+											print PrintReady($people["husb"]->getBirthPlace()); //  birthpl = Husband Place of Birth
 										?>", "<?php
 											if (isset($HusbFBP)) {
 												print PrintReady($HusbFBP); // fbirthpl = Husband Father's Place of Birth
@@ -1135,9 +1135,9 @@ if (!defined('WT_WEBTREES')) {
 												echo PrintReady('');
 											}
 										?>");'>
-										<?php 
+										<?php
 											print PrintReady($people["husb"]->getFullName());  // Full Name (Link)
-										?> 
+										?>
 									</a>
 									<?php print "\n" ;
 									}else{
@@ -1148,11 +1148,11 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 							<tr>
 							<?php
-						} 
-							
+						}
+
 						//-- Spouse Wife -----------------------------------------------------
 						if (isset($people["wife"])) {
-						
+
 							//-- Spouse Wifes Parents --------------------------------------
 							$gparent=Person::getInstance($people["wife"]->getXref());
 							$fams = $gparent->getChildFamilies();
@@ -1212,7 +1212,7 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 								<td align="left" class="facts_value">
 									<font size=1>
-										<?php 
+										<?php
 										print "<a href=\"".encode_url("edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom={$GEDCOM}")."\">";
 										print $headImg2;
 										print "</a>";
@@ -1224,11 +1224,11 @@ if (!defined('WT_WEBTREES')) {
 									<?php
 									if ( ($people["wife"]->canDisplayDetails()) ) {
 									?>
-										<a href='javaScript:insertRowToTable("<?php 
+										<a href='javaScript:insertRowToTable("<?php
 												print $people["wife"]->getXref() ; // pid = PID
-										?>", "<?php 
+										?>", "<?php
 											echo addslashes($fulln); // nam = Full Name
-										?>", "<?php 
+										?>", "<?php
 											if (isset($nam[1])){
 												echo addslashes($fulmn); // mnam = Full Married Name
 											}else{
@@ -1261,7 +1261,7 @@ if (!defined('WT_WEBTREES')) {
 										?>", "<?php
 											print ""; // occu = Occupation
 										?>", "<?php
-											print PrintReady($people["wife"]->getBirthPlace()); //  birthpl = Wife Place of Birth 
+											print PrintReady($people["wife"]->getBirthPlace()); //  birthpl = Wife Place of Birth
 										?>", "<?php
 											if (isset($WifeFBP)) {
 												print PrintReady($WifeFBP); // fbirthpl = Wife Father's Place of Birth
@@ -1282,7 +1282,7 @@ if (!defined('WT_WEBTREES')) {
 												echo PrintReady('');
 											}
 										?>");'>
-										<?php 
+										<?php
 											print PrintReady($people["wife"]->getFullName());  // Full Name (Link)
 										?>
 										</a>
@@ -1295,7 +1295,7 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 							<tr> <?php
 						}
-							
+
 						// Spouse Children
 						foreach($people["children"] as $key=>$child) {
 
@@ -1364,11 +1364,11 @@ if (!defined('WT_WEBTREES')) {
 									<?php
 									if ( ($child->canDisplayDetails()) ) {
 									?>
-									<a href='javaScript:insertRowToTable("<?php 
+									<a href='javaScript:insertRowToTable("<?php
 											print $child->getXref() ; // pid = PID
-										?>", "<?php 
+										?>", "<?php
 											echo addslashes($fulln); // nam = Full Name
-										?>", "<?php 
+										?>", "<?php
 											if (isset($nam[1])){
 												echo addslashes($fulmn); // mnam = Full Married Name
 											}else{
@@ -1399,10 +1399,10 @@ if (!defined('WT_WEBTREES')) {
 										?>", "<?php
 											print ""; // occu = Occupation
 										?>", "<?php
-											print PrintReady($child->getBirthPlace()); //  birthpl = Child Place of Birth 
+											print PrintReady($child->getBirthPlace()); //  birthpl = Child Place of Birth
 										?>", "<?php
 											if (isset($people["husb"])) {
-												print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth 
+												print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth
 											} else {
 												print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known
 											}
@@ -1420,7 +1420,7 @@ if (!defined('WT_WEBTREES')) {
 												echo PrintReady('');
 											}
 										?>");'>
-										<?php 
+										<?php
 											print PrintReady($child->getFullName());  // Full Name (Link)
 										?>
 									</a>
@@ -1433,17 +1433,17 @@ if (!defined('WT_WEBTREES')) {
 								</td>
 							</tr>
 							<?php
-						} 
-						
+						}
+
 					print "<tr><td><font size=1><br /></font></td></tr>";
 					}
 					?>
-						
+
 						</table>
 					<br /><br /><br />&nbsp;</td>
 				</tr>
 			</table>
-			
+
 <?php
 // ==================================================================
 require_once 'includes/functions/functions_charts.php';
@@ -1465,7 +1465,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
-	
+
 	global $spouselinks, $parentlinks, $step_parentlinks, $persons, $person_step, $person_parent, $tabno, $theme_name, $spousetag;
 	global $natdad, $natmom, $censyear, $censdate;
 	// global $pHusbFBP, $pHusbMBP, $pWifeFBP, $pWifeMBP;
@@ -1484,7 +1484,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 		$parentlinks  = false;
 		$step_parentlinks = false;
 	}
-	
+
 	$tmp=array('M'=>'','F'=>'F', 'U'=>'NN');
 	$isF=$tmp[$person->getSex()];
 	$spouselinks = "";
@@ -1496,7 +1496,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 		if (empty($SEARCH_SPIDER)) {
 			if ($LINK_ICONS!="disabled") {
 				//-- draw a box for the family popup
-				
+
 				if ($TEXT_DIRECTION=="rtl") {
 				$spouselinks .= "\n\t\t\t<table class=\"rtlnav person_box$isF\"><tr><td align=\"right\" style=\"font-size:10px;font-weight:normal;\" class=\"name2\" nowrap=\"nowrap\">";
 				$spouselinks .= "<b>" . i18n::translate('Family') . "</b> (" .$person->getFullName(). ")<br />";
@@ -1516,13 +1516,13 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 				$persons       = "";
 				$person_parent = "";
 				$person_step   = "";
-				
+
 				//-- Parent families --------------------------------------
 				$fams = $person->getChildFamilies();
 				foreach($fams as $famid=>$family) {
 					$marrdate = $family->getMarriageDate();
 					$married  = GedcomDate::Compare($censdate, $marrdate);
-					
+
 					if (!is_null($family)) {
 						$husb = $family->getHusband($person);
 						$wife = $family->getWife($person);
@@ -1548,7 +1548,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 
 						//-- Parent Husband ------------------------------
 						if ($husb || $num>0) {
-							if ($TEXT_DIRECTION=="ltr") { 
+							if ($TEXT_DIRECTION=="ltr") {
 								$title = i18n::translate('Family book chart').": ".$famid;
 							}else{
 								$title = $famid." :".i18n::translate('Family book chart');
@@ -1567,7 +1567,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								}
 								//-- Parent Husbands Details ----------------------
 								$person_parent="Yes";
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Individual information').": ".$husb->getXref();
 								}else{
 									$title = $husb->getXref()." :".i18n::translate('Individual information');
@@ -1640,7 +1640,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 
 						//-- Parent Wife ------------------------------
 						if ($wife || $num>0) {
-							if ($TEXT_DIRECTION=="ltr") { 
+							if ($TEXT_DIRECTION=="ltr") {
 								$title = i18n::translate('Family book chart').": ".$famid;
 							}else{
 								$title = $famid." :".i18n::translate('Family book chart');
@@ -1659,7 +1659,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								}
 								//-- Parent Wifes Details ----------------------
 								$person_parent="Yes";
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Individual information').": ".$wife->getXref();
 								} else {
 									$title = $wife->getXref()." :".i18n::translate('Individual information');
@@ -1775,7 +1775,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 						if ($natdad == "yes") {
 						}else{
 							if ( ($husb || $num>0) && $husb->getLabel() != "." ) {
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Family book chart').": ".$famid;
 								}else{
 									$title = $famid." :".i18n::translate('Family book chart');
@@ -1865,7 +1865,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								}
 							}
 						}
-						
+
 						//-- Step Wife ----------------------------------------
 						if ($natmom == "yes") {
 						}else{
@@ -2007,7 +2007,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								$title = $famid." :".i18n::translate('Family book chart');
 							}
 							if ($spouse) {
-							
+
 								//-- Spouse Parents -----------------------------
 								$gparent=Person::getInstance($spouse->getXref());
 								$spousefams = $gparent->getChildFamilies();
@@ -2021,7 +2021,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								}
 
 								//-- Spouse Details -----------------------------
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Individual information').": ".$spouse->getXref();
 								}else{
 									$title = $spouse->getXref()." :".i18n::translate('Individual information');
@@ -2102,14 +2102,14 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								}
 							}
 						}
-						
+
 						// Children -------------------------------------
 						$spouselinks .= "<ul class=\"clist ".$TEXT_DIRECTION."\">\n";
 						foreach($children as $c=>$child) {
 							$cpid = $child->getXref();
 							if ($child) {
 								$persons="Yes";
-								
+
 								//-- Childs Parents ---------------------
 								$gparent=Person::getInstance($child->getXref());
 								$fams = $gparent->getChildFamilies();
@@ -2151,7 +2151,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 										$ChHusbName = $chhusbnam[0]['surname'];
 									}
 								}
-								
+
 								// Childs Details -------------------------
 								$title = i18n::translate('Individual information').": ".$cpid;
 								// $spouselinks .= "\n\t\t\t\to&nbsp;&nbsp;";
@@ -2166,7 +2166,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 									if (isset($nam[1]) && isset($ChHusbName)) {
 										$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$ChHusbName;
 									}
-								
+
 									$spouselinks .= "<a href=\"javascript:insertRowToTable(";
 									$spouselinks .= "'".PrintReady($child->getXref())."',"; // pid = PID
 									$spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name
@@ -2224,7 +2224,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 									$spouselinks .= PrintReady($child->getFullName()); // Full Name (Link)
 									$spouselinks .= "</a>";
 									$spouselinks .= "</li>\n";
-								}else{ 
+								}else{
 									$spouselinks .= i18n::translate('Private');
 								}
 							}
@@ -2237,13 +2237,13 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 				}else{
 					$spouselinks  .= "</td></tr></table>\n\t\t";
 				}
-				
+
 				if ($person_parent != "Yes") {
 					$parentlinks .= "(" . i18n::translate_c('unknown family', 'unknown') . ")</td></tr></table>\n\t\t";
 				}else{
 					$parentlinks .= "</td></tr></table>\n\t\t";
 				}
-				
+
 				if ($person_step != "Yes") {
 					$step_parentlinks .= "(" . i18n::translate_c('unknown family', 'unknown') . ")</td></tr></table>\n\t\t";
 				}else{
diff --git a/modules/GEDFact_assistant/_CENS/census_4_text.php b/modules/GEDFact_assistant/_CENS/census_4_text.php
index 01182d4310..bf4decd635 100644
--- a/modules/GEDFact_assistant/_CENS/census_4_text.php
+++ b/modules/GEDFact_assistant/_CENS/census_4_text.php
@@ -33,7 +33,7 @@ if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
-global $theme_name; 
+global $theme_name;
 ?>
 
 <script>
@@ -70,7 +70,3 @@ function help_window2(frm)  {
 		</center>
 	</div>
 </div>
-
-
-
-
diff --git a/modules/GEDFact_assistant/_CENS/census_note_decode.php b/modules/GEDFact_assistant/_CENS/census_note_decode.php
index 31a6d9640c..1aacf0dde2 100644
--- a/modules/GEDFact_assistant/_CENS/census_note_decode.php
+++ b/modules/GEDFact_assistant/_CENS/census_note_decode.php
@@ -28,10 +28,10 @@
  * @subpackage Census Assistant
  * @version $Id$
  */
- 
+
 	$text = "xCxAx<table cellpadding=\"0\"><tr><td>" . $text;
 	$text = str_replace("<br />.start_formatted_area.<br />", "</td></tr></table><table cellpadding=\"0\"><tr><td class=\"notecell\">&nbsp;", $text);
-	
+
 		// -- Create View Header Tooltip explanations (Use embolden) -----------
 		$text = str_replace(".b.".'Name',   "<span class=\"note2\" alt=\"".'Full Name or Married name if married'."\"   title=\"".'Full Name or Married name if married'."\">  <b>".'Name'."</span>",   $text);
 		$text = str_replace(".b.".'Relation',   "<span class=\"note1\" alt=\"".'Relationship to Head of Household'."\"   title=\"".'Relationship to Head of Household'."\">  <b>".'Relation'."</span>",   $text);
@@ -87,15 +87,13 @@
 
 
 		// Regular Field Highlighting (Use embolden) ------------
-		$text = str_replace(".b.", "<b>", $text); 
-		
+		$text = str_replace(".b.", "<b>", $text);
+
 		// Replace "pipe" with </td><td> ------------------------
 		$text = str_replace("|", "&nbsp;&nbsp;</td><td class=\"notecell\">", $text);
-		
+
 	$text = str_replace(".end_formatted_area.<br />", "</td></tr></table><table cellpadding=\"0\"><tr><td>", $text);
 	$text = str_replace("<br />", "</td></tr><tr><td class=\"notecell\">&nbsp;", $text);
 	$text = $text . "</td></tr></table>";
 	$text = str_replace("xCxAx", $centitl."<br />", $text);
 	$text = str_replace("Notes:", "<b>Notes:</b>", $text);
-
-?>
diff --git a/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php b/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php
index 88daa7c769..83bd117b72 100644
--- a/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php
+++ b/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php
@@ -78,8 +78,8 @@ var HeaderFBP         = 'FBP';       // Chapman format
 var TTEditFBP         = 'Father\'s Birthplace - xx or xxx - State or Country (Chapman format)';      // Chapman format
 var HeaderMBP         = 'MBP';       // Chapman format
 var TTEditMBP         = 'Mother\'s Birthplace - xx or xxx - State or Country (Chapman format)';      // Chapman format
-var HeaderNL          = 'NL';        
-var TTEditNL          = 'If Foreign Born - Native Language';       
+var HeaderNL          = 'NL';
+var TTEditNL          = 'If Foreign Born - Native Language';
 var HeaderHealth      = 'Health';
 var TTEditHealth      = 'Health - 12345 = 1.Blind, 2.Deaf&amp;Dumb, 3.Idiotic, 4.Insane, 5.Disabled etc';
 var HeaderYrsUS       = 'YUS';
@@ -182,20 +182,20 @@ function preview() {
 	}
 	str += "\n";
 	str += ".start_formatted_area.";
-	
+
 	iid = "";
 
 	var tbl = document.getElementById('tblSample');
-	
+
 
 	for(var i=0; i<tbl.rows.length; i++){
 		var tr = tbl.rows[i];
 		var strRow = '';
-		
+
 		var pidList = '';
 
 		// ---------------------------------------------
-		
+
 		// Extract Indi id's from created list --------------------------------------
 		for(var y=1; y<tr.cells.length-3; y++) {
 			if ( y>=2 && y<=73) {
@@ -207,12 +207,12 @@ function preview() {
 				}
 			}
 		}
-		
+
 		// Extract required columns for display based on Country and Year -----------
 		if (NoteCtry.value=="UK") {
 			// UK 1911 or 1921 or 1931 ===============
 			if (NoteYear.value=="1911" || NoteYear.value=="1921" || NoteYear.value=="1931") {
-				for(var j=2; j<tr.cells.length-3; j++) {  
+				for(var j=2; j<tr.cells.length-3; j++) {
 					if (j==5 || j==6 || j==8 || (j>=10 && j<=15) || (j>=20 && j<=34) || j==36 || (j>=39 && j<=41) || (j>=43 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) {
 							continue;
 					}else{
@@ -225,8 +225,8 @@ function preview() {
 				}
 			// UK 1901 ===============
 			} else if (NoteYear.value=="1901") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || j==36 || j==37 || (j>=39 && j<=41) || (j>=43 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || j==36 || j==37 || (j>=39 && j<=41) || (j>=43 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -238,8 +238,8 @@ function preview() {
 				}
 			// UK 1891 ===============
 			} else if (NoteYear.value=="1891") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || (j>=36 && j<=38) || j==41 || j==42 || (j>=44 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || (j>=36 && j<=38) || j==41 || j==42 || (j>=44 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -251,8 +251,8 @@ function preview() {
 				}
 			// UK 1951-1881 ============
 			} else if (NoteYear.value=="1851" || NoteYear.value=="1861" || NoteYear.value=="1871" || NoteYear.value=="1881") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || (j>=36 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || (j>=36 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -264,8 +264,8 @@ function preview() {
 				}
 			// UK 1841 ===============
 			} else if (NoteYear.value=="1841") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( (j>=3 && j<=6) || j==8 || (j>=10 && j<=34) || (j>=36 && j<=51) || (j>=54 && j<=73) ) {  
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( (j>=3 && j<=6) || j==8 || (j>=10 && j<=34) || (j>=36 && j<=51) || (j>=54 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -276,12 +276,12 @@ function preview() {
 					}
 				}
 			}
-			
+
 		} else if (NoteCtry.value=="USA") {
 			// USA 1930 ===============
 			if (NoteYear.value=="1930") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( j==4 || j==5 || j==7 || j==8 || j==11 || j==13 || j==14 || (j>=16 && j<=19) || (j>=21 && j<=45) || (j>=47 && j<=50) || j==52 || j==53 || j==63 || j==64 || j>=67 && j<=73 ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( j==4 || j==5 || j==7 || j==8 || j==11 || j==13 || j==14 || (j>=16 && j<=19) || (j>=21 && j<=45) || (j>=47 && j<=50) || j==52 || j==53 || j==63 || j==64 || j>=67 && j<=73 ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -291,12 +291,12 @@ function preview() {
 						}
 					}
 				}
-			} 
+			}
 
 			// USA 1920 ===============
 			else if (NoteYear.value=="1920") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( j==4 || (j>=6 && j<=8) || j==11 || j==13 || j==14 || (j>=16 && j<=30) || (j>=34 && j<=45) || (j>=47 && j<=50) || j==52 || j==53 || j==57 || j==58 || (j>=63 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( j==4 || (j>=6 && j<=8) || j==11 || j==13 || j==14 || (j>=16 && j<=30) || (j>=34 && j<=45) || (j>=47 && j<=50) || j==52 || j==53 || j==57 || j==58 || (j>=63 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -310,8 +310,8 @@ function preview() {
 
 			// USA 1910 ===============
 			else if (NoteYear.value=="1910") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( (j>=4 && j<=8) || j==11 || j==13 || j==14 || (j>=19 && j<=26) || j==30 || j==33 || j==36 || (j>=39 && j<=42) || j==45 || j==47 || j==48 || (j>=50 && j<=64) || j==66 || j>=68 && j<=73 ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( (j>=4 && j<=8) || j==11 || j==13 || j==14 || (j>=19 && j<=26) || j==30 || j==33 || j==36 || (j>=39 && j<=42) || j==45 || j==47 || j==48 || (j>=50 && j<=64) || j==66 || j>=68 && j<=73 ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -324,8 +324,8 @@ function preview() {
 			}
 			// USA 1900 ===============
 			else if (NoteYear.value=="1900") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( (j>=4 && j<=7) || j==10 || j==13 || j==14 || (j>=19 && j<=26) || j==33 || j==34 || (j>=36 && j<=44) || j==47 || (j>=50 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( (j>=4 && j<=7) || j==10 || j==13 || j==14 || (j>=19 && j<=26) || j==33 || j==34 || (j>=36 && j<=44) || j==47 || (j>=50 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -338,8 +338,8 @@ function preview() {
 			}
 			// USA 1890 ===============
 			else if (NoteYear.value=="1890") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( (j>=4 && j<=7) || j==10 || j==11 || j==13 || j==14 || (j>=19 && j<=26) || j==31 || j==33 || j==34 || j==36 || j==37 || j==39 || j==40 || (j>=42 && j<=45) || j==47 || (j>=49 && j<=63) || (j>=65 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( (j>=4 && j<=7) || j==10 || j==11 || j==13 || j==14 || (j>=19 && j<=26) || j==31 || j==33 || j==34 || j==36 || j==37 || j==39 || j==40 || (j>=42 && j<=45) || j==47 || (j>=49 && j<=63) || (j>=65 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -352,8 +352,8 @@ function preview() {
 			}
 			// USA 1880 ===============
 			else if (NoteYear.value=="1880") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( (j>=3 && j<=7) || j==10 || j==11 || (j>=17 && j<=34) || (j>=37 && j<=44) || (j>=40 && j<=42) || j==46 || j==49 || j==50 || j==52 || j==53 || (j>=56 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( (j>=3 && j<=7) || j==10 || j==11 || (j>=17 && j<=34) || (j>=37 && j<=44) || (j>=40 && j<=42) || j==46 || j==49 || j==50 || j==52 || j==53 || (j>=56 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -366,8 +366,8 @@ function preview() {
 			}
 			// USA 1870 ===============
 			else if (NoteYear.value=="1870") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
-					if ( (j>=3 && j<=6) || j==8 || (j>=11 && j<=20) || (j>=27 && j<=46) || (j>=48 && j<=62) || (j>=64 && j<=73) ) { 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
+					if ( (j>=3 && j<=6) || j==8 || (j>=11 && j<=20) || (j>=27 && j<=46) || (j>=48 && j<=62) || (j>=64 && j<=73) ) {
 							continue;
 					}else{
 						if (i==0) {
@@ -380,7 +380,7 @@ function preview() {
 			}
 			// USA 1860 or 1850 ===============
 			else if (NoteYear.value=="1860" || NoteYear.value=="1850") {
-				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
+				for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
 					if ( (j>=3 && j<=6) || j==8 || (j>=11 && j<=20) || j==24 || j==25 || (j>=27 && j<=46) || (j>=48 && j<=62) || (j>=64 && j<=73) ) {
 							continue;
 					}else{
@@ -392,18 +392,18 @@ function preview() {
 					}
 				}
 			}
-			
+
 		}else{
 			// Other country stuff
 		}
-		
+
 		str += (str==''?'':'\n') + strRow;
 		if (i!=0) {
 			iid += (iid==''?'':'') + pidList + ', ';
 		}
-		
+
 		// Reset/Check the Pink Highlighting of the Name field and Age fields for any person not born ------------------
-		for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # 
+		for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item #
 			if (i==0) {
 				// Do nothing as this is the header row.
 			}else{
@@ -419,28 +419,28 @@ function preview() {
 				}
 			}
 		}
-		
+
 	}
-	
+
 	//-- TODO -- Check for corrected ages  --- Sill to fix manual entry for override of values --------------------
 		//changeAge(NoteYear.value);
-	
+
 	// --- Debug only - alert indi id's found --------
 	//if (i!=0) {
 	//alert(iid);
 	//}
-	
+
 	var mem = document.getElementById('NOTE');
 	if (Notes.value!="" && Notes.value!=null) {
 		mem.value = str + "\n.end_formatted_area.\n\nNotes:\n"+Notes.value;
 	} else {
 		mem.value = str + "\n.end_formatted_area.\n";
 	}
-		
+
 	// ---- Create an array of Indi id's ----------
 	var mem21 = document.getElementById('pid_array');
 		mem21.value = iid.slice(0, -2);
-		
+
 } // ---- end function preview() -----
 
 
@@ -458,18 +458,18 @@ function fillInRows() {
 }
 
 // myRowObject - an object for storing information about the table rows
-function myRowObject( zero, one, two, three, four, five, six, seven, eight, nine, 
-						ten, eleven, twelve, thirteen, fourteen, fifteen, sixteen, seventeen, eighteen, nineteen, 
-						twenty, twentyone, twentytwo, twentythree, twentyfour, twentyfive, twentysix, twentyseven, twentyeight, twentynine, 
-						thirty, thirtyone, thirtytwo, thirtythree, thirtyfour, thirtyfive, thirtysix, thirtyseven, thirtyeight, thirtynine, 
-						forty, fortyone, fortytwo, fortythree, fortyfour, fortyfive, fortysix, fortyseven, fortyeight, fortynine, 
-						fifty, fiftyone, fiftytwo, fiftythree, fiftyfour, fiftyfive, fiftysix, fiftyseven, fiftyeight, fiftynine, 
-						sixty, sixtyone, sixtytwo, sixtythree, sixtyfour, sixtyfive, sixtysix, sixtyseven, sixtyeight, sixtynine, 
+function myRowObject( zero, one, two, three, four, five, six, seven, eight, nine,
+						ten, eleven, twelve, thirteen, fourteen, fifteen, sixteen, seventeen, eighteen, nineteen,
+						twenty, twentyone, twentytwo, twentythree, twentyfour, twentyfive, twentysix, twentyseven, twentyeight, twentynine,
+						thirty, thirtyone, thirtytwo, thirtythree, thirtyfour, thirtyfive, thirtysix, thirtyseven, thirtyeight, thirtynine,
+						forty, fortyone, fortytwo, fortythree, fortyfour, fortyfive, fortysix, fortyseven, fortyeight, fortynine,
+						fifty, fiftyone, fiftytwo, fiftythree, fiftyfour, fiftyfive, fiftysix, fiftyseven, fiftyeight, fiftynine,
+						sixty, sixtyone, sixtytwo, sixtythree, sixtyfour, sixtyfive, sixtysix, sixtyseven, sixtyeight, sixtynine,
 						seventy, seventyone, seventytwo, seventythree,
-						cb, ra, index2 
-					) 
+						cb, ra, index2
+					)
 {
-						
+
 	this.zero = zero; // text object
 	this.one = one; // input text object
 	this.two = two; // input text object
@@ -544,7 +544,7 @@ function myRowObject( zero, one, two, three, four, five, six, seven, eight, nine
 	this.seventyone = seventyone; // input text object
 	this.seventytwo = seventytwo; // input text object
 	this.seventythree = seventythree; // input text object
-	
+
 	this.cb = cb; // input checkbox object
 	this.ra = ra; // input radio object
 	this.index2 = index2; // text object
@@ -558,10 +558,10 @@ function create_header() {
 function insertRowToTable(pid, nam, mnam, label, gend, cond, dom, dob, age, dod, occu, birthpl, fbirthpl, mbirthpl, chilBLD) {
 
 	if (hasLoaded) {
-		
+
 		// calculate marriage status -----------------------
 		var cenyr = document.getElementById('censYear').value;
-		
+
 		var tbl = document.getElementById(TABLE_NAME);
 		var rowToInsertAt = tbl.tBodies[0].rows.length;
 		for (var i=1; i<tbl.tBodies[0].rows.length; i++) {  // i set to 1 to avoid header row of number 0
@@ -570,17 +570,17 @@ function insertRowToTable(pid, nam, mnam, label, gend, cond, dom, dob, age, dod,
 				break;
 			}
 		}
-		
+
 		addRowToTable(rowToInsertAt, pid, nam, mnam, label, gend, cond, dom, dob, age, dod, occu, birthpl, fbirthpl, mbirthpl, chilBLD);
-		
+
 		reorderRows(tbl, rowToInsertAt);
 		currcenyear = document.getElementById('censYear').value;
-		
+
 		changeCols(currcenyear);
 		changeMC(currcenyear);
 		changeAge(currcenyear);
 		preview();
-		
+
 	}
 }
 
@@ -607,8 +607,8 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 	currcenyear = document.getElementById('censYear').value;
 	currcenctry = document.getElementById('censCtry').value;
 	if (num>0) {
-	
-	
+
+
 		// Calculate Children Born, Living, Died --------------------------
 		var chBLDarray = chilBLD.split('::');
 		var cendat = getCenDate(currcenyear);
@@ -628,11 +628,11 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 			var y;
 			for (y = 0; y<chBLDarray2.length; y++) {
 				chBLD[x][y] = chBLDarray2[y];
-				if (y==2 && (cdat>(chBLD[x][1]) && chBLD[x][1]!=0) && (chBLD[x][2]==0 || cdat<(chBLD[x][2]))) { 
+				if (y==2 && (cdat>(chBLD[x][1]) && chBLD[x][1]!=0) && (chBLD[x][2]==0 || cdat<(chBLD[x][2]))) {
 					ALIVE=ALIVE+1;
-				} else if (y==2 && cdat>(chBLD[x][2]) && (chBLD[x][2])!=0) { 
+				} else if (y==2 && cdat>(chBLD[x][2]) && (chBLD[x][2])!=0) {
 					DEAD=DEAD+1;
-				} else if (y==2) { 
+				} else if (y==2) {
 					NOTBORN=NOTBORN+1;
 				}
 			}
@@ -664,7 +664,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		} else {
 			var ibirthpl = getChapmanCode(ibirthpl[0]);
 		}
-		
+
 		if (fbirthpl[0] == "UNK") {
 			var fbirthpl = getChapmanCode(fbirthpl[0]);
 		} else if (fbirthpl[0] == "United States" || fbirthpl[0] == "United States Of America" || fbirthpl[0] == "USA") {
@@ -672,7 +672,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		} else {
 			var fbirthpl = getChapmanCode(fbirthpl[0]);
 		}
-	
+
 		if (mbirthpl[0] == "UNK") {
 			var mbirthpl = getChapmanCode(mbirthpl[0]);
 		} else if (mbirthpl[0] == "United States" || mbirthpl[0] == "United States Of America" || mbirthpl[0] == "USA") {
@@ -694,7 +694,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		var one_day   = 1000*60*60*24;
 		var one_month = (365.26*one_day)/12;
 		var one_year  = 365.26*one_day;
-		
+
 		// Date of Birth (dob) - passed as Julian Date String -----------------
 		if (dob>1721060) {
 			IJD = Math.floor(dob);
@@ -727,12 +727,12 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 			I = 100*(N - 49) + I + L;
 			dom = (I+', '+J+', '+K);
 		}
-		// Create Date of Marriage object from passed string dom 
+		// Create Date of Marriage object from passed string dom
 		var jsdom = Date.parseString(dom, 'y, M, d');
-		
-		// Create Date of Birth object and Age at First Marriage from passed string dob 
+
+		// Create Date of Birth object and Age at First Marriage from passed string dob
 		var jsdob = Date.parseString(dob, 'y, M, d');
-		// US Census - Create dob (month year) and Age at first marriage ------ 
+		// US Census - Create dob (month year) and Age at first marriage ------
 		if (jsdob != "Invalid Date" && jsdob != "" && jsdob != null) {
 			usdob = jsdob.format("NNN "+yob);
 			agemarr = Math.floor((jsdom-jsdob)/one_year);
@@ -740,7 +740,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 			usdob = '-';
 			agemarr = '-';
 		}
-		
+
 		// Date of Death (dod) - passed as Julian Date String --------------
 		if (dod>1721060) {
 			IJD = Math.floor(dod);
@@ -756,18 +756,18 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 			I = 100*(N - 49) + I + L;
 			dod = (I+', '+J+', '+K);
 		}
-		// Create Date of Marriage object from passed string dom 
+		// Create Date of Marriage object from passed string dom
 		var jsdod = Date.parseString(dod, 'y, M, d');
-		
+
 	}
-		
-		
+
+
 	if (hasLoaded) {
-		
+
 		var tbl = document.getElementById(TABLE_NAME);
 		var nextRow = tbl.tBodies[0].rows.length;
 		var iteration = nextRow + ROW_BASE;
-		if (num == null) { 
+		if (num == null) {
 			num = nextRow;
 			num2 = num;
 		} else {
@@ -775,8 +775,8 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		}
 
 		// Initial Age Calculation based on 1901 Census Year input ============
-		// *** NOTE *** 
-		// *** This is then corrected when ChangeYear() function is run 
+		// *** NOTE ***
+		// *** This is then corrected when ChangeYear() function is run
 		// *** ChangeYear() is run each time Census Year is selected or changed
 		if (age2!="Age" && age2!=null) {
 			// Check if Census year filled in -------------
@@ -791,7 +791,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		}else{
 			age="-";
 		}
-		
+
 		// add the row =======================================================
 		var row = tbl.tBodies[0].insertRow(num);
 
@@ -811,7 +811,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				cell_del.setAttribute('align', 'center');
 			var cell_ra = row.insertCell(75); // Radio button used for inserting a row, rather than adding at end of table)
 		}
-		
+
 		var cell_index2 = row.insertCell(76); // Item Number (#2)
 			cell_index2.setAttribute('id', 'index2');
 			cell_index2.setAttribute('name', 'index2');
@@ -821,11 +821,11 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		// **B** SHOW/HIDE Header Cell elements ===============================
 			// ---- Basic Hidden Columns (miss out 0,1,2 and >68)
 			for(var i=3; i<=69; i++){
-				cell_[i].style.display = "none"; 
+				cell_[i].style.display = "none";
 			}
-			
+
 			// ---- Show Cell Columns =========================================
-			//var currcenyear = document.getElementById('censYear').value; 
+			//var currcenyear = document.getElementById('censYear').value;
 			//changeCols(currcenyear);
 
 		// **C** Define Header Cell elements ==================================
@@ -847,7 +847,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_pid.className= 'descriptionbox'; //Required for IE
 				txtInp_pid.style.fontSize="10px";
 				txtInp_pid.style.border='0px';
-				txtInp_pid.innerHTML = '<a href="#" alt="ID" title="ID"> ID </a>'; 
+				txtInp_pid.innerHTML = '<a href="#" alt="ID" title="ID"> ID </a>';
 		// 2. Name ------------------------------------------------------------
 			var txtInp_nam = document.createElement('div');
 				txtInp_nam.setAttribute('class', 'descriptionbox');
@@ -855,7 +855,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_nam.setAttribute('type', 'text');
 				txtInp_nam.style.fontSize="10px";
 				txtInp_nam.style.border='0px';
-				txtInp_nam.innerHTML = '<a href="#" alt="'+TTEditName+'" title="'+TTEditName+'">'+HeaderName+'</a>'; 
+				txtInp_nam.innerHTML = '<a href="#" alt="'+TTEditName+'" title="'+TTEditName+'">'+HeaderName+'</a>';
 				txtInp_nam.setAttribute('id', '.b.'+HeaderName);
 		// 3. Relationship_1 --------------------------------------------------
 			var txtInp_label = document.createElement('div');
@@ -864,7 +864,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_label.className= 'descriptionbox'; //Required for IE
 				txtInp_label.style.fontSize="10px";
 				txtInp_label.style.border='0px';
-				txtInp_label.innerHTML = '<a href="#" alt="'+TTEditRela+'" title="'+TTEditRela+'">'+HeaderRela+'</a>'; 
+				txtInp_label.innerHTML = '<a href="#" alt="'+TTEditRela+'" title="'+TTEditRela+'">'+HeaderRela+'</a>';
 				txtInp_label.setAttribute('id', '.b.'+HeaderRela);
 		// 4. Conditition_1 ---------------------------------------------------
 			var txtInp_cond = document.createElement('div');
@@ -873,7 +873,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_cond.className= 'descriptionbox'; //Required for IE
 				txtInp_cond.style.fontSize="10px";
 				txtInp_cond.style.border='0px';
-				txtInp_cond.innerHTML = '<a href="#" alt="'+TTEditMCond+'" title="'+TTEditMCond+'">'+HeaderMCond+'</a>'; 
+				txtInp_cond.innerHTML = '<a href="#" alt="'+TTEditMCond+'" title="'+TTEditMCond+'">'+HeaderMCond+'</a>';
 				txtInp_cond.setAttribute('id', '.b.'+HeaderMCond);
 		// 5. Tenure ----------------------------------------------------------
 			var txtInp_tenure = document.createElement('div');
@@ -882,7 +882,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_tenure.className= 'descriptionbox'; //Required for IE
 				txtInp_tenure.style.fontSize="10px";
 				txtInp_tenure.style.border='0px';
-				txtInp_tenure.innerHTML = '<a href="#" alt="'+TTEditTenure+'" title="'+TTEditTenure+'">'+HeaderTenure+'</a>'; 
+				txtInp_tenure.innerHTML = '<a href="#" alt="'+TTEditTenure+'" title="'+TTEditTenure+'">'+HeaderTenure+'</a>';
 				txtInp_tenure.setAttribute('id', '.b.'+HeaderTenure);
 		// 6. Assets ----------------------------------------------------------
 			var txtInp_assets = document.createElement('div');
@@ -891,7 +891,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_assets.className= 'descriptionbox'; //Required for IE
 				txtInp_assets.style.fontSize="10px";
 				txtInp_assets.style.border='0px';
-				txtInp_assets.innerHTML = '<a href="#" alt="'+TTEditAsset+'" title="'+TTEditAsset+'">'+HeaderAsset+'</a>'; 
+				txtInp_assets.innerHTML = '<a href="#" alt="'+TTEditAsset+'" title="'+TTEditAsset+'">'+HeaderAsset+'</a>';
 				txtInp_assets.setAttribute('id', '.b.'+HeaderAsset);
 		// 7. Age_1 -----------------------------------------------------------
 			var txtInp_age = document.createElement('div');
@@ -900,7 +900,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_age.className= 'descriptionbox'; //Required for IE
 				txtInp_age.style.fontSize="10px";
 				txtInp_age.style.border='0px';
-				txtInp_age.innerHTML = '<a href="#" alt="'+TTEditAge+'" title="'+TTEditAge+'">'+HeaderAge+'</a>'; 
+				txtInp_age.innerHTML = '<a href="#" alt="'+TTEditAge+'" title="'+TTEditAge+'">'+HeaderAge+'</a>';
 				txtInp_age.setAttribute('id', '.b.'+HeaderAge);
 		// 8. Race_1 ----------------------------------------------------------
 			var txtInp_race = document.createElement('div');
@@ -909,7 +909,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_race.className= 'descriptionbox'; //Required for IE
 				txtInp_race.style.fontSize="10px";
 				txtInp_race.style.border='0px';
-				txtInp_race.innerHTML = '<a href="#" alt="'+TTEditRace+'" title="'+TTEditRace+'">'+HeaderRace+'</a>'; 
+				txtInp_race.innerHTML = '<a href="#" alt="'+TTEditRace+'" title="'+TTEditRace+'">'+HeaderRace+'</a>';
 				txtInp_race.setAttribute('id', '.b.'+HeaderRace);
 		// 9. Sex -------------------------------------------------------------
 			var txtInp_gend = document.createElement('div');
@@ -918,7 +918,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_gend.className= 'descriptionbox'; //Required for IE
 				txtInp_gend.style.fontSize="10px";
 				txtInp_gend.style.border='0px';
-				txtInp_gend.innerHTML = '<a href="#" alt="'+TTEditSex+'" title="'+TTEditSex+'">'+HeaderSex+'</a>'; 
+				txtInp_gend.innerHTML = '<a href="#" alt="'+TTEditSex+'" title="'+TTEditSex+'">'+HeaderSex+'</a>';
 				txtInp_gend.setAttribute('id', '.b.'+HeaderSex);
 		// 10. Race_2 ----------------------------------------------------------
 			var txtInp_race2 = document.createElement('div');
@@ -927,7 +927,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_race2.className= 'descriptionbox'; //Required for IE
 				txtInp_race2.style.fontSize="10px";
 				txtInp_race2.style.border='0px';
-				txtInp_race2.innerHTML = '<a href="#" alt="'+TTEditRace+'" title="'+TTEditRace+'">'+HeaderRace+'</a>'; 
+				txtInp_race2.innerHTML = '<a href="#" alt="'+TTEditRace+'" title="'+TTEditRace+'">'+HeaderRace+'</a>';
 				txtInp_race2.setAttribute('id', '.b.'+HeaderRace);
 		// 11. DOB/YOB ---------------------------------------------------------
 			var txtInp_yob = document.createElement('div');
@@ -936,7 +936,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_yob.className= 'descriptionbox'; //Required for IE
 				txtInp_yob.style.fontSize="10px";
 				txtInp_yob.style.border='0px';
-				txtInp_yob.innerHTML = '<a href="#" alt="'+TTEditYOB+'" title="'+TTEditYOB+'">'+HeaderYOB+'</a>'; 
+				txtInp_yob.innerHTML = '<a href="#" alt="'+TTEditYOB+'" title="'+TTEditYOB+'">'+HeaderYOB+'</a>';
 				txtInp_yob.setAttribute('id', '.b.'+HeaderYOB);
 		// 12. Age_2 -----------------------------------------------------------
 			var txtInp_age2 = document.createElement('div');
@@ -945,7 +945,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_age2.className= 'descriptionbox'; //Required for IE
 				txtInp_age2.style.fontSize="10px";
 				txtInp_age2.style.border='0px';
-				txtInp_age2.innerHTML = '<a href="#" alt="'+TTEditAge+'" title="'+TTEditAge+'">'+HeaderAge+'</a>'; 
+				txtInp_age2.innerHTML = '<a href="#" alt="'+TTEditAge+'" title="'+TTEditAge+'">'+HeaderAge+'</a>';
 				txtInp_age2.setAttribute('id', '.b.'+HeaderAge);
 		// 13. MthB (if born within census year) -------------------------------
 			var txtInp_bmth = document.createElement('div');
@@ -954,7 +954,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_bmth.className= 'descriptionbox'; //Required for IE
 				txtInp_bmth.style.fontSize="10px";
 				txtInp_bmth.style.border='0px';
-				txtInp_bmth.innerHTML = '<a href="#" alt="'+TTEditBmth+'" title="'+TTEditBmth+'">'+HeaderBmth+'</a>'; 
+				txtInp_bmth.innerHTML = '<a href="#" alt="'+TTEditBmth+'" title="'+TTEditBmth+'">'+HeaderBmth+'</a>';
 				txtInp_bmth.setAttribute('id', '.b.'+HeaderBmth);
 		// 14. Relationship_2 --------------------------------------------------
 			var txtInp_label2 = document.createElement('div');
@@ -963,7 +963,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_label2.className= 'descriptionbox'; //Required for IE
 				txtInp_label2.style.fontSize="10px";
 				txtInp_label2.style.border='0px';
-				txtInp_label2.innerHTML = '<a href="#" alt="'+TTEditRela+'" title="'+TTEditRela+'">'+HeaderRela+'</a>'; 
+				txtInp_label2.innerHTML = '<a href="#" alt="'+TTEditRela+'" title="'+TTEditRela+'">'+HeaderRela+'</a>';
 				txtInp_label2.setAttribute('id', '.b.'+HeaderRela);
 		// 15. Conditition_2 ---------------------------------------------------
 			var txtInp_cond2 = document.createElement('div');
@@ -972,7 +972,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_cond2.className= 'descriptionbox'; //Required for IE
 				txtInp_cond2.style.fontSize="10px";
 				txtInp_cond2.style.border='0px';
-				txtInp_cond2.innerHTML = '<a href="#" alt="'+TTEditMCond+'" title="'+TTEditMCond+'">'+HeaderMCond+'</a>'; 
+				txtInp_cond2.innerHTML = '<a href="#" alt="'+TTEditMCond+'" title="'+TTEditMCond+'">'+HeaderMCond+'</a>';
 				txtInp_cond2.setAttribute('id', '.b.'+HeaderMCond);
 		// 16. Years Married ---------------------------------------------------
 			var txtInp_yrsm = document.createElement('div');
@@ -981,7 +981,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_yrsm.className= 'descriptionbox'; //Required for IE
 				txtInp_yrsm.style.fontSize="10px";
 				txtInp_yrsm.style.border='0px';
-				txtInp_yrsm.innerHTML = '<a href="#" alt="'+TTEditYrsM+'" title="'+TTEditYrsM+'">'+HeaderYrsM+'</a>'; 
+				txtInp_yrsm.innerHTML = '<a href="#" alt="'+TTEditYrsM+'" title="'+TTEditYrsM+'">'+HeaderYrsM+'</a>';
 				txtInp_yrsm.setAttribute('id', '.b.'+HeaderYrsM);
 		// 17. Children Born Alive ---------------------------------------------
 			var txtInp_chilB = document.createElement('div');
@@ -990,7 +990,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_chilB.className= 'descriptionbox'; //Required for IE
 				txtInp_chilB.style.fontSize="10px";
 				txtInp_chilB.style.border='0px';
-				txtInp_chilB.innerHTML = '<a href="#" alt="'+TTEditChilB+'" title="'+TTEditChilB+'">'+HeaderChilB+'</a>'; 
+				txtInp_chilB.innerHTML = '<a href="#" alt="'+TTEditChilB+'" title="'+TTEditChilB+'">'+HeaderChilB+'</a>';
 				txtInp_chilB.setAttribute('id', '.b.'+HeaderChilB);
 		// 18. Children Still Living -------------------------------------------
 			var txtInp_chilL = document.createElement('div');
@@ -999,7 +999,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_chilL.className= 'descriptionbox'; //Required for IE
 				txtInp_chilL.style.fontSize="10px";
 				txtInp_chilL.style.border='0px';
-				txtInp_chilL.innerHTML = '<a href="#" alt="'+TTEditChilL+'" title="'+TTEditChilL+'">'+HeaderChilL+'</a>'; 
+				txtInp_chilL.innerHTML = '<a href="#" alt="'+TTEditChilL+'" title="'+TTEditChilL+'">'+HeaderChilL+'</a>';
 				txtInp_chilL.setAttribute('id', '.b.'+HeaderChilL);
 		// 19. Children who have Died ------------------------------------------
 			var txtInp_chilD = document.createElement('div');
@@ -1008,7 +1008,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_chilD.className= 'descriptionbox'; //Required for IE
 				txtInp_chilD.style.fontSize="10px";
 				txtInp_chilD.style.border='0px';
-				txtInp_chilD.innerHTML = '<a href="#" alt="'+TTEditChilD+'" title="'+TTEditChilD+'">'+HeaderChilD+'</a>'; 
+				txtInp_chilD.innerHTML = '<a href="#" alt="'+TTEditChilD+'" title="'+TTEditChilD+'">'+HeaderChilD+'</a>';
 				txtInp_chilD.setAttribute('id', '.b.'+HeaderChilD);
 		// 20. Age at first Marriage -------------------------------------------
 			var txtInp_ageM = document.createElement('div');
@@ -1017,7 +1017,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ageM.className= 'descriptionbox'; //Required for IE
 				txtInp_ageM.style.fontSize="10px";
 				txtInp_ageM.style.border='0px';
-				txtInp_ageM.innerHTML = '<a href="#" alt="'+TTEditAgeM+'" title="'+TTEditAgeM+'">'+HeaderAgeM+'</a>'; 
+				txtInp_ageM.innerHTML = '<a href="#" alt="'+TTEditAgeM+'" title="'+TTEditAgeM+'">'+HeaderAgeM+'</a>';
 				txtInp_ageM.setAttribute('id', '.b.'+HeaderAgeM);
 		// 21. Occupation_1 ----------------------------------------------------
 			var txtInp_occu = document.createElement('div');
@@ -1026,7 +1026,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_occu.className= 'descriptionbox'; //Required for IE
 				txtInp_occu.style.fontSize="10px";
 				txtInp_occu.style.border='0px';
-				txtInp_occu.innerHTML = '<a href="#" alt="'+TTEditOccu+'" title="'+TTEditOccu+'">'+HeaderOccu+'</a>'; 
+				txtInp_occu.innerHTML = '<a href="#" alt="'+TTEditOccu+'" title="'+TTEditOccu+'">'+HeaderOccu+'</a>';
 				txtInp_occu.setAttribute('id', '.b.'+HeaderOccu);
 		// 22. Assets_2 --------------------------------------------------------
 			var txtInp_assets2 = document.createElement('div');
@@ -1035,7 +1035,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_assets2.className= 'descriptionbox'; //Required for IE
 				txtInp_assets2.style.fontSize="10px";
 				txtInp_assets2.style.border='0px';
-				txtInp_assets2.innerHTML = '<a href="#" alt="'+TTEditAsset+'" title="'+TTEditAsset+'">'+HeaderAsset+'</a>'; 
+				txtInp_assets2.innerHTML = '<a href="#" alt="'+TTEditAsset+'" title="'+TTEditAsset+'">'+HeaderAsset+'</a>';
 				txtInp_assets2.setAttribute('id', '.b.'+HeaderAsset);
 		// 23. Birth Place_1 -----------------------------------------------
 			var txtInp_birthpl = document.createElement('div');
@@ -1062,7 +1062,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_bmth2.className= 'descriptionbox'; //Required for IE
 				txtInp_bmth2.style.fontSize="10px";
 				txtInp_bmth2.style.border='0px';
-				txtInp_bmth2.innerHTML = '<a href="#" alt="'+TTEditBmth+'" title="'+TTEditBmth+'">'+HeaderBmth+'</a>'; 
+				txtInp_bmth2.innerHTML = '<a href="#" alt="'+TTEditBmth+'" title="'+TTEditBmth+'">'+HeaderBmth+'</a>';
 				txtInp_bmth2.setAttribute('id', '.b.'+HeaderBmth);
 		// 26. MthM (if married within census year) -------------------------------
 			var txtInp_mmth = document.createElement('div');
@@ -1071,7 +1071,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_mmth.className= 'descriptionbox'; //Required for IE
 				txtInp_mmth.style.fontSize="10px";
 				txtInp_mmth.style.border='0px';
-				txtInp_mmth.innerHTML = '<a href="#" alt="'+TTEditMmth+'" title="'+TTEditMmth+'">'+HeaderMmth+'</a>'; 
+				txtInp_mmth.innerHTML = '<a href="#" alt="'+TTEditMmth+'" title="'+TTEditMmth+'">'+HeaderMmth+'</a>';
 				txtInp_mmth.setAttribute('id', '.b.'+HeaderMmth);
 		// 27. Indi Birth Place_1 -----------------------------------------------
 			var txtInp_ibirthpl = document.createElement('div');
@@ -1152,7 +1152,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_occu2.className= 'descriptionbox'; //Required for IE
 				txtInp_occu2.style.fontSize="10px";
 				txtInp_occu2.style.border='0px';
-				txtInp_occu2.innerHTML = '<a href="#" alt="'+TTEditOccu+'" title="'+TTEditOccu+'">'+HeaderOccu+'</a>'; 
+				txtInp_occu2.innerHTML = '<a href="#" alt="'+TTEditOccu+'" title="'+TTEditOccu+'">'+HeaderOccu+'</a>';
 				txtInp_occu2.setAttribute('id', '.b.'+HeaderOccu);
 		// 36. Health --------------------------------------------------------------
 			var txtInp_health = document.createElement('div');
@@ -1161,7 +1161,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_health.className= 'descriptionbox'; //Required for IE
 				txtInp_health.style.fontSize="10px";
 				txtInp_health.style.border='0px';
-				txtInp_health.innerHTML = '<a href="#" alt="'+TTEditHealth+'" title="'+TTEditHealth+'">'+HeaderHealth+'</a>'; 
+				txtInp_health.innerHTML = '<a href="#" alt="'+TTEditHealth+'" title="'+TTEditHealth+'">'+HeaderHealth+'</a>';
 				txtInp_health.setAttribute('id', '.b.'+HeaderHealth);
 		// 37. Industry ind_1 ------------------------------------------------------
 			var txtInp_ind1 = document.createElement('div');
@@ -1170,7 +1170,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ind1.className= 'descriptionbox'; //Required for IE
 				txtInp_ind1.style.fontSize="10px";
 				txtInp_ind1.style.border='0px';
-				txtInp_ind1.innerHTML = '<a href="#" alt="'+TTEditInd+'" title="'+TTEditInd+'">'+HeaderInd+'</a>'; 
+				txtInp_ind1.innerHTML = '<a href="#" alt="'+TTEditInd+'" title="'+TTEditInd+'">'+HeaderInd+'</a>';
 				txtInp_ind1.setAttribute('id', '.b.'+HeaderInd);
 		// 38. Employ_1 ------------------------------------------------------------
 			var txtInp_emp1 = document.createElement('div');
@@ -1377,7 +1377,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_occu3.className= 'descriptionbox'; //Required for IE
 				txtInp_occu3.style.fontSize="10px";
 				txtInp_occu3.style.border='0px';
-				txtInp_occu3.innerHTML = '<a href="#" alt="'+TTEditOccu+'" title="'+TTEditOccu+'">'+HeaderOccu+'</a>'; 
+				txtInp_occu3.innerHTML = '<a href="#" alt="'+TTEditOccu+'" title="'+TTEditOccu+'">'+HeaderOccu+'</a>';
 				txtInp_occu3.setAttribute('id', '.b.'+HeaderOccu);
 		// 61. Industry ind_2 ------------------------------------------------------
 			var txtInp_ind2 = document.createElement('div');
@@ -1386,7 +1386,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ind2.className= 'descriptionbox'; //Required for IE
 				txtInp_ind2.style.fontSize="10px";
 				txtInp_ind2.style.border='0px';
-				txtInp_ind2.innerHTML = '<a href="#" alt="'+TTEditInd+'" title="'+TTEditInd+'">'+HeaderInd+'</a>'; 
+				txtInp_ind2.innerHTML = '<a href="#" alt="'+TTEditInd+'" title="'+TTEditInd+'">'+HeaderInd+'</a>';
 				txtInp_ind2.setAttribute('id', '.b.'+HeaderInd);
 		// 62. Employ_2 ------------------------------------------------------------
 			var txtInp_emp2 = document.createElement('div');
@@ -1453,7 +1453,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_infirm1910.style.border='0px';
 				txtInp_infirm1910.innerHTML = '<a href="#" alt="'+TTEditInfirm1910+'" title="'+TTEditInfirm1910+'">'+HeaderInfirm1910+'</a>';
 				txtInp_infirm1910.setAttribute('id', '.b.'+HeaderInfirm1910);
-				
+
 		// Hidden Items ------------------------------------------------------
 		// 68. DOB date of Birth (Julian) actual or rough (ABT, BET)
 		// 69. DOM date of Marriage (Julian) actual or rough (ABT, BET)
@@ -1463,7 +1463,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		// 73. Textual Array of Chil (Nam DOB DOD) for ChilB, ChilL, ChilD
 		//
 
-		// 74. Extra 1. Text Del Button ------------------------------------------------- 
+		// 74. Extra 1. Text Del Button -------------------------------------------------
 			var txtInp_tdel = document.createElement('div');
 				txtInp_tdel.setAttribute('type', 'text');
 				txtInp_tdel.setAttribute('class', 'descriptionbox');
@@ -1472,7 +1472,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_tdel.style.border='0px';
 				txtInp_tdel.innerHTML = 'Del';
 				txtInp_tdel.setAttribute('id', this);
-		// 75. Extra 2. Text Radio Button ----------------------------------------------- 
+		// 75. Extra 2. Text Radio Button -----------------------------------------------
 			var txtInp_tra = document.createElement('div');
 				txtInp_tra.setAttribute('type', 'text');
 				txtInp_tra.setAttribute('class', 'descriptionbox');
@@ -1591,7 +1591,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_race.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_8');
 				txtInp_race.setAttribute('size', '1');
 				txtInp_race.setAttribute('maxlength', '1');
-				txtInp_race.setAttribute('value', ''); 
+				txtInp_race.setAttribute('value', '');
 				txtInp_race.style.color=txtcolor;
 				txtInp_race.style.fontSize="10px";
 				txtInp_race.style.width="1em";
@@ -1601,7 +1601,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_gend.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_9');
 				txtInp_gend.setAttribute('size', '1');
 				txtInp_gend.setAttribute('maxlength', '1');
-				txtInp_gend.setAttribute('value', gend); 
+				txtInp_gend.setAttribute('value', gend);
 				txtInp_gend.style.color=txtcolor;
 				txtInp_gend.style.fontSize="10px";
 				txtInp_gend.style.width="1em";
@@ -1611,7 +1611,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_race2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_10');
 				txtInp_race2.setAttribute('size', '1');
 				txtInp_race2.setAttribute('maxlength', '1');
-				txtInp_race2.setAttribute('value', ''); 
+				txtInp_race2.setAttribute('value', '');
 				txtInp_race2.style.color=txtcolor;
 				txtInp_race2.style.fontSize="10px";
 				txtInp_race2.style.width="1em";
@@ -1631,7 +1631,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_age2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_12');
 				txtInp_age2.setAttribute('size', '2');
 				txtInp_age2.setAttribute('maxlength', '4');
-				txtInp_age2.setAttribute('value', age); 
+				txtInp_age2.setAttribute('value', age);
 				if (txtInp_age2.value>=0) {
 					txtInp_age2.style.color=txtcolor;
 				} else {
@@ -1646,7 +1646,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_bmth.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_13');
 				txtInp_bmth.setAttribute('size', '1');
 				txtInp_bmth.setAttribute('maxlength', '3');
-				txtInp_bmth.setAttribute('value', ''); 
+				txtInp_bmth.setAttribute('value', '');
 				txtInp_bmth.style.color=txtcolor;
 				txtInp_bmth.style.fontSize="10px";
 				txtInp_bmth.style.width="2.4em";
@@ -1723,7 +1723,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ageM.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_20');
 				txtInp_ageM.setAttribute('size', '1');
 				txtInp_ageM.setAttribute('maxlength', '2');
-				txtInp_ageM.setAttribute('value', agemarr); 
+				txtInp_ageM.setAttribute('value', agemarr);
 				txtInp_ageM.style.color=txtcolor;
 				txtInp_ageM.style.fontSize="10px";
 				txtInp_ageM.style.width="1.4em";
@@ -1732,7 +1732,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_occu.setAttribute('type', 'text');
 				txtInp_occu.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_21');
 				txtInp_occu.setAttribute('size', '22');
-				txtInp_occu.setAttribute('value', ''); 
+				txtInp_occu.setAttribute('value', '');
 				txtInp_occu.style.color=txtcolor;
 				txtInp_occu.style.fontSize="10px";
 				txtInp_occu.style.width="11em";
@@ -1750,7 +1750,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_birthpl.setAttribute('type', 'text');
 				txtInp_birthpl.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_23');
 				txtInp_birthpl.setAttribute('size', '25');
-				txtInp_birthpl.setAttribute('value', birthpl); 
+				txtInp_birthpl.setAttribute('value', birthpl);
 				txtInp_birthpl.style.color=txtcolor;
 				txtInp_birthpl.style.fontSize="10px";
 				txtInp_birthpl.style.width="13em";
@@ -1760,7 +1760,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_parent.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_24');
 				txtInp_parent.setAttribute('size', '1');
 				txtInp_parent.setAttribute('maxlength', '3');
-				txtInp_parent.setAttribute('value', ''); 
+				txtInp_parent.setAttribute('value', '');
 				txtInp_parent.style.color=txtcolor;
 				txtInp_parent.style.fontSize="10px";
 				txtInp_parent.style.width="2em";
@@ -1770,7 +1770,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_bmth2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_25');
 				txtInp_bmth2.setAttribute('size', '1');
 				txtInp_bmth2.setAttribute('maxlength', '3');
-				txtInp_bmth2.setAttribute('value', ''); 
+				txtInp_bmth2.setAttribute('value', '');
 				txtInp_bmth2.style.color=txtcolor;
 				txtInp_bmth2.style.fontSize="10px";
 				txtInp_bmth2.style.width="2.4em";
@@ -1780,7 +1780,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_mmth.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_26');
 				txtInp_mmth.setAttribute('size', '1');
 				txtInp_mmth.setAttribute('maxlength', '3');
-				txtInp_mmth.setAttribute('value', ''); 
+				txtInp_mmth.setAttribute('value', '');
 				txtInp_mmth.style.color=txtcolor;
 				txtInp_mmth.style.fontSize="10px";
 				txtInp_mmth.style.width="2.4em";
@@ -1790,7 +1790,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ibirthpl.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_27');
 				txtInp_ibirthpl.setAttribute('size', '1');
 				txtInp_ibirthpl.setAttribute('maxlength', '3');
-				txtInp_ibirthpl.setAttribute('value', ibirthpl); 
+				txtInp_ibirthpl.setAttribute('value', ibirthpl);
 				txtInp_ibirthpl.style.color=txtcolor;
 				txtInp_ibirthpl.style.fontSize="10px";
 				txtInp_ibirthpl.style.width="2.4em";
@@ -1800,7 +1800,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_fbirthpl.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_28');
 				txtInp_fbirthpl.setAttribute('size', '1');
 				txtInp_fbirthpl.setAttribute('maxlength', '3');
-				txtInp_fbirthpl.setAttribute('value', fbirthpl); 
+				txtInp_fbirthpl.setAttribute('value', fbirthpl);
 				txtInp_fbirthpl.style.color=txtcolor;
 				txtInp_fbirthpl.style.fontSize="10px";
 				txtInp_fbirthpl.style.width="2.4em";
@@ -1810,7 +1810,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_mbirthpl.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_29');
 				txtInp_mbirthpl.setAttribute('size', '1');
 				txtInp_mbirthpl.setAttribute('maxlength', '3');
-				txtInp_mbirthpl.setAttribute('value', mbirthpl); 
+				txtInp_mbirthpl.setAttribute('value', mbirthpl);
 				txtInp_mbirthpl.style.color=txtcolor;
 				txtInp_mbirthpl.style.fontSize="10px";
 				txtInp_mbirthpl.style.width="2.4em";
@@ -1820,7 +1820,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_yrsUS.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_30');
 				txtInp_yrsUS.setAttribute('size', '1');
 				txtInp_yrsUS.setAttribute('maxlength', '2');
-				txtInp_yrsUS.setAttribute('value', ''); 
+				txtInp_yrsUS.setAttribute('value', '');
 				txtInp_yrsUS.style.color=txtcolor;
 				txtInp_yrsUS.style.fontSize="10px";
 				txtInp_yrsUS.style.width="1.4em";
@@ -1830,7 +1830,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_yoi1.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_31');
 				txtInp_yoi1.setAttribute('size', '2');
 				txtInp_yoi1.setAttribute('maxlength', '4');
-				txtInp_yoi1.setAttribute('value', ''); 
+				txtInp_yoi1.setAttribute('value', '');
 				txtInp_yoi1.style.color=txtcolor;
 				txtInp_yoi1.style.fontSize="10px";
 		// 32. Naturalized or Alien N-A_1 ---------------------------------------
@@ -1839,7 +1839,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_na1.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_32');
 				txtInp_na1.setAttribute('size', '1');
 				txtInp_na1.setAttribute('maxlength', '1');
-				txtInp_na1.setAttribute('value', ''); 
+				txtInp_na1.setAttribute('value', '');
 				txtInp_na1.style.color=txtcolor;
 				txtInp_na1.style.fontSize="10px";
 				txtInp_na1.style.width="1em";
@@ -1849,7 +1849,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_yon.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_33');
 				txtInp_yon.setAttribute('size', '2');
 				txtInp_yon.setAttribute('maxlength', '4');
-				txtInp_yon.setAttribute('value', ''); 
+				txtInp_yon.setAttribute('value', '');
 				txtInp_yon.style.color=txtcolor;
 				txtInp_yon.style.fontSize="10px";
 		// 34. English spoken, or if not, other Language spoken Eng/Lang --------
@@ -1858,7 +1858,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_englang.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_34');
 				txtInp_englang.setAttribute('size', '8');
 				txtInp_englang.setAttribute('maxlength', '10');
-				txtInp_englang.setAttribute('value', ''); 
+				txtInp_englang.setAttribute('value', '');
 				txtInp_englang.style.color=txtcolor;
 				txtInp_englang.style.fontSize="10px";
 		// 35. Occupation_2 ----------------------------------------------------
@@ -1866,7 +1866,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_occu2.setAttribute('type', 'text');
 				txtInp_occu2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_35');
 				txtInp_occu2.setAttribute('size', '22');
-				txtInp_occu2.setAttribute('value', ''); 
+				txtInp_occu2.setAttribute('value', '');
 				txtInp_occu2.style.color=txtcolor;
 				txtInp_occu2.style.fontSize="10px";
 				txtInp_occu2.style.width="11em";
@@ -1876,7 +1876,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_health.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_36');
 				txtInp_health.setAttribute('size', '3');
 				txtInp_health.setAttribute('maxlength', '5');
-				txtInp_health.setAttribute('value', ''); 
+				txtInp_health.setAttribute('value', '');
 				txtInp_health.style.color=txtcolor;
 				txtInp_health.style.fontSize="10px";
 		// 37. Industry_1 ------------------------------------------------------
@@ -1884,7 +1884,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ind1.setAttribute('type', 'text');
 				txtInp_ind1.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_37');
 				txtInp_ind1.setAttribute('size', '22');
-				txtInp_ind1.setAttribute('value', ''); 
+				txtInp_ind1.setAttribute('value', '');
 				txtInp_ind1.style.color=txtcolor;
 				txtInp_ind1.style.fontSize="10px";
 		// 38. Employ_1 --------------------------------------------------------
@@ -1892,7 +1892,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_emp1.setAttribute('type', 'text');
 				txtInp_emp1.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_38');
 				txtInp_emp1.setAttribute('size', '12');
-				txtInp_emp1.setAttribute('value', ''); 
+				txtInp_emp1.setAttribute('value', '');
 				txtInp_emp1.style.color=txtcolor;
 				txtInp_emp1.style.fontSize="10px";
 				txtInp_emp1.style.width="7em";
@@ -1902,7 +1902,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_emR.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_39');
 				txtInp_emR.setAttribute('size', '1');
 				txtInp_emR.setAttribute('maxlength', '1');
-				txtInp_emR.setAttribute('value', ''); 
+				txtInp_emR.setAttribute('value', '');
 				txtInp_emR.style.color=txtcolor;
 				txtInp_emR.style.fontSize="10px";
 				txtInp_emR.style.width="1em";
@@ -1912,7 +1912,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_emD.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_40');
 				txtInp_emD.setAttribute('size', '1');
 				txtInp_emD.setAttribute('maxlength', '1');
-				txtInp_emD.setAttribute('value', ''); 
+				txtInp_emD.setAttribute('value', '');
 				txtInp_emD.style.color=txtcolor;
 				txtInp_emD.style.fontSize="10px";
 				txtInp_emD.style.width="1em";
@@ -1922,7 +1922,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_mnsE.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_41');
 				txtInp_mnsE.setAttribute('size', '1');
 				txtInp_mnsE.setAttribute('maxlength', '2');
-				txtInp_mnsE.setAttribute('value', ''); 
+				txtInp_mnsE.setAttribute('value', '');
 				txtInp_mnsE.style.color=txtcolor;
 				txtInp_mnsE.style.fontSize="10px";
 				txtInp_mnsE.style.width="1.4em";
@@ -1932,7 +1932,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_emH.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_42');
 				txtInp_emH.setAttribute('size', '1');
 				txtInp_emH.setAttribute('maxlength', '1');
-				txtInp_emH.setAttribute('value', ''); 
+				txtInp_emH.setAttribute('value', '');
 				txtInp_emH.style.color=txtcolor;
 				txtInp_emH.style.fontSize="10px";
 				txtInp_emH.style.width="1em";
@@ -1942,7 +1942,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_emN.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_43');
 				txtInp_emN.setAttribute('size', '1');
 				txtInp_emN.setAttribute('maxlength', '1');
-				txtInp_emN.setAttribute('value', ''); 
+				txtInp_emN.setAttribute('value', '');
 				txtInp_emN.style.color=txtcolor;
 				txtInp_emN.style.fontSize="10px";
 				txtInp_emN.style.width="1em";
@@ -1952,7 +1952,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_wksU.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_44');
 				txtInp_wksU.setAttribute('size', '1');
 				txtInp_wksU.setAttribute('maxlength', '2');
-				txtInp_wksU.setAttribute('value', ''); 
+				txtInp_wksU.setAttribute('value', '');
 				txtInp_wksU.style.color=txtcolor;
 				txtInp_wksU.style.fontSize="10px";
 				txtInp_wksU.style.width="1.4em";
@@ -1962,7 +1962,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_mnsU.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_45');
 				txtInp_mnsU.setAttribute('size', '1');
 				txtInp_mnsU.setAttribute('maxlength', '2');
-				txtInp_mnsU.setAttribute('value', ''); 
+				txtInp_mnsU.setAttribute('value', '');
 				txtInp_mnsU.style.color=txtcolor;
 				txtInp_mnsU.style.fontSize="10px";
 				txtInp_mnsU.style.width="1.4em";
@@ -1972,7 +1972,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_educ.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_46');
 				txtInp_educ.setAttribute('size', '1');
 				txtInp_educ.setAttribute('maxlength', '3');
-				txtInp_educ.setAttribute('value', ''); 
+				txtInp_educ.setAttribute('value', '');
 				txtInp_educ.style.color=txtcolor;
 				txtInp_educ.style.fontSize="10px";
 				txtInp_educ.style.width="1.8em";
@@ -1982,7 +1982,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_educpre1890.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_47');
 				txtInp_educpre1890.setAttribute('size', '1');
 				txtInp_educpre1890.setAttribute('maxlength', '3');
-				txtInp_educpre1890.setAttribute('value', ''); 
+				txtInp_educpre1890.setAttribute('value', '');
 				txtInp_educpre1890.style.color=txtcolor;
 				txtInp_educpre1890.style.fontSize="10px";
 				txtInp_educpre1890.width="1.8em";
@@ -1992,7 +1992,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_eng1.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_48');
 				txtInp_eng1.setAttribute('size', '1');
 				txtInp_eng1.setAttribute('maxlength', '1');
-				txtInp_eng1.setAttribute('value', ''); 
+				txtInp_eng1.setAttribute('value', '');
 				txtInp_eng1.style.color=txtcolor;
 				txtInp_eng1.style.fontSize="10px";
 				txtInp_eng1.style.width="1em";
@@ -2010,7 +2010,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_birthpl2.setAttribute('type', 'text');
 				txtInp_birthpl2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_50');
 				txtInp_birthpl2.setAttribute('size', '25');
-				txtInp_birthpl2.setAttribute('value', birthpl); 
+				txtInp_birthpl2.setAttribute('value', birthpl);
 				txtInp_birthpl2.style.color=txtcolor;
 				txtInp_birthpl2.style.fontSize="10px";
 				txtInp_birthpl2.style.width="13em";
@@ -2020,7 +2020,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ibirthpl2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_51');
 				txtInp_ibirthpl2.setAttribute('size', '1');
 				txtInp_ibirthpl2.setAttribute('maxlength', '3');
-				txtInp_ibirthpl2.setAttribute('value', ibirthpl); 
+				txtInp_ibirthpl2.setAttribute('value', ibirthpl);
 				txtInp_ibirthpl2.style.color=txtcolor;
 				txtInp_ibirthpl2.style.fontSize="10px";
 				txtInp_ibirthpl2.style.width="2.4em";
@@ -2030,7 +2030,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_bic.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_52');
 				txtInp_bic.setAttribute('size', '1');
 				txtInp_bic.setAttribute('maxlength', '1');
-				txtInp_bic.setAttribute('value', ''); 
+				txtInp_bic.setAttribute('value', '');
 				txtInp_bic.style.color=txtcolor;
 				txtInp_bic.style.fontSize="10px";
 				txtInp_bic.style.width="1em";
@@ -2040,7 +2040,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_boe.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_53');
 				txtInp_boe.setAttribute('size', '1');
 				txtInp_boe.setAttribute('maxlength', '3');
-				txtInp_boe.setAttribute('value', ''); 
+				txtInp_boe.setAttribute('value', '');
 				txtInp_boe.style.color=txtcolor;
 				txtInp_boe.style.fontSize="10px";
 				txtInp_boe.style.width="2.4em";
@@ -2050,7 +2050,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_fbirthpl2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_54');
 				txtInp_fbirthpl2.setAttribute('size', '1');
 				txtInp_fbirthpl2.setAttribute('maxlength', '3');
-				txtInp_fbirthpl2.setAttribute('value', fbirthpl); 
+				txtInp_fbirthpl2.setAttribute('value', fbirthpl);
 				txtInp_fbirthpl2.style.color=txtcolor;
 				txtInp_fbirthpl2.style.fontSize="10px";
 				txtInp_fbirthpl2.style.width="2.4em";
@@ -2060,7 +2060,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_mbirthpl2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_55');
 				txtInp_mbirthpl2.setAttribute('size', '1');
 				txtInp_mbirthpl2.setAttribute('maxlength', '3');
-				txtInp_mbirthpl2.setAttribute('value', mbirthpl); 
+				txtInp_mbirthpl2.setAttribute('value', mbirthpl);
 				txtInp_mbirthpl2.style.color=txtcolor;
 				txtInp_mbirthpl2.style.fontSize="10px";
 				txtInp_mbirthpl2.style.width="2.4em";
@@ -2070,7 +2070,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_lang.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_56');
 				txtInp_lang.setAttribute('size', '8');
 				txtInp_lang.setAttribute('maxlength', '10');
-				txtInp_lang.setAttribute('value', ''); 
+				txtInp_lang.setAttribute('value', '');
 				txtInp_lang.style.color=txtcolor;
 				txtInp_lang.style.fontSize="10px";
 		// 57. Year of Immigration YOI_2 ---------------------------------------
@@ -2079,7 +2079,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_yoi2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_57');
 				txtInp_yoi2.setAttribute('size', '2');
 				txtInp_yoi2.setAttribute('maxlength', '4');
-				txtInp_yoi2.setAttribute('value', ''); 
+				txtInp_yoi2.setAttribute('value', '');
 				txtInp_yoi2.style.color=txtcolor;
 				txtInp_yoi2.style.fontSize="10px";
 		// 58. Naturalized or Alien N-A_2 --------------------------------------
@@ -2088,7 +2088,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_na2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_58');
 				txtInp_na2.setAttribute('size', '1');
 				txtInp_na2.setAttribute('maxlength', '1');
-				txtInp_na2.setAttribute('value', ''); 
+				txtInp_na2.setAttribute('value', '');
 				txtInp_na2.style.color=txtcolor;
 				txtInp_na2.style.fontSize="10px";
 				txtInp_na2.style.width="1em";
@@ -2098,7 +2098,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_eng2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_59');
 				txtInp_eng2.setAttribute('size', '1');
 				txtInp_eng2.setAttribute('maxlength', '1');
-				txtInp_eng2.setAttribute('value', ''); 
+				txtInp_eng2.setAttribute('value', '');
 				txtInp_eng2.style.color=txtcolor;
 				txtInp_eng2.style.fontSize="10px";
 				txtInp_eng2.style.width="1em";
@@ -2107,7 +2107,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_occu3.setAttribute('type', 'text');
 				txtInp_occu3.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_60');
 				txtInp_occu3.setAttribute('size', '22');
-				txtInp_occu3.setAttribute('value', ''); 
+				txtInp_occu3.setAttribute('value', '');
 				txtInp_occu3.style.color=txtcolor;
 				txtInp_occu3.style.fontSize="10px";
 				txtInp_occu3.style.width="11em";
@@ -2116,7 +2116,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ind2.setAttribute('type', 'text');
 				txtInp_ind2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_61');
 				txtInp_ind2.setAttribute('size', '22');
-				txtInp_ind2.setAttribute('value', ''); 
+				txtInp_ind2.setAttribute('value', '');
 				txtInp_ind2.style.color=txtcolor;
 				txtInp_ind2.style.fontSize="10px";
 		// 62. Employ_2 -------------------------------------------------------
@@ -2124,7 +2124,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_emp2.setAttribute('type', 'text');
 				txtInp_emp2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_62');
 				txtInp_emp2.setAttribute('size', '12');
-				txtInp_emp2.setAttribute('value', ''); 
+				txtInp_emp2.setAttribute('value', '');
 				txtInp_emp2.style.color=txtcolor;
 				txtInp_emp2.style.fontSize="10px";
 				txtInp_emp2.style.width="7em";
@@ -2134,7 +2134,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_emp2.setAttribute('type', 'text');
 				txtInp_emp2.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_63');
 				txtInp_emp2.setAttribute('size', '22');
-				txtInp_emp2.setAttribute('value', ''); 
+				txtInp_emp2.setAttribute('value', '');
 				txtInp_emp2.style.color=txtcolor;
 				txtInp_emp2.style.fontSize="10px";
 		*/
@@ -2144,7 +2144,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_infirm.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_63');
 				txtInp_infirm.setAttribute('size', '3');
 				txtInp_infirm.setAttribute('maxlength', '4');
-				txtInp_infirm.setAttribute('value', ''); 
+				txtInp_infirm.setAttribute('value', '');
 				txtInp_infirm.style.color=txtcolor;
 				txtInp_infirm.style.fontSize="10px";
 				txtInp_infirm.style.width="2.3em";
@@ -2153,7 +2153,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_situ.setAttribute('type', 'text');
 				txtInp_situ.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_64');
 				txtInp_situ.setAttribute('size', '12');
-				txtInp_situ.setAttribute('value', ''); 
+				txtInp_situ.setAttribute('value', '');
 				txtInp_situ.style.color=txtcolor;
 				txtInp_situ.style.fontSize="10px";
 		// 65. Veteran ? ------------------------------------------------------
@@ -2162,7 +2162,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_vet.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_65');
 				txtInp_vet.setAttribute('size', '1');
 				txtInp_vet.setAttribute('maxlength', '1');
-				txtInp_vet.setAttribute('value', ''); 
+				txtInp_vet.setAttribute('value', '');
 				txtInp_vet.style.color=txtcolor;
 				txtInp_vet.style.fontSize="10px";
 				txtInp_vet.style.width="1em";
@@ -2171,7 +2171,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_war.setAttribute('type', 'text');
 				txtInp_war.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_66');
 				txtInp_war.setAttribute('size', '8');
-				txtInp_war.setAttribute('value', ''); 
+				txtInp_war.setAttribute('value', '');
 				txtInp_war.style.color=txtcolor;
 				txtInp_war.style.fontSize="10px";
 		// 67. Infirmaties (Census 1910) - x-x = Blind (both eyes) Y/N - Deaf and dumb Y/N ----
@@ -2180,7 +2180,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_infirm1910.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_67');
 				txtInp_infirm1910.setAttribute('size', '1');
 				txtInp_infirm1910.setAttribute('maxlength', '2');
-				txtInp_infirm1910.setAttribute('value', ''); 
+				txtInp_infirm1910.setAttribute('value', '');
 				txtInp_infirm1910.style.color=txtcolor;
 				txtInp_infirm1910.style.fontSize="10px";
 				txtInp_infirm1910.style.width="1.4em";
@@ -2192,7 +2192,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_DOB.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_68');
 				txtInp_DOB.setAttribute('size', '9');
 				txtInp_DOB.setAttribute('maxlength', '20');
-				txtInp_DOB.setAttribute('value', dob); 
+				txtInp_DOB.setAttribute('value', dob);
 				txtInp_DOB.style.color=txtcolor;
 				txtInp_DOB.style.fontSize="10px";
 				txtInp_DOB.style.width="5.6em";
@@ -2203,7 +2203,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_DOM.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_69');
 				txtInp_DOM.setAttribute('size', '8');
 				txtInp_DOM.setAttribute('maxlength', '20');
-				txtInp_DOM.setAttribute('value', dom); 
+				txtInp_DOM.setAttribute('value', dom);
 				txtInp_DOM.style.color=txtcolor;
 				txtInp_DOM.style.fontSize="10px";
 				txtInp_DOM.style.width="1.4em";
@@ -2214,7 +2214,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_FullName.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_70');
 				txtInp_FullName.setAttribute('size', '8');
 				txtInp_FullName.setAttribute('maxlength', '40');
-				txtInp_FullName.setAttribute('value', nam); 
+				txtInp_FullName.setAttribute('value', nam);
 				txtInp_FullName.style.color=txtcolor;
 				txtInp_FullName.style.fontSize="10px";
 				txtInp_FullName.style.width="5.4em";
@@ -2225,7 +2225,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_MarrName.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_71');
 				txtInp_MarrName.setAttribute('size', '8');
 				txtInp_MarrName.setAttribute('maxlength', '40');
-				txtInp_MarrName.setAttribute('value', mnam); 
+				txtInp_MarrName.setAttribute('value', mnam);
 				txtInp_MarrName.style.color=txtcolor;
 				txtInp_MarrName.style.fontSize="10px";
 				txtInp_MarrName.style.width="1.4em";
@@ -2236,7 +2236,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_DOD.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_72');
 				txtInp_DOD.setAttribute('size', '8');
 				txtInp_DOD.setAttribute('maxlength', '20');
-				txtInp_DOD.setAttribute('value', dod); 
+				txtInp_DOD.setAttribute('value', dod);
 				txtInp_DOD.style.color=txtcolor;
 				txtInp_DOD.style.fontSize="10px";
 				txtInp_DOD.style.width="1.4em";
@@ -2247,7 +2247,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 				txtInp_ChBLD.setAttribute('id', INPUT_NAME_PREFIX + iteration + '_73');
 				txtInp_ChBLD.setAttribute('size', '8');
 				txtInp_ChBLD.setAttribute('maxlength', '20');
-				txtInp_ChBLD.setAttribute('value', chilBLD); 
+				txtInp_ChBLD.setAttribute('value', chilBLD);
 				txtInp_ChBLD.style.color=txtcolor;
 				txtInp_ChBLD.style.fontSize="10px";
 				txtInp_ChBLD.style.width="1.4em";
@@ -2295,7 +2295,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		cell_[7].appendChild(txtInp_age); // Age_1
 		cell_[8].appendChild(txtInp_race); // Race_1
 		cell_[9].appendChild(txtInp_gend); // Sex
-		
+
 		cell_[10].appendChild(txtInp_race2); // Race_2
 		cell_[11].appendChild(txtInp_yob); // DOB/YOB
 		cell_[12].appendChild(txtInp_age2); // Age_2
@@ -2306,7 +2306,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		cell_[17].appendChild(txtInp_chilB); // Children Born Alive
 		cell_[18].appendChild(txtInp_chilL); // Children Still Living
 		cell_[19].appendChild(txtInp_chilD); // Children who have Died
-		
+
 		cell_[20].appendChild(txtInp_ageM); // Age st first marriage
 		cell_[21].appendChild(txtInp_occu); // Occupation_1
 		cell_[22].appendChild(txtInp_assets2); // Assets_2
@@ -2317,7 +2317,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		cell_[27].appendChild(txtInp_ibirthpl); // Indis POB_1
 		cell_[28].appendChild(txtInp_fbirthpl); // Father FPOB_1
 		cell_[29].appendChild(txtInp_mbirthpl); // Mother MPOB_1
-		
+
 		cell_[30].appendChild(txtInp_yrsUS); // Years in USA
 		cell_[31].appendChild(txtInp_yoi1); // Year of Immigration YOI_1
 		cell_[32].appendChild(txtInp_na1); // Naturalized or Alien N-A_1
@@ -2328,18 +2328,18 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		cell_[37].appendChild(txtInp_ind1); // Industry ind_1
 		cell_[38].appendChild(txtInp_emp1); // Employ_1
 		cell_[39].appendChild(txtInp_emR); // Employer EmR
-		
+
 		cell_[40].appendChild(txtInp_emD); // Employed EmD
-		cell_[41].appendChild(txtInp_mnsE); // Months employed during Census Year 
+		cell_[41].appendChild(txtInp_mnsE); // Months employed during Census Year
 		cell_[42].appendChild(txtInp_emH); // Working At Home WH
 		cell_[43].appendChild(txtInp_emN); // Not Employed EmN
-		cell_[44].appendChild(txtInp_wksU); // Weeks unemployed during Census Year 
-		cell_[45].appendChild(txtInp_mnsU); // Months unemployed during Census Year 
+		cell_[44].appendChild(txtInp_wksU); // Weeks unemployed during Census Year
+		cell_[45].appendChild(txtInp_mnsU); // Months unemployed during Census Year
 		cell_[46].appendChild(txtInp_educ); // Education 3 parameters Sch-Read-Write  -xx
 		cell_[47].appendChild(txtInp_educpre1890); // Education (pre 1890 Census) - 3 parameters = Sch, Cannot Read, Cannot Write  -xx
 		cell_[48].appendChild(txtInp_eng1); // English spoken Y/N  eng_1
 		cell_[49].appendChild(txtInp_home); // Home Ownership x-x-x-xxxx = Owned/Rented - Free/Morgaged - Farm/House - Farm Sched #
-		
+
 		cell_[50].appendChild(txtInp_birthpl2); // Birth Place_2
 		cell_[51].appendChild(txtInp_ibirthpl2); // Indis POB_2
 		cell_[52].appendChild(txtInp_bic); // Born in County (UK)
@@ -2350,7 +2350,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		cell_[57].appendChild(txtInp_yoi2); // Year of Immigration YOI_2
 		cell_[58].appendChild(txtInp_na2); // Naturalized or Alien N-A_2
 		cell_[59].appendChild(txtInp_eng2); // English spoken Y/N  eng_2
-		
+
 		cell_[60].appendChild(txtInp_occu3); // Occupation_3
 		cell_[61].appendChild(txtInp_ind2); // Industry ind_2
 		cell_[62].appendChild(txtInp_emp2); // Employ_2
@@ -2358,7 +2358,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		cell_[63].appendChild(txtInp_infirm); // Infirmaties - up to 5 parameters x--xx etc
 		cell_[64].appendChild(txtInp_situ); // Health Situation 1890 - Disease, Infimaties, Convict, Pauper etc
 		cell_[65].appendChild(txtInp_vet); // Veteran ?
-		cell_[66].appendChild(txtInp_war); // War or expedition 
+		cell_[66].appendChild(txtInp_war); // War or expedition
 		cell_[67].appendChild(txtInp_infirm1910); // Infirmaties - xx = Blind (both eyes) Y/N/-, Deaf and Dumb Y/N/-
 
 		// Hidden Cells =======================================================
@@ -2368,7 +2368,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 		cell_[70].appendChild(txtInp_FullName); // Full Name
 		cell_[71].appendChild(txtInp_MarrName); // Married Name
 		cell_[72].appendChild(txtInp_DOD); // Date of Death
-		cell_[73].appendChild(txtInp_ChBLD); // Text Array - Children Born/Living/Died 
+		cell_[73].appendChild(txtInp_ChBLD); // Text Array - Children Born/Living/Died
 		}
 
 		// Extra Cells ========================================================
@@ -2384,13 +2384,13 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d
 
 		// **F** Pass in the elements to be referenced later ==================
 		// Store the myRow object in each row
-		row.myRow = new myRowObject( txt_itemNo, txtInp_pid, txtInp_nam, txtInp_label, txtInp_cond, txtInp_tenure, txtInp_assets, txtInp_age, txtInp_race, txtInp_gend, 
-										txtInp_race2, txtInp_yob, txtInp_age2, txtInp_bmth, txtInp_label2, txtInp_cond2, txtInp_yrsm, txtInp_chilB, txtInp_chilL, txtInp_chilD, 
-										txtInp_ageM, txtInp_occu, txtInp_assets2, txtInp_birthpl, txtInp_parent, txtInp_bmth2, txtInp_mmth, txtInp_ibirthpl, txtInp_fbirthpl, txtInp_mbirthpl, 
-										txtInp_yrsUS, txtInp_yoi1, txtInp_na1, txtInp_yon, txtInp_englang, txtInp_occu2, txtInp_health, txtInp_ind1, txtInp_emp1, txtInp_emR, 
-										txtInp_emD, txtInp_mnsE, txtInp_emH, txtInp_emN, txtInp_wksU, txtInp_mnsU, txtInp_educ, txtInp_educpre1890, txtInp_eng1, txtInp_home,  
-										txtInp_birthpl2, txtInp_ibirthpl2, txtInp_bic, txtInp_boe, txtInp_fbirthpl2, txtInp_mbirthpl2, txtInp_lang, txtInp_yoi2, txtInp_na2, txtInp_eng2, 
-										txtInp_occu3, txtInp_ind2, txtInp_emp2, txtInp_infirm, txtInp_situ, txtInp_vet, txtInp_war, txtInp_infirm1910, txtInp_DOB, txtInp_DOM, 
+		row.myRow = new myRowObject( txt_itemNo, txtInp_pid, txtInp_nam, txtInp_label, txtInp_cond, txtInp_tenure, txtInp_assets, txtInp_age, txtInp_race, txtInp_gend,
+										txtInp_race2, txtInp_yob, txtInp_age2, txtInp_bmth, txtInp_label2, txtInp_cond2, txtInp_yrsm, txtInp_chilB, txtInp_chilL, txtInp_chilD,
+										txtInp_ageM, txtInp_occu, txtInp_assets2, txtInp_birthpl, txtInp_parent, txtInp_bmth2, txtInp_mmth, txtInp_ibirthpl, txtInp_fbirthpl, txtInp_mbirthpl,
+										txtInp_yrsUS, txtInp_yoi1, txtInp_na1, txtInp_yon, txtInp_englang, txtInp_occu2, txtInp_health, txtInp_ind1, txtInp_emp1, txtInp_emR,
+										txtInp_emD, txtInp_mnsE, txtInp_emH, txtInp_emN, txtInp_wksU, txtInp_mnsU, txtInp_educ, txtInp_educpre1890, txtInp_eng1, txtInp_home,
+										txtInp_birthpl2, txtInp_ibirthpl2, txtInp_bic, txtInp_boe, txtInp_fbirthpl2, txtInp_mbirthpl2, txtInp_lang, txtInp_yoi2, txtInp_na2, txtInp_eng2,
+										txtInp_occu3, txtInp_ind2, txtInp_emp2, txtInp_infirm, txtInp_situ, txtInp_vet, txtInp_war, txtInp_infirm1910, txtInp_DOB, txtInp_DOM,
 										txtInp_FullName, txtInp_MarrName, txtInp_DOD, txtInp_ChBLD,
 										cbEl, raEl, txt_itemNo2
 									);
@@ -2437,7 +2437,7 @@ function reorderRows(tbl, startingIndex) {
 			for (var i=startingIndex; i<tbl.tBodies[0].rows.length; i++) {
 				// CONFIG: next line is affected by myRowObject settings
 				tbl.tBodies[0].rows[i].myRow.zero.data = count; // text - (left column item number)
-				
+
 				// ------------------------------------------------------------
 				tbl.tBodies[0].rows[i].myRow.one.id = INPUT_NAME_PREFIX + count + '_1';  // input text
 				tbl.tBodies[0].rows[i].myRow.two.id  = INPUT_NAME_PREFIX + count + '_2';  // input text
@@ -2448,7 +2448,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.seven.id = INPUT_NAME_PREFIX + count + '_7';  // input text
 				tbl.tBodies[0].rows[i].myRow.eight.id = INPUT_NAME_PREFIX + count + '_8';  // input text
 				tbl.tBodies[0].rows[i].myRow.nine.id = INPUT_NAME_PREFIX + count + '_9';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.ten.id = INPUT_NAME_PREFIX + count + '_10'; // input text
 				tbl.tBodies[0].rows[i].myRow.eleven.id = INPUT_NAME_PREFIX + count + '_11'; // input text
 				tbl.tBodies[0].rows[i].myRow.twelve.id = INPUT_NAME_PREFIX + count + '_12'; // input text
@@ -2459,7 +2459,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.seventeen.id = INPUT_NAME_PREFIX + count + '_17';  // input text
 				tbl.tBodies[0].rows[i].myRow.eighteen.id = INPUT_NAME_PREFIX + count + '_18';  // input text
 				tbl.tBodies[0].rows[i].myRow.nineteen.id = INPUT_NAME_PREFIX + count + '_19';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.twenty.id = INPUT_NAME_PREFIX + count + '_20'; // input text
 				tbl.tBodies[0].rows[i].myRow.twentyone.id = INPUT_NAME_PREFIX + count + '_21';  // input text
 				tbl.tBodies[0].rows[i].myRow.twentytwo.id  = INPUT_NAME_PREFIX + count + '_22';  // input text
@@ -2470,7 +2470,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.twentyseven.id = INPUT_NAME_PREFIX + count + '_27';  // input text
 				tbl.tBodies[0].rows[i].myRow.twentyeight.id = INPUT_NAME_PREFIX + count + '_28';  // input text
 				tbl.tBodies[0].rows[i].myRow.twentynine.id = INPUT_NAME_PREFIX + count + '_29';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.thirty.id = INPUT_NAME_PREFIX + count + '_30'; // input text
 				tbl.tBodies[0].rows[i].myRow.thirtyone.id = INPUT_NAME_PREFIX + count + '_31';  // input text
 				tbl.tBodies[0].rows[i].myRow.thirtytwo.id = INPUT_NAME_PREFIX + count + '_32';  // input text
@@ -2481,7 +2481,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.thirtyseven.id = INPUT_NAME_PREFIX + count + '_37';  // input text
 				tbl.tBodies[0].rows[i].myRow.thirtyeight.id = INPUT_NAME_PREFIX + count + '_38';  // input text
 				tbl.tBodies[0].rows[i].myRow.thirtynine.id = INPUT_NAME_PREFIX + count + '_39';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.forty.id = INPUT_NAME_PREFIX + count + '_40'; // input text
 				tbl.tBodies[0].rows[i].myRow.fortyone.id = INPUT_NAME_PREFIX + count + '_41';  // input text
 				tbl.tBodies[0].rows[i].myRow.fortytwo.id = INPUT_NAME_PREFIX + count + '_42';  // input text
@@ -2492,7 +2492,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.fortyseven.id = INPUT_NAME_PREFIX + count + '_47';  // input text
 				tbl.tBodies[0].rows[i].myRow.fortyeight.id = INPUT_NAME_PREFIX + count + '_48';  // input text
 				tbl.tBodies[0].rows[i].myRow.fortynine.id = INPUT_NAME_PREFIX + count + '_49';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.fifty.id = INPUT_NAME_PREFIX + count + '_50';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftyone.id = INPUT_NAME_PREFIX + count + '_51';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftytwo.id = INPUT_NAME_PREFIX + count + '_52';  // input text
@@ -2503,7 +2503,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.fiftyseven.id = INPUT_NAME_PREFIX + count + '_57';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftyeight.id = INPUT_NAME_PREFIX + count + '_58';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftynine.id = INPUT_NAME_PREFIX + count + '_59';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.sixty.id = INPUT_NAME_PREFIX + count + '_60';  // input text
 				tbl.tBodies[0].rows[i].myRow.sixtyone.id = INPUT_NAME_PREFIX + count + '_61';  // input text
 				tbl.tBodies[0].rows[i].myRow.sixtytwo.id = INPUT_NAME_PREFIX + count + '_62';  // input text
@@ -2519,7 +2519,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.seventytwo.id = INPUT_NAME_PREFIX + count + '_72';  // input text
 				tbl.tBodies[0].rows[i].myRow.seventythree.id = INPUT_NAME_PREFIX + count + '_73';  // input text
 				// ------------------------------------------------------------
-				
+
 				// ------------------------------------------------------------
 				tbl.tBodies[0].rows[i].myRow.one.name = INPUT_NAME_PREFIX + count + '_1';  // input text
 				tbl.tBodies[0].rows[i].myRow.two.name  = INPUT_NAME_PREFIX + count + '_2';  // input text
@@ -2530,7 +2530,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.seven.name = INPUT_NAME_PREFIX + count + '_7';  // input text
 				tbl.tBodies[0].rows[i].myRow.eight.name = INPUT_NAME_PREFIX + count + '_8';  // input text
 				tbl.tBodies[0].rows[i].myRow.nine.name = INPUT_NAME_PREFIX + count + '_9';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.ten.name = INPUT_NAME_PREFIX + count + '_10'; // input text
 				tbl.tBodies[0].rows[i].myRow.eleven.name = INPUT_NAME_PREFIX + count + '_11'; // input text
 				tbl.tBodies[0].rows[i].myRow.twelve.name = INPUT_NAME_PREFIX + count + '_12'; // input text
@@ -2541,7 +2541,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.seventeen.name = INPUT_NAME_PREFIX + count + '_17';  // input text
 				tbl.tBodies[0].rows[i].myRow.eighteen.name = INPUT_NAME_PREFIX + count + '_18';  // input text
 				tbl.tBodies[0].rows[i].myRow.nineteen.name = INPUT_NAME_PREFIX + count + '_19';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.twenty.name = INPUT_NAME_PREFIX + count + '_20'; // input text
 				tbl.tBodies[0].rows[i].myRow.twentyone.name = INPUT_NAME_PREFIX + count + '_21';  // input text
 				tbl.tBodies[0].rows[i].myRow.twentytwo.name = INPUT_NAME_PREFIX + count + '_22';  // input text
@@ -2552,7 +2552,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.twentyseven.name = INPUT_NAME_PREFIX + count + '_27';  // input text
 				tbl.tBodies[0].rows[i].myRow.twentyeight.name = INPUT_NAME_PREFIX + count + '_28';  // input text
 				tbl.tBodies[0].rows[i].myRow.twentynine.name = INPUT_NAME_PREFIX + count + '_29';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.thirty.name = INPUT_NAME_PREFIX + count + '_30'; // input text
 				tbl.tBodies[0].rows[i].myRow.thirtyone.name = INPUT_NAME_PREFIX + count + '_31';  // input text
 				tbl.tBodies[0].rows[i].myRow.thirtytwo.name  = INPUT_NAME_PREFIX + count + '_32';  // input text
@@ -2563,7 +2563,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.thirtyseven.name = INPUT_NAME_PREFIX + count + '_37';  // input text
 				tbl.tBodies[0].rows[i].myRow.thirtyeight.name = INPUT_NAME_PREFIX + count + '_38';  // input text
 				tbl.tBodies[0].rows[i].myRow.thirtynine.name = INPUT_NAME_PREFIX + count + '_39';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.forty.name = INPUT_NAME_PREFIX + count + '_40'; // input text
 				tbl.tBodies[0].rows[i].myRow.fortyone.name = INPUT_NAME_PREFIX + count + '_41';  // input text
 				tbl.tBodies[0].rows[i].myRow.fortytwo.name  = INPUT_NAME_PREFIX + count + '_42';  // input text
@@ -2574,7 +2574,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.fortyseven.name = INPUT_NAME_PREFIX + count + '_47';  // input text
 				tbl.tBodies[0].rows[i].myRow.fortyeight.name = INPUT_NAME_PREFIX + count + '_48';  // input text
 				tbl.tBodies[0].rows[i].myRow.fortynine.name = INPUT_NAME_PREFIX + count + '_49';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.fifty.name = INPUT_NAME_PREFIX + count + '_50';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftyone.name = INPUT_NAME_PREFIX + count + '_51';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftytwo.name = INPUT_NAME_PREFIX + count + '_52';  // input text
@@ -2585,7 +2585,7 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.fiftyseven.name = INPUT_NAME_PREFIX + count + '_57';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftyeight.name = INPUT_NAME_PREFIX + count + '_58';  // input text
 				tbl.tBodies[0].rows[i].myRow.fiftynine.name = INPUT_NAME_PREFIX + count + '_59';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.sixty.name = INPUT_NAME_PREFIX + count + '_60';  // input text
 				tbl.tBodies[0].rows[i].myRow.sixtyone.name = INPUT_NAME_PREFIX + count + '_61';  // input text
 				tbl.tBodies[0].rows[i].myRow.sixtytwo.name = INPUT_NAME_PREFIX + count + '_62';  // input text
@@ -2596,12 +2596,12 @@ function reorderRows(tbl, startingIndex) {
 				tbl.tBodies[0].rows[i].myRow.sixtyseven.name = INPUT_NAME_PREFIX + count + '_67';  // input text
 				tbl.tBodies[0].rows[i].myRow.sixtyeight.name = INPUT_NAME_PREFIX + count + '_68';  // input text
 				tbl.tBodies[0].rows[i].myRow.sixtynine.name = INPUT_NAME_PREFIX + count + '_69';  // input text
-				
+
 				tbl.tBodies[0].rows[i].myRow.seventy.name = INPUT_NAME_PREFIX + count + '_70';  // input text
 				tbl.tBodies[0].rows[i].myRow.seventyone.name = INPUT_NAME_PREFIX + count + '_71';  // input text
 				tbl.tBodies[0].rows[i].myRow.seventytwo.name = INPUT_NAME_PREFIX + count + '_72';  // input text
 				tbl.tBodies[0].rows[i].myRow.seventythree.name = INPUT_NAME_PREFIX + count + '_73';  // input text
-				
+
 				// ------------------------------------------------------------
 				tbl.tBodies[0].rows[i].myRow.ra.value = count; // input radio
 				count++;
diff --git a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 9f0f63a1b6..2999b282f3 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -76,7 +76,7 @@ if ($action == "choose" && $paramok) {
 	<!--
 	// Javascript variables
 	var id_empty = "<?php echo i18n::translate('When adding a Link, the ID field cannot be empty.'); ?>";
-	
+
 	var pastefield;
 	var language_filter, magnify;
 	language_filter = "";
@@ -96,7 +96,7 @@ if ($action == "choose" && $paramok) {
 		language_filter = lang;
 		magnify = mag;
 	}
-	
+
 	function blankwin() {
 		if (document.getElementById('gid').value == "" || document.getElementById('gid').value.length<=1) {
 			alert(id_empty);
@@ -106,7 +106,7 @@ if ($action == "choose" && $paramok) {
 			var winblank = window.open('modules/GEDFact_assistant/_MEDIA/media_query_3a.php?iid='+iid, 'winblank', 'top=100, left=200, width=400, height=20, toolbar=0, directories=0, location=0, status=0, menubar=0, resizable=1, scrollbars=1');
 		}
 	}
-	
+
 	var GEDFact_assist = "installed";
 //-->
 	</script>
@@ -160,9 +160,9 @@ if ($action == "choose" && $paramok) {
 		require 'modules/GEDFact_assistant/_MEDIA/media_query_1a.php';
 		echo '</td></tr>';
 	}
-	
+
 	if (!isset($linktoid)) { $linktoid = ""; }
-	
+
 	echo '<tr><td class="descriptionbox wrap">';
 	echo i18n::translate('Add links');
 	echo '<td class="optionbox wrap ">';
@@ -180,7 +180,7 @@ if ($action == "choose" && $paramok) {
 		// echo ' Enter Name or ID &nbsp; &nbsp; &nbsp; <b>OR</b> &nbsp; &nbsp; &nbsp;Search for ID ';
 	echo '</td><td style=" padding-bottom:2px; vertical-align:middle">';
 		echo '&nbsp;';
-		if (isset($WT_IMAGES["add"])) { 
+		if (isset($WT_IMAGES["add"])) {
 			echo '<a href="#"><img style="border-style:none;" src="', $WT_IMAGES["add"], '" alt="', i18n::translate('Add'), ' "title="', i18n::translate('Add'), '" align="middle" name="addLink" value="" onClick="javascript:blankwin(); return false;" />';
 			} else {
 			echo '<button name="addLink" value="" type="button" onClick="javascript:blankwin(); return false;">', i18n::translate('Add'), '</button>';
@@ -194,7 +194,7 @@ if ($action == "choose" && $paramok) {
 	echo '</td></tr></table>';
 	print "<sub>" . i18n::translate('Enter or search for the ID of the person, family, or source to which this media item should be linked.') . "</sub>";
 
-	
+
 	echo '<br /><br />';
 	echo '<input type="hidden" name="idName" id="idName" size="36" value="Name of ID" />';
 	require 'modules/GEDFact_assistant/_MEDIA/media_query_2a.php';
@@ -224,11 +224,11 @@ if ($action == "choose" && $paramok) {
 	echo '</form>';
 	echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close(); ">', i18n::translate('Close Window'), '</a><br /></center>';
 	// print_simple_footer();
-	
+
 } elseif ($action == "update" && $paramok) {
 
 	echo "<b>", $mediaid, "</b><br/><br />";
-	
+
 	// Unlink records indicated by radio button =========
 	if (isset($exist_links) && $exist_links!="No_Values") {
 		$exist_links = substr($exist_links, 0, -1);
@@ -248,7 +248,7 @@ if ($action == "choose" && $paramok) {
 	}else{
 		// echo nothing and do nothing
 	}
-	
+
 	// Add new Links ====================================
 	if (isset($more_links) && $more_links!="No_Values" && $more_links!=",") {
 		$more_links = substr($more_links, 0, -1);
@@ -271,15 +271,15 @@ if ($action == "choose" && $paramok) {
 		//echo $mediaid, $pgv_lang["media_now_linked to"], '(', $gid, ')<br />';
 		//linkMedia($mediaid, $gid);
 	}
-	
+
 	if ($update_CHAN=='no_change') {
 		echo i18n::translate('No CHAN (Last Change) records were updated');
 		echo '<br />';
 	}
-	
+
 	echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close(); ">', i18n::translate('Close Window'), '</a><br /></center>';
 	print_simple_footer();
-		
+
 } else {
 	// echo '<center>You must be logged in as an Administrator<center>';
 	echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close();">', i18n::translate('Close Window'), '</a><br /></center>';
diff --git a/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php b/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php
index 8a19f85d98..fa41ea5e81 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php
@@ -28,14 +28,14 @@
  * @subpackage Census Assistant
  * @version $Id$
  */
- 
+
  if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
 global $summary, $theme_name, $TEXT_DIRECTION, $censyear, $censdate;
- 
+
 $pid = safe_get('pid');
 
 // echo $pid;
@@ -77,7 +77,7 @@ if ($pid=="") {
 	//echo i18n::translate('Add Family, and Search links');
 	//echo '</td>';
 	echo '<td valign="top" width=400>';
-	//-- Search  and Add Family Members Area ========================================= 
+	//-- Search  and Add Family Members Area =========================================
 		include('modules/GEDFact_assistant/_MEDIA/media_3_search_add.php');
 	echo '</td>';
 	echo '</tr>';
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_find.php b/modules/GEDFact_assistant/_MEDIA/media_3_find.php
index 7bb6b7f5bc..3ab19d6176 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_find.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_find.php
@@ -30,7 +30,7 @@
  * @subpackage Display
  * @version $Id$
  */
- 
+
 define('WT_SCRIPT_NAME', 'modules/GEDFact_assistant/_MEDIA/media_3_find.php');
 require '../../../includes/session.php';
 require WT_ROOT.'includes/functions/functions_print_lists.php';
@@ -442,21 +442,21 @@ if ($action=="filter") {
 				//echo $indi->format_list('li', true);
 				$nam = htmlspecialchars($indi->getFullName());
 				echo "<li><a href=\"javascript:;\" onclick=\"pasterow(
-					'".$indi->getXref()."' , 
+					'".$indi->getXref()."' ,
 					'".$nam."' ,
 					'".$indi->getSex()."' ,
 					'".$indi->getbirthyear()."' ,
 					'".(1901-$indi->getbirthyear())."' ,
 					'".$indi->getbirthplace()."'); return false;\">
 					<b>".$indi->getFullName()."</b>&nbsp;&nbsp;&nbsp;";
-					
+
 					if ($ABBREVIATE_CHART_LABELS) {
 						$born=abbreviate_fact('BIRT');
 					} else {
 						$born=translate_fact('BIRT');
 					}
 
-				
+
 				echo "</span><br><span class=\"list_item\">", $born, " ", $indi->getbirthyear(), "&nbsp;&nbsp;&nbsp;", $indi->getbirthplace(), "</span></a></li>";
 
 			echo "<hr />";
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
index de774724ea..7decd141cf 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
@@ -50,7 +50,7 @@ if (!defined('WT_WEBTREES')) {
 				function findindi(persid) {
 					var findInput = document.getElementById('personid');
 					txt = findInput.value;
-					if (txt=="") { 
+					if (txt=="") {
 							alert(enter_name);
 					}else{
 						var win02 = window.open(
@@ -78,7 +78,7 @@ if (!defined('WT_WEBTREES')) {
 
 	<?php
 	//-- Add Family Members to Census  -------------------------------------------
-	global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION, $GEDCOM, $censyear, $censdate; 
+	global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION, $GEDCOM, $censyear, $censdate;
 	// echo "CENS = " . $censyear;
 	?>
 	<tr>
@@ -108,7 +108,7 @@ if (!defined('WT_WEBTREES')) {
 				<br />
 			</td>
 		</tr>
-				
+
 		<?php
 		//-- Build Parent Family ---------------------------------------------------
 		$personcount=0;
@@ -117,7 +117,7 @@ if (!defined('WT_WEBTREES')) {
 			$label = $this->indi->getChildFamilyLabel($family);
 			$people = $this->buildFamilyList($family, "parents");
 			$marrdate = $family->getMarriageDate();
-			
+
 			// Husband -------------------
 			$styleadd = "";
 			if (isset($people["husb"])) {
@@ -136,7 +136,7 @@ if (!defined('WT_WEBTREES')) {
 				$slabel .= $parentlinks;
 				$submenu = new Menu($slabel);
 				$menu->addSubMenu($submenu);
-				
+
 
 				echo '<tr>';
 					// Define width of Left (Label) column -------
@@ -148,7 +148,7 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 					<td align="left" class="facts_value" >
 						<font size=1>
-							<?php 
+							<?php
 							print "<a href=\"".encode_url("edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom={$GEDCOM}")."\">";
 							echo $headImg2;
 							print "</a>";
@@ -162,7 +162,7 @@ if (!defined('WT_WEBTREES')) {
 						?>
 						<a href='javaScript:opener.insertRowToTable("<?php
 								print PrintReady($people["husb"]->getXref()) ; // pid = PID
-							?>", "<?php 
+							?>", "<?php
 							// print PrintReady($people["husb"]->getFullName()); // nam = Name
 								echo PrintReady($fulln);
 							?>", "<?php
@@ -184,11 +184,11 @@ if (!defined('WT_WEBTREES')) {
 							?>", "<?php
 								print ""; // occu = Occupation
 							?>", "<?php
-								print PrintReady($people["husb"]->getcensbirthplace()); //  birthpl = Census Place of Birth 
+								print PrintReady($people["husb"]->getcensbirthplace()); //  birthpl = Census Place of Birth
 							?>");'><?php
-								 print PrintReady($people["husb"]->getFullName()); // Name 
-							?> 
-						</a> 
+								 print PrintReady($people["husb"]->getFullName()); // Name
+							?>
+						</a>
 						<?php print "\n" ;
 						}else{
 							print i18n::translate('Private');
@@ -199,7 +199,7 @@ if (!defined('WT_WEBTREES')) {
 				</tr>
 				<?php
 			}
-			
+
 			if (isset($people["wife"])) {
 				$married   = GedcomDate::Compare($censdate, $marrdate);
 				$nam = $people["wife"]->getAllNames();
@@ -213,7 +213,7 @@ if (!defined('WT_WEBTREES')) {
 					$fulmn = $fulln;
 					$marn  = $surn;
 				}
-				
+
 				$menu = new Menu("&nbsp;" . $people["wife"]->getLabel() . "&nbsp;". "\n");
 				//$menu->addClass("", "", "submenu");
 				$slabel  = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $currpid, $censyear);
@@ -229,7 +229,7 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 					<td align="left" class="facts_value">
 						<font size=1>
-							<?php 
+							<?php
 							print "<a href=\"".encode_url("edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom={$GEDCOM}")."\">";
 							echo $headImg2;
 							print "</a>";
@@ -243,7 +243,7 @@ if (!defined('WT_WEBTREES')) {
 							?>
 						<a href='javaScript:opener.insertRowToTable("<?php
 								print $people["wife"]->getXref() ; // pid = PID
-							?>", "<?php 
+							?>", "<?php
 							// if ($married>=0 && isset($nam[1])){
 							// echo PrintReady($fulmn); // nam = Married Name
 							// }else{
@@ -269,16 +269,16 @@ if (!defined('WT_WEBTREES')) {
 							?>", "<?php
 								print ""; // occu = Occupation
 							?>", "<?php
-								print PrintReady($people["wife"]->getcensbirthplace()); //  birthpl = Census Place of Birth 
+								print PrintReady($people["wife"]->getcensbirthplace()); //  birthpl = Census Place of Birth
 							?>");'>
-							<?php 
+							<?php
 							//if ($married>=0 && isset($nam[1])){
 							// print PrintReady($fulmn); // Full Married Name
 							//} else {
 								print PrintReady($people["wife"]->getFullName()); // Full Name
 							//}
 							?>
-						</a> 
+						</a>
 						<?php print "\n" ;
 						}else{
 							print i18n::translate('Private');
@@ -289,7 +289,7 @@ if (!defined('WT_WEBTREES')) {
 				</tr>
 				<?php
 			}
-			
+
 			if (isset($people["children"])) {
 				$elderdate = $family->getMarriageDate();
 				foreach($people["children"] as $key=>$child) {
@@ -307,14 +307,14 @@ if (!defined('WT_WEBTREES')) {
 						$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 						$marn  = $nam[1]['surname'];
 					}
-					
+
 					$menu = new Menu("&nbsp;" . $child->getLabel() . "&nbsp;". "\n");
 					//$menu->addClass("", "", "submenu");
 					$slabel  = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $currpid, $censyear);
 					$slabel .= $spouselinks;
 					$submenu = new Menu($slabel);
 					$menu->addSubMenu($submenu);
-					
+
 					if ($child->getXref()==$pid) {
 						//Only print Head of Family in Immediate Family Block
 					} else {
@@ -322,7 +322,7 @@ if (!defined('WT_WEBTREES')) {
 						<tr>
 							<td width=75 align="left" class="optionbox">
 								<font size=1>
-								<?php 
+								<?php
 								if ($child->getXref()==$pid) {
 									echo $child->getLabel();
 								} else {
@@ -333,7 +333,7 @@ if (!defined('WT_WEBTREES')) {
 							</td>
 							<td align="left" class="facts_value">
 								<font size=1>
-									<?php 
+									<?php
 									print "<a href=\"".encode_url("edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$child->getXref()."&gedcom={$GEDCOM}")."\">";
 									echo $headImg2;
 									print "</a>";
@@ -345,9 +345,9 @@ if (!defined('WT_WEBTREES')) {
 								<?php
 								if ( ($child->canDisplayDetails()) ) {
 									?>
-									<a href='javaScript:opener.insertRowToTable("<?php 
+									<a href='javaScript:opener.insertRowToTable("<?php
 											print $child->getXref() ; // pid = PID
-										?>", "<?php 
+										?>", "<?php
 										//if ($married>=0 && isset($nam[1])){
 										// echo PrintReady($fulmn); // nam = Married Name
 										//}else{
@@ -379,7 +379,7 @@ if (!defined('WT_WEBTREES')) {
 										?>", "<?php
 											print ""; // occu = Occupation
 										?>", "<?php
-											print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth 
+											print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth
 										?>");'><?php
 										// if ($married>=0 && isset($nam[1])){
 										// print PrintReady($fulmn); // Full Married Name
@@ -402,7 +402,7 @@ if (!defined('WT_WEBTREES')) {
 				$elderdate = $child->getBirthDate(false);
 			}
 		}
-		
+
 		//-- Build step families ----------------------------------------------------------------
 		foreach($this->indi->getStepFamilies() as $famid=>$family) {
 			$label = $this->indi->getStepFamilyLabel($family);
@@ -411,7 +411,7 @@ if (!defined('WT_WEBTREES')) {
 				echo "<tr><td><br /></td><td></td></tr>";
 			}
 			$marrdate = $family->getMarriageDate();
-			
+
 			// Husband -----------------------------
 			$styleadd = "";
 			$elderdate = "";
@@ -447,7 +447,7 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 					<td align="left" class="facts_value">
 						<font size=1>
-							<?php 
+							<?php
 							print "<a href=\"".encode_url("edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom={$GEDCOM}")."\">";
 							echo $headImg2;
 							print "</a>";
@@ -461,7 +461,7 @@ if (!defined('WT_WEBTREES')) {
 							?>
 							<a href='javaScript:opener.insertRowToTable("<?php
 								print PrintReady($people["husb"]->getXref()) ; // pid = PID
-							?>", "<?php 
+							?>", "<?php
 								//print PrintReady($people["husb"]->getFullName()); // nam = Name
 								echo PrintReady($fulln);
 							?>", "<?php
@@ -487,11 +487,11 @@ if (!defined('WT_WEBTREES')) {
 							?>", "<?php
 								print ""; // occu = Occupation
 							?>", "<?php
-								print PrintReady($people["husb"]->getcensbirthplace()); //  birthpl = Census Place of Birth 
+								print PrintReady($people["husb"]->getcensbirthplace()); //  birthpl = Census Place of Birth
 							?>");'>
-							<?php print PrintReady($people["husb"]->getFullName()); // Name 
-							?> 
-							</a> 
+							<?php print PrintReady($people["husb"]->getFullName()); // Name
+							?>
+							</a>
 							<?php print "\n" ;
 						}else{
 							print i18n::translate('Private');
@@ -503,7 +503,7 @@ if (!defined('WT_WEBTREES')) {
 				<?php
 				$elderdate = $people["husb"]->getBirthDate(false);
 			}
-			
+
 			// Wife -------------------
 			$styleadd = "";
 			if (isset($people["wife"]) ) {
@@ -538,7 +538,7 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 					<td align="left" class="facts_value">
 						<font size=1>
-							<?php 
+							<?php
 							print "<a href=\"".encode_url("edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom={$GEDCOM}")."\">";
 							echo $headImg2;
 							print "</a>";
@@ -552,7 +552,7 @@ if (!defined('WT_WEBTREES')) {
 						?>
 						<a href='javaScript:opener.insertRowToTable("<?php
 								print PrintReady($people["wife"]->getXref()) ; // pid = PID
-							?>", "<?php 
+							?>", "<?php
 							// if ($married>=0 && isset($nam[1])){
 							// echo PrintReady($fulmn); // nam = Married Name
 							// }else{
@@ -582,16 +582,16 @@ if (!defined('WT_WEBTREES')) {
 							?>", "<?php
 								print ""; // occu = Occupation
 							?>", "<?php
-								print PrintReady($people["wife"]->getcensbirthplace()); //  birthpl = Census Place of Birth 
+								print PrintReady($people["wife"]->getcensbirthplace()); //  birthpl = Census Place of Birth
 							?>");'>
-							<?php 
+							<?php
 							//if ($married>=0 && isset($nam[1])){
 							// print PrintReady($fulmn); // Full Married Name
 							//} else {
 								print PrintReady($people["wife"]->getFullName()); // Full Name
 							//}
 							?>
-						</a> 
+						</a>
 						<?php print "\n" ;
 						}else{
 							print i18n::translate('Private');
@@ -602,7 +602,7 @@ if (!defined('WT_WEBTREES')) {
 				</tr>
 				<?php
 			}
-				
+
 			// Children ---------------------
 			$styleadd = "";
 			if (isset($people["children"])) {
@@ -646,7 +646,7 @@ if (!defined('WT_WEBTREES')) {
 							?>
 							<a href='javaScript:opener.insertRowToTable("<?php
 								print PrintReady($child->getXref()) ; // pid = PID
-								?>", "<?php 
+								?>", "<?php
 									//print PrintReady($child->getFullName()); // nam = Name
 									echo PrintReady($fulln);
 								?>", "<?php
@@ -664,11 +664,11 @@ if (!defined('WT_WEBTREES')) {
 								?>", "<?php
 									print ""; // occu = Occupation
 								?>", "<?php
-									print PrintReady($child->getcensbirthplace()); //  birthpl = Census Place of Birth 
+									print PrintReady($child->getcensbirthplace()); //  birthpl = Census Place of Birth
 								?>");'>
-									<?php print PrintReady($child->getFullName()); // Name 
-								?> 
-							</a> 
+									<?php print PrintReady($child->getFullName()); // Name
+								?>
+							</a>
 							<?php print "\n" ;
 							}else{
 								print i18n::translate('Private');
@@ -682,9 +682,9 @@ if (!defined('WT_WEBTREES')) {
 				}
 			}
 		}
-		
+
 		print "<tr><td><font size=1><br /></font></td></tr>";
-		
+
 		//-- Build Spouse Family ---------------------------------------------------
 		$families = $this->indi->getSpouseFamilies();
 		//$personcount = 0;
@@ -696,7 +696,7 @@ if (!defined('WT_WEBTREES')) {
 				$spousetag = 'HUSB';
 			}
 			$marrdate = $family->getMarriageDate();
-			
+
 			// Husband -------------------
 			if ( isset($people["husb"])) {
 				$married   = GedcomDate::Compare($censdate, $marrdate);
@@ -745,7 +745,7 @@ if (!defined('WT_WEBTREES')) {
 						?>
 						<a href='javaScript:opener.insertRowToTable("<?php
 								print $people["husb"]->getXref() ; // pid = PID
-							?>", "<?php 
+							?>", "<?php
 								//print PrintReady($people["husb"]->getFullName()); // nam = Name
 								echo PrintReady($fulln);
 							?>", "<?php
@@ -771,12 +771,12 @@ if (!defined('WT_WEBTREES')) {
 							?>", "<?php
 								print ""; // occu = Occupation
 							?>", "<?php
-								print PrintReady($people["husb"]->getcensbirthplace()); //  birthpl = Census Place of Birth 
+								print PrintReady($people["husb"]->getcensbirthplace()); //  birthpl = Census Place of Birth
 							?>");'>
-							<?php 
-								print PrintReady($people["husb"]->getFullName()); // Name 
-							?> 
-						</a> 
+							<?php
+								print PrintReady($people["husb"]->getFullName()); // Name
+							?>
+						</a>
 						<?php print "\n" ;
 						}else{
 							print i18n::translate('Private');
@@ -786,9 +786,9 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 				<tr>
 				<?php
-			} 
-				
-				
+			}
+
+
 			// Wife -------------------
 			//if ( isset($people["wife"]) && $spousetag == 'WIFE') {
 			if (isset($people["wife"])) {
@@ -827,7 +827,7 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 					<td align="left" class="facts_value">
 						<font size=1>
-							<?php 
+							<?php
 							print "<a href=\"".encode_url("edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom={$GEDCOM}")."\">";
 							echo $headImg2;
 							print "</a>";
@@ -839,9 +839,9 @@ if (!defined('WT_WEBTREES')) {
 						<?php
 						if ( ($people["wife"]->canDisplayDetails()) ) {
 						?>
-							<a href='javaScript:opener.insertRowToTable("<?php 
+							<a href='javaScript:opener.insertRowToTable("<?php
 									print $people["wife"]->getXref() ; // pid = PID
-							?>", "<?php 
+							?>", "<?php
 							// if ($married>=0 && isset($nam[1])){
 							// echo PrintReady($fulmn); // nam = Full Married Name
 							// }else{
@@ -871,9 +871,9 @@ if (!defined('WT_WEBTREES')) {
 							?>", "<?php
 								print ""; // occu = Occupation
 							?>", "<?php
-								print PrintReady($people["wife"]->getcensbirthplace()); //  birthpl = Census Place of Birth 
+								print PrintReady($people["wife"]->getcensbirthplace()); //  birthpl = Census Place of Birth
 							?>");'>
-								<?php 
+								<?php
 								//if ($married>=0 && isset($nam[1])){
 								// print PrintReady($fulmn); // Full Married Name
 								//} else {
@@ -890,7 +890,7 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 				<tr> <?php
 			}
-				
+
 			// Children
 			foreach($people["children"] as $key=>$child) {
 					// Get child's marriage status
@@ -937,9 +937,9 @@ if (!defined('WT_WEBTREES')) {
 						<?php
 						if ( ($child->canDisplayDetails()) ) {
 						?>
-						<a href='javaScript:opener.insertRowToTable("<?php 
+						<a href='javaScript:opener.insertRowToTable("<?php
 								print $child->getXref() ; // pid = PID
-							?>", "<?php 
+							?>", "<?php
 							// if ($married>0 && isset($nam[1])){
 							// echo PrintReady($fulmn); // nam = Full Married Name
 							// }else{
@@ -967,9 +967,9 @@ if (!defined('WT_WEBTREES')) {
 							?>", "<?php
 								print ""; // occu = Occupation
 							?>", "<?php
-								print PrintReady($child->getcensbirthplace()); //  birthpl = Census Place of Birth 
+								print PrintReady($child->getcensbirthplace()); //  birthpl = Census Place of Birth
 							?>");'>
-								<?php 
+								<?php
 							// if ($married>=0 && isset($nam[1])){
 							// print PrintReady($fulmn); // Full Married Name
 							// } else {
@@ -986,11 +986,11 @@ if (!defined('WT_WEBTREES')) {
 					</td>
 				</tr>
 				<?php
-			} 
+			}
 			print "<tr><td><font size=1><br /></font></td></tr>";
 		}
 		?>
-		
+
 		</table>
 	</td>
   </tr>
@@ -1014,7 +1014,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
-	
+
 	global $spouselinks, $parentlinks, $step_parentlinks, $persons, $person_step, $person_parent, $tabno, $theme_name, $spousetag;
 	global $natdad, $natmom, $censyear, $censdate;
 
@@ -1031,7 +1031,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 		$parentlinks  = false;
 		$step_parentlinks = false;
 	}
-	
+
 	$tmp=array('M'=>'','F'=>'F', 'U'=>'NN');
 	$isF=$tmp[$person->getSex()];
 	$spouselinks = "";
@@ -1061,11 +1061,11 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 				$persons       = "";
 				$person_parent = "";
 				$person_step   = "";
-				
+
 				//-- parent families --------------------------------------
 				$fams = $person->getChildFamilies();
 				foreach($fams as $famid=>$family) {
-					
+
 					if (!is_null($family)) {
 						$husb = $family->getHusband($person);
 						$wife = $family->getWife($person);
@@ -1073,17 +1073,17 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 						$children = $family->getChildren();
 						$num = count($children);
 						$marrdate = $family->getMarriageDate();
-						
+
 						// Husband ------------------------------
 						if ($husb || $num>0) {
-							if ($TEXT_DIRECTION=="ltr") { 
+							if ($TEXT_DIRECTION=="ltr") {
 								$title = i18n::translate('Family book chart').": ".$famid;
 							}else{
 								$title = $famid." :".i18n::translate('Family book chart');
 							}
 							if ($husb) {
 								$person_parent="Yes";
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Individual information').": ".$husb->getXref();
 								}else{
 									$title = $husb->getXref()." :".i18n::translate('Individual information');
@@ -1121,7 +1121,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 									$parentlinks .= ");\">";
 									$parentlinks .= PrintReady($husb->getFullName());
 									$parentlinks .= "</a>";
-									
+
 								}else{
 									$parentlinks .= i18n::translate('Private');
 								}
@@ -1129,17 +1129,17 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								$natdad = "yes";
 							}
 						}
-						
+
 						// Wife ------------------------------
 						if ($wife || $num>0) {
-							if ($TEXT_DIRECTION=="ltr") { 
+							if ($TEXT_DIRECTION=="ltr") {
 								$title = i18n::translate('Family book chart').": ".$famid;
 							}else{
 								$title = $famid." :".i18n::translate('Family book chart');
 							}
 							if ($wife) {
 								$person_parent="Yes";
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Individual information').": ".$wife->getXref();
 								}else{
 									$title = $wife->getXref()." :".i18n::translate('Individual information');
@@ -1159,13 +1159,13 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 									$parentlinks .= "<a href=\"javascript:opener.insertRowToTable(";
 									$parentlinks .= "'".PrintReady($wife->getXref())."',"; // pid = PID
 									// $parentlinks .= "'".PrintReady($fulln)."',"; // nam = Name
-									
+
 									//if ($married>=0 && isset($nam[1])){
 									// $parentlinks .= "'".PrintReady($fulmn)."',"; // nam = Full Married Name
 									//} else {
 										$parentlinks .= "'".PrintReady($fulln)."',"; // nam = Full Name
 									//}
-									
+
 									if ($currpid=="Wife" || $currpid=="Husband") {
 										$parentlinks .= "'Mother in Law',"; // label = 1st Gen Female Relationship
 									}else{
@@ -1211,12 +1211,12 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 						$children = $family->getChildren();
 						$num = count($children);
 						$marrdate = $family->getMarriageDate();
-						
+
 						if ($natdad == "yes") {
 						}else{
 							// Husband -----------------------
 							if ( ($husb || $num>0) && $husb->getLabel() != "." ) {
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Family book chart').": ".$famid;
 								}else{
 									$title = $famid." :".i18n::translate('Family book chart');
@@ -1239,7 +1239,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 											$fulmn = rtrim($nam[1]['givn'],'*')."&nbsp;".$nam[1]['surname'];
 											$marn  = $nam[1]['surname'];
 										}
-									
+
 										$parentlinks .= "<a href=\"".encode_url("individual.php?pid={$tmp}&amp;tab={$tabno}&amp;gedcom={$GEDCOM}")."\">";
 										$parentlinks .= PrintReady($husb->getFullName());
 										$parentlinks .= "</a>";
@@ -1250,7 +1250,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								}
 							}
 						}
-						
+
 						if ($natmom == "yes") {
 						}else{
 							// Wife ----------------------------
@@ -1290,8 +1290,8 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 						}
 					}
 				}
-				
-				// Spouse Families -------------------------------------- @var $family Family 
+
+				// Spouse Families -------------------------------------- @var $family Family
 				$fams = $person->getSpouseFamilies();
 				foreach($fams as $famid=>$family) {
 					if (!is_null($family)) {
@@ -1299,7 +1299,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 						$children = $family->getChildren();
 						$num = count($children);
 						$marrdate = $family->getMarriageDate();
-						
+
 						// Spouse ------------------------------
 						if ($spouse || $num>0) {
 							if ($TEXT_DIRECTION=="ltr") {
@@ -1308,7 +1308,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								$title = $famid." :".i18n::translate('Family book chart');
 							}
 							if ($spouse) {
-								if ($TEXT_DIRECTION=="ltr") { 
+								if ($TEXT_DIRECTION=="ltr") {
 									$title = i18n::translate('Individual information').": ".$spouse->getXref();
 								}else{
 									$title = $spouse->getXref()." :".i18n::translate('Individual information');
@@ -1373,7 +1373,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 								}
 							}
 						}
-						
+
 						// Children ------------------------------   @var $child Person
 						$spouselinks .= "<div id='spouseFam'>";
 						$spouselinks .= "<ul class=\"clist ".$TEXT_DIRECTION."\">\n";
@@ -1423,7 +1423,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 									$spouselinks .= ");\">";
 									$spouselinks .= PrintReady($child->getFullName()); // Full Name
 									$spouselinks .= "</a>";
-									}else{ 
+									}else{
 										$spouselinks .= i18n::translate('Private');
 									}
 									$spouselinks .= "</li>\n";
@@ -1439,13 +1439,13 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 				}else{
 					$spouselinks  .= "</td></tr></table>\n\t\t";
 				}
-				
+
 				if ($person_parent != "Yes") {
 					$parentlinks .= "(" . i18n::translate_c('unknown family', 'unknown') . ")</td></tr></table>\n\t\t";
 				}else{
 					$parentlinks .= "</td></tr></table>\n\t\t";
 				}
-				
+
 				if ($person_step != "Yes") {
 					$step_parentlinks .= "(" . i18n::translate_c('unknown family', 'unknown') . ")</td></tr></table>\n\t\t";
 				}else{
diff --git a/modules/GEDFact_assistant/_MEDIA/media_5_input.php b/modules/GEDFact_assistant/_MEDIA/media_5_input.php
index 82bce17ab8..d93a24b0aa 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_5_input.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_5_input.php
@@ -56,7 +56,7 @@
 	.classy1 { font-family: Verdana, Arial, Helvetica, sans-serif; background-color: transparent; color: #000000; font-size: 10px; }
 	-->
 	</style>
-<?php } 
+<?php }
 
 // Various JavaScript variables required --------------------------------- ?>
 <script language="javascript" type="text/javascript">
diff --git a/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php b/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php
index 6fdd46f652..f7439d9bfe 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php
@@ -36,7 +36,7 @@ function parseAddLinks() {
 	var tbl = document.getElementById('addlinkQueue');
 	for(var i=1; i<tbl.rows.length; i++){ // start at i=1 because we need to avoid header
 		var tr = tbl.rows[i];
-		var strRow = ''; 
+		var strRow = '';
 		for(var j=1; j<tr.cells.length; j++){ // Start at col 1 (j=1)
 			if (j>=2) {
 				// dont show  col 0 index
@@ -63,7 +63,7 @@ function parseRemLinks() {
 	var tbl = document.getElementById('existLinkTbl');
 	for(var i=1; i<tbl.rows.length; i++){ // start at i=1 because we need to avoid header
 		var remtr = tbl.rows[i];
-		var remstrRow = ''; 
+		var remstrRow = '';
 		for(var j=1; j<remtr.cells.length; j++){ // Start at col 1 (j=1)
 			if (j!=4 ) {
 				// dont show col 0 index
@@ -94,7 +94,7 @@ function shiftlinks() {
 	if (remstr) {
 		document.link.exist_links.value = remstr;
 	}
-	
+
 	parseAddLinks();
 	// alert('string = '+ str);
 	if (str) {
diff --git a/modules/GEDFact_assistant/_MEDIA/media_query_1a.php b/modules/GEDFact_assistant/_MEDIA/media_query_1a.php
index 192371629e..e988b43223 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_query_1a.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_query_1a.php
@@ -76,9 +76,9 @@ if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
 		} elseif ($record->getType()=='SOUR') {
 			$idrecord=Source::getInstance($link);
 		} else {
-			
+
 		}
-		
+
 		$nam = $idrecord->getFullName();
 		echo $nam;
 		echo "</td>";
@@ -93,13 +93,13 @@ if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
 			?>
 			<td align="center"><a href="#"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGES['button_family']; ?>" alt="<?php echo i18n::translate('Open Family Navigator'); ?>" title="<?php echo i18n::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="javascript:openFamNav('<?php echo $head; ?>');" /></a></td>
 			<?php
-		} else { 
+		} else {
 			echo '<td></td>';
 		}
 		echo '</tr>';
 		$i= $i+1;
 	}
-	
+
 	echo "</table>";
 	echo "</td></tr></table>";
 	echo "<br />";
diff --git a/modules/GEDFact_assistant/_MEDIA/media_query_2a.php b/modules/GEDFact_assistant/_MEDIA/media_query_2a.php
index a472fc160e..d0687695ef 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_query_2a.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_query_2a.php
@@ -23,7 +23,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  * @package webtrees
  * @subpackage GEDFact_assistant
  * @version $Id$
@@ -61,7 +61,7 @@ if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
 			// TODO --- alert('Opening Navigator with family id entered will come later');
 		}
 	}
-	
+
 </script>
 </head>
 
@@ -78,4 +78,3 @@ if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
 
 </body>
 </html>
-
diff --git a/modules/ahnentafel_report/module.php b/modules/ahnentafel_report/module.php
index 5a1bab3895..6359d2d042 100644
--- a/modules/ahnentafel_report/module.php
+++ b/modules/ahnentafel_report/module.php
@@ -62,7 +62,7 @@ class ahnentafel_report_WT_Module extends WT_Module implements WT_Module_Report
 		} else {
 			$pid='';
 		}
-		
+
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('ancestry');
diff --git a/modules/all_tab/module.php b/modules/all_tab/module.php
index 5d81a6c43a..29eafedb1a 100644
--- a/modules/all_tab/module.php
+++ b/modules/all_tab/module.php
@@ -51,26 +51,26 @@ class all_tab_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function hasTabContent() {
 		return true;
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getTabContent() {
-		
+
 		$out = '<div id="'.$this->getName().'_content">';
 		$out .= "<!-- all tab doesn't have it's own content -->";
 		$out .= "</div>";
 		return $out;
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function canLoadAjax() {
 		return true;
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getPreLoadContent() {
 		return '';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		$out='if (jQuery("#tabs li:eq("+jQuery("#tabs").tabs("option", "selected")+") a").attr("title")=="'.$this->getName().'") {';
diff --git a/modules/batch_update/batch_update.php b/modules/batch_update/batch_update.php
index 673977efef..ccc8493c9d 100644
--- a/modules/batch_update/batch_update.php
+++ b/modules/batch_update/batch_update.php
@@ -88,7 +88,7 @@ class batch_update {
 		}
 		$html.='</td></tr>';
 
-		if (!get_user_setting(WT_USER_ID, 'auto_accept')) 
+		if (!get_user_setting(WT_USER_ID, 'auto_accept'))
 			$html.='<tr><td colspan="2" class="error">'.i18n::translate('Your user account is not set to "Automatically accept changes made by this user". Batch update can only be used to change one record at a time. You can either continue on that basis, or change your user account setting and return here.').'</td></tr>';
 
 		// If a plugin is selected, display the details
@@ -447,5 +447,3 @@ class base_plugin {
 		);
 	}
 }
-
-?>
diff --git a/modules/batch_update/plugins/birth_y.php b/modules/batch_update/plugins/birth_y.php
index 4b39643ad9..2dbf71daec 100644
--- a/modules/batch_update/plugins/birth_y.php
+++ b/modules/batch_update/plugins/birth_y.php
@@ -40,7 +40,7 @@ class birth_y_bu_plugin extends base_plugin {
 	static function getDescription() {
 		return i18n::translate('You can improve the performance of PGV by ensuring that all individuals have a &laquo;start of life&raquo; event.');
 	}
-	
+
 	static function doesRecordNeedUpdate($xref, $gedrec) {
 		return !preg_match('/^1\s+'.WT_EVENTS_BIRT.'\b/m', $gedrec);
 	}
diff --git a/modules/batch_update/plugins/death_y.php b/modules/batch_update/plugins/death_y.php
index 70a1927cbb..eb021ab635 100644
--- a/modules/batch_update/plugins/death_y.php
+++ b/modules/batch_update/plugins/death_y.php
@@ -40,7 +40,7 @@ class death_y_bu_plugin extends base_plugin {
 	static function getDescription() {
 		return i18n::translate('You can improve the performance of PGV by ensuring that all individuals have (where appropriate) an &laquo;end of life&raquo; event.');
 	}
-	
+
 	static function doesRecordNeedUpdate($xref, $gedrec) {
 		return !preg_match('/^1\s+'.WT_EVENTS_DEAT.'\b/m', $gedrec) && Person::getInstance($xref)->isDead();
 	}
diff --git a/modules/batch_update/plugins/duplicate_links.php b/modules/batch_update/plugins/duplicate_links.php
index d3f78f33d0..9a590c510f 100644
--- a/modules/batch_update/plugins/duplicate_links.php
+++ b/modules/batch_update/plugins/duplicate_links.php
@@ -40,7 +40,7 @@ class duplicate_links_bu_plugin extends base_plugin {
 	static function getDescription() {
 		return i18n::translate('A common error is to have multiple links to the same record, for example listing the same child more than once in a family record.');
 	}
-	
+
 	// Default is to operate on INDI records
 	function getRecordTypesToUpdate() {
 		return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
diff --git a/modules/batch_update/plugins/married_names.php b/modules/batch_update/plugins/married_names.php
index 7e14c91f38..a38ae17503 100644
--- a/modules/batch_update/plugins/married_names.php
+++ b/modules/batch_update/plugins/married_names.php
@@ -42,7 +42,7 @@ class married_names_bu_plugin extends base_plugin {
 	static function getDescription() {
 		return i18n::translate('You can make it easier to search for married women by recording their married name.<br />However not all women take their husband\'s surname, so beware of introducing incorrect information into your database.');
 	}
-	
+
 	function doesRecordNeedUpdate($xref, $gedrec) {
 		return preg_match('/^1 SEX F/m', $gedrec) && preg_match('/^1 NAME /m', $gedrec) && self::_surnames_to_add($xref, $gedrec);
 	}
diff --git a/modules/batch_update/plugins/name_format.php b/modules/batch_update/plugins/name_format.php
index d8a55e0ab2..84ac6e577f 100644
--- a/modules/batch_update/plugins/name_format.php
+++ b/modules/batch_update/plugins/name_format.php
@@ -40,7 +40,7 @@ class name_format_bu_plugin extends base_plugin {
 	static function getDescription() {
 		return i18n::translate('Correct NAME records of the form \'John/DOE/\' or \'John /DOE\', as produced by older genealogy programs.');
 	}
-	
+
 	static function doesRecordNeedUpdate($xref, $gedrec) {
 		return
 			preg_match('/^(?:1 NAME|2 _MARNM|2 _AKA) [^\/\n]*\/[^\/\n]*$/m', $gedrec) ||
diff --git a/modules/batch_update/plugins/search_replace.php b/modules/batch_update/plugins/search_replace.php
index a492c557ae..d98cf0962a 100644
--- a/modules/batch_update/plugins/search_replace.php
+++ b/modules/batch_update/plugins/search_replace.php
@@ -47,7 +47,7 @@ class search_replace_bu_plugin extends base_plugin {
 	static function getDescription() {
 		return i18n::translate('Search and/or replace data in your GEDCOM using simple searches or advanced pattern matching.');
 	}
-	
+
 	// Default is to operate on INDI records
 	function getRecordTypesToUpdate() {
 		return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
diff --git a/modules/batch_update/plugins/tmglatlon.php b/modules/batch_update/plugins/tmglatlon.php
index 6539fc9d3f..a93dbae2e3 100644
--- a/modules/batch_update/plugins/tmglatlon.php
+++ b/modules/batch_update/plugins/tmglatlon.php
@@ -40,7 +40,7 @@ class tmglatlon_bu_plugin extends base_plugin {
 	static function getDescription() {
 		return i18n::translate('Converts The Master Genealogist\'s proprietary lat/lon format to the GEDCOM 5.5.1 standard that PGV can read.  Note: changes are not highlighted in the final output shown below.');
 	}
-	
+
 	// the default getActionPreview crashes on certain records, override the preview to just show the "after" results instead of the changes
 	// try removing this when bug 2177311 is fixed
 	function getActionPreview($xref, $gedrec) {
diff --git a/modules/charts/help_text.php b/modules/charts/help_text.php
index df56904ba2..763951c48e 100644
--- a/modules/charts/help_text.php
+++ b/modules/charts/help_text.php
@@ -24,7 +24,7 @@
  *
  * @version $Id$
  */
- 
+
 if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
@@ -36,4 +36,3 @@ case 'index_charts':
 	$text=i18n::translate('This block allows a pedigree, descendancy, or hourglass chart to appear on My Page or the Home Page.  Because of space limitations, the charts should be placed only on the left side of the page.<br /><br />When this block appears on the Home Page, the root person and the type of chart to be displayed are determined by the administrator.  When this block appears on the user\'s personalized My Page, these options are determined by the user.<br /><br />The behavior of these charts is identical to their behavior when they are called up from the menus.  Click on the box of a person to see more details about them.');
 	break;
 }
-?>
-\ No newline at end of file
diff --git a/modules/clippings/clippings_ctrl.php b/modules/clippings/clippings_ctrl.php
index 9c12509256..0b59a21999 100644
--- a/modules/clippings/clippings_ctrl.php
+++ b/modules/clippings/clippings_ctrl.php
@@ -434,7 +434,7 @@ class ClippingsController extends BaseController {
 		global $cart, $MULTI_MEDIA, $GEDCOM;
 		if (($clipping['id'] == false) || ($clipping['id'] == ""))
 		return false;
-		
+
 		if (!id_in_cart($clipping['id'])) {
 			$clipping['gedcom'] = $GEDCOM;
 			$ged_id=get_id_from_gedcom($GEDCOM);
diff --git a/modules/clippings/module.php b/modules/clippings/module.php
index a5b577b6fc..f4e7a44df7 100644
--- a/modules/clippings/module.php
+++ b/modules/clippings/module.php
@@ -64,9 +64,9 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 	public function defaultMenuOrder() {
 		return 20;
 	}
-	
+
 	// Implement WT_Module_Menu
-	public function getMenu() { 
+	public function getMenu() {
 		global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SEARCH_SPIDER, $controller;
 
 		if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
@@ -115,7 +115,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 	public function defaultSidebarOrder() {
 		return 50;
 	}
-	
+
 	// Impelement WT_Module_Sidebar
 	public function hasSidebarContent() {
 		return true;
@@ -143,7 +143,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 			$root = null;
 			if ($this->controller->pid && !id_in_cart($this->controller->pid)) {
 				$root = GedcomRecord::getInstance($this->controller->pid);
-				if ($root && $root->canDisplayDetails()) 
+				if ($root && $root->canDisplayDetails())
 					$out .= '<a href="sidebar.php?sb_action=clippings&amp;add='.$root->getXref().'" class="add_cart">
 					<img src="'.$WT_IMAGES['clippings'].'" width="20" /> '.i18n::translate('Add %s to cart', $root->getListName()).'</a>';
 			}
@@ -407,7 +407,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 		else return $this->getSidebarContent();
 		return $out;
 	}
-	
+
 	public function downloadForm() {
 		global $TEXT_DIRECTION;
 		$controller = $this->controller;
@@ -429,7 +429,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 		<tr><td class="descriptionbox width50 wrap">'.i18n::translate('Include media (automatically zips files)').help_link('include_media').'</td>
 		<td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes" checked="checked" /></td></tr>
 		';
-		
+
 		// Determine the Privatize options available to this user
 		if (WT_USER_IS_ADMIN) {
 			$radioPrivatizeNone = 'checked="checked" ';
@@ -475,7 +475,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 		<input type="button" value="'.i18n::translate('Cancel').'" onclick="cancelDownload();" />
 		<input type="submit" value="'.i18n::translate('Download Now').'" />
 		</form>';
-		
+
 		return $out;
 	}
 
diff --git a/modules/descendancy/module.php b/modules/descendancy/module.php
index 817df2a205..1c04480ffa 100644
--- a/modules/descendancy/module.php
+++ b/modules/descendancy/module.php
@@ -49,12 +49,12 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	public function defaultSidebarOrder() {
 		return 20;
 	}
-	
+
 	// Implement WT_Module_Sidebar
 	public function hasSidebarContent() {
 		return true;
 	}
-	
+
 	// Implement WT_Module_Sidebar
 	public function getSidebarAjaxContent() {
 		$search   =safe_GET('search');
@@ -76,14 +76,14 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out = '<script type="text/javascript">
 		<!--
 		var dloadedNames = new Array();
-		
+
 		function dsearchQ() {
 			var query = jQuery("#sb_desc_name").attr("value");
 			if (query.length>1) {
 				jQuery("#sb_desc_content").load("sidebar.php?sb_action=descendancy&search="+query);
 			}
 		}
-		
+
 		jQuery(document).ready(function(){
 			jQuery("#sb_desc_name").focus(function(){this.select();});
 			jQuery("#sb_desc_name").blur(function(){if (this.value=="") this.value="'.i18n::translate('Search').'";});
@@ -92,7 +92,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				if (dtimerid) window.clearTimeout(dtimerid);
 				dtimerid = window.setTimeout("dsearchQ()", 500);
 			});
-		
+
 			jQuery(".sb_desc_indi").live("click", function() {
 				var pid=this.title;
 				if (!dloadedNames[pid]) {
@@ -128,7 +128,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			else if ($this->controller->famid) {
 				$fam = Family::getInstance($this->controller->famid);
 				if ($fam) $root = $fam->getHusband();
-				if (!$root) $root = $fam->getWife(); 
+				if (!$root) $root = $fam->getWife();
 			}
 			if ($root!=null) {
 				$out .= '<ul>';
@@ -139,7 +139,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out .= '</div>';
 		return $out;
 	}
-	
+
 	public function getPersonLi(&$person, $generations=0) {
 		global $WT_IMAGES;
 
@@ -164,7 +164,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out .= '</li>';
 		return $out;
 	}
-	
+
 	public function getFamilyLi(&$family, &$person, $generations=0) {
 		global $WT_IMAGES;
 
@@ -172,7 +172,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out .= '<li id="sb_desc_'.$family->getXref().'" class="sb_desc_indi_li"><a href="sidebar.php?sb_action=descendancy&amp;famid='.$family->getXref().'" title="'.$family->getXref().'" class="sb_desc_indi">';
 		$out .= '<img src="'.$WT_IMAGES['minus'].'" border="0" class="plusminus" />';
 		$out .= $person->getSexImage().$person->getListName();
-		
+
 		$marryear = $family->getMarriageYear();
 		if (!empty($marryear)) {
 			$out .= ' ('.translate_fact('MARR').' '.$marryear.')';
@@ -214,7 +214,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out .= '</ul>';
 		return $out;
 	}
-	
+
 	public function loadSpouses($pid, $generations=0) {
 		$out = '<ul>';
 		$person = Person::getInstance($pid);
@@ -230,7 +230,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out .= "</ul>";
 		return $out;
 	}
-	
+
 	public function loadChildren($famid, $generations=0) {
 		$out = '<ul>';
 		$family = Family::getInstance($famid);
diff --git a/modules/descendancy_report/module.php b/modules/descendancy_report/module.php
index 70d01e5f1a..9b51016bc0 100644
--- a/modules/descendancy_report/module.php
+++ b/modules/descendancy_report/module.php
@@ -62,7 +62,7 @@ class descendancy_report_WT_Module extends WT_Module implements WT_Module_Report
 		} else {
 			$pid='';
 		}
-		
+
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('descendant');
diff --git a/modules/families/module.php b/modules/families/module.php
index 0a6e6b3cc1..be0c216889 100644
--- a/modules/families/module.php
+++ b/modules/families/module.php
@@ -54,7 +54,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	public function hasSidebarContent() {
 		return true;
 	}
-	
+
 	// Implement WT_Module_Sidebar
 	public function getSidebarAjaxContent() {
 		$alpha   =safe_GET('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
@@ -78,14 +78,14 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out = '<script type="text/javascript">
 		<!--
 		var famloadedNames = new Array();
-		
+
 		function searchQ() {
 			var query = jQuery("#sb_fam_name").attr("value");
 			if (query.length>1) {
 				jQuery("#sb_fam_content").load("sidebar.php?sb_action=families&search="+query);
 			}
 		}
-		
+
 		jQuery(document).ready(function(){
 			jQuery("#sb_fam_name").focus(function(){this.select();});
 			jQuery("#sb_fam_name").blur(function(){if (this.value=="") this.value="'.i18n::translate('Search').'";});
@@ -101,7 +101,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			jQuery(".sb_fam_surname").live("click", function() {
 				var surname = jQuery(this).attr("title");
 				var alpha = jQuery(this).attr("alt");
-				
+
 				if (!famloadedNames[surname]) {
 					jQuery.ajax({
 					  url: "sidebar.php?sb_action=families&alpha="+alpha+"&surname="+surname,
@@ -159,7 +159,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			if (!empty($search)) $out.= $this->search($search);
 			else if (!empty($alpha)) $out.= $this->getAlphaSurnames($alpha, $surname);
 		}
-		
+
 		$out .= '</div></form>';
 		return $out;
 	}
@@ -176,7 +176,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				$out .= '</div>';
 			}
 			else
-				$out .= '<div class="name_tree_div"></div>'; 
+				$out .= '<div class="name_tree_div"></div>';
 			$out .= '</li>';
 		}
 		$out .= '</ul>';
diff --git a/modules/family_group_report/module.php b/modules/family_group_report/module.php
index 342d1e0d00..4e7b9128c0 100644
--- a/modules/family_group_report/module.php
+++ b/modules/family_group_report/module.php
@@ -60,7 +60,7 @@ class family_group_report_WT_Module extends WT_Module implements WT_Module_Repor
 		} else {
 			$pid='';
 		}
-		
+
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('sfamily');
diff --git a/modules/family_nav/module.php b/modules/family_nav/module.php
index 1e8da59a10..77c9622243 100644
--- a/modules/family_nav/module.php
+++ b/modules/family_nav/module.php
@@ -51,12 +51,12 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	public function defaultSidebarOrder() {
 		return 10;
 	}
-	
+
 	// Implement WT_Module_Sidebar
 	public function hasSidebarContent() {
 		return true;
 	}
-	
+
 	// Implement WT_Module_Sidebar
 	public function getSidebarContent() {
 		global $WT_IMAGES;
@@ -71,7 +71,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			else if ($this->controller->famid) {
 				$fam = Family::getInstance($this->controller->famid);
 				if ($fam) $root = $fam->getHusband();
-				if (!$root) $root = $fam->getWife(); 
+				if (!$root) $root = $fam->getWife();
 			}
 			if ($root!=null) {
 				$this->controller = new IndividualController();
@@ -91,7 +91,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 	}
 
 	public function getLinkUrl(&$person) {
-		
+
 	}
 
 	// TODO: These functions aren't really part of the WT_Module_Tab interface, as
@@ -122,9 +122,9 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		}
 		';
 		echo WT_JS_END;
-		
+
 	 // Start Family Nav Table ----------------------------
-		echo "<table class=\"nav_content\" cellpadding=\"0\">"; 
+		echo "<table class=\"nav_content\" cellpadding=\"0\">";
 		global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION;
 
 		$personcount=0;
@@ -149,7 +149,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			if (isset($people["husb"])) {
 				$menu = new Menu("&nbsp;" . $people["husb"]->getLabel() . "&nbsp;". "\n");
 				// $menu->addClass("", "", "submenu");
-				if ($TEXT_DIRECTION=="ltr") { 
+				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
 				}else{
 					$menu->addClass("", "", "submenu flyout2rtl");
@@ -181,7 +181,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			if (isset($people["wife"])) {
 				$menu = new Menu("&nbsp;" . $people["wife"]->getLabel() . "&nbsp;". "\n");
 				//$menu->addClass("", "", "submenu");
-				if ($TEXT_DIRECTION=="ltr") { 
+				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
 				}else{
 					$menu->addClass("", "", "submenu flyout2rtl");
@@ -217,7 +217,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				}else{
 					$menu = new Menu("&nbsp;" . $child->getLabel() . "\n");
 					//$menu->addClass("", "", "submenu");
-					if ($TEXT_DIRECTION=="ltr") { 
+					if ($TEXT_DIRECTION=="ltr") {
 						$menu->addClass("", "", "submenu flyout2");
 					}else{
 						$menu->addClass("", "", "submenu flyout2rtl");
@@ -291,7 +291,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					$menu->addLabel($people["husb"]->getLabel()."\n");
 				}
 				//$menu->addClass("", "", "submenu");
-				if ($TEXT_DIRECTION=="ltr") { 
+				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
 				}else{
 					$menu->addClass("", "", "submenu flyout2rtl");
@@ -332,7 +332,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 					$menu->addLabel($people["wife"]->getLabel()."\n");
 				}
 				//$menu->addClass("", "", "submenu");
-				if ($TEXT_DIRECTION=="ltr") { 
+				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
 				}else{
 					$menu->addClass("", "", "submenu flyout2rtl");
@@ -367,7 +367,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				foreach($people["children"] as $key=>$child) {
 					$menu = new Menu($child->getLabel()."\n");
 					//$menu->addClass("", "", "submenu");
-					if ($TEXT_DIRECTION=="ltr") { 
+					if ($TEXT_DIRECTION=="ltr") {
 						$menu->addClass("", "", "submenu flyout2");
 					}else{
 						$menu->addClass("", "", "submenu flyout2rtl");
@@ -426,7 +426,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			if ( isset($people["husb"]) && $spousetag == 'HUSB' ) {
 				$menu = new Menu("&nbsp;" . $people["husb"]->getLabel() . "&nbsp;". "\n");
 				//$menu->addClass("", "", "submenu");
-				if ($TEXT_DIRECTION=="ltr") { 
+				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
 				}else{
 					$menu->addClass("", "", "submenu flyout2rtl");
@@ -463,7 +463,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			if ( isset($people["wife"]) && $spousetag == 'WIFE') {
 				$menu = new Menu("&nbsp;" . $people["wife"]->getLabel() . "&nbsp;". "\n");
 				//$menu->addClass("", "", "submenu");
-				if ($TEXT_DIRECTION=="ltr") { 
+				if ($TEXT_DIRECTION=="ltr") {
 					$menu->addClass("", "", "submenu flyout2");
 				}else{
 					$menu->addClass("", "", "submenu flyout2rtl");
@@ -502,7 +502,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				foreach($people["children"] as $key=>$child) {
 					$menu = new Menu("&nbsp;" . $child->getLabel() . "&nbsp;". "\n");
 					//$menu->addClass("", "", "submenu");
-					if ($TEXT_DIRECTION=="ltr") { 
+					if ($TEXT_DIRECTION=="ltr") {
 						$menu->addClass("", "", "submenu flyout2");
 					}else{
 						$menu->addClass("", "", "submenu flyout2rtl");
@@ -534,17 +534,17 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar {
 
 		}
 		echo "</table>";
-		
+
 		// -----------------------------------------------------------------------------
 		// }
 		// -----------------------------------------------------------------------------
 		// End Family Nav Table
 		// -----------------------------------------------------------------------------
-		
+
 		$out .= ob_get_contents();
 		ob_end_clean();
 		return $out;
-		
+
 	} // End public function getTabContent()
 
 function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") {
@@ -587,7 +587,7 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") {
 				$parentlinks .= "<span class=\"flyout4\"><b>".i18n::translate('Parents')."</b></span><br />";
 				$step_parentlinks .= "<span class=\"flyout4\"><b>".i18n::translate('Parents')."</b></span><br />";
 				$spouselinks .= "<span class=\"flyout4\"><b>".i18n::translate('Family')."</b></span><br />";
-				
+
 				$persons = "";
 				$person_parent = "";
 				$person_step = "";
@@ -741,7 +741,7 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") {
 								}
 							}
 						}
-						
+
 						// Children ------------------------------   @var $child Person
 						$hasChildren = 'No';
 						foreach($children as $c=>$child) {
@@ -765,7 +765,7 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") {
 						}
 					}
 				}
-				
+
 				if ($persons != "Yes") {
 					$spouselinks  .= "&nbsp;(".i18n::translate('none').")\n\t\t";
 				}
diff --git a/modules/faq/help_text.php b/modules/faq/help_text.php
index 86b6d1a8f9..bd5f8dae32 100644
--- a/modules/faq/help_text.php
+++ b/modules/faq/help_text.php
@@ -65,7 +65,7 @@ case 'edit_faq_item':
 	$title=i18n::translate('Edit FAQ item');
 	$text=i18n::translate('This option will let you edit an item on the FAQ page.');
 	break;
-	
+
 case 'movedown_faq_item':
 	$title=i18n::translate('Move FAQ item down');
 	$text=i18n::translate('This option will let you move an item downwards on the FAQ page.<br /><br />Each time you use this option, the FAQ Position number of this item is increased by one.  You can achieve the same effect by editing the item in question and changing the FAQ Position field.  When more than one FAQ item has the same position number, only one of these items will be visible.');
diff --git a/modules/faq/module.php b/modules/faq/module.php
index cc0cf750e5..2044ac1aba 100644
--- a/modules/faq/module.php
+++ b/modules/faq/module.php
@@ -320,7 +320,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_Conf
 				return;
 			}
 			if ($header && $faqbody) {
-				$row_color = ($row_count % 2) ? 'odd' : 'even'; 
+				$row_color = ($row_count % 2) ? 'odd' : 'even';
 				echo '';
 					// NOTE: Print the header of the current item
 						echo '<tr class="', $row_color, '"><td style="padding: 5px;">';
diff --git a/modules/gedcom_favorites/module.php b/modules/gedcom_favorites/module.php
index 78b21df43b..16fbec9d81 100644
--- a/modules/gedcom_favorites/module.php
+++ b/modules/gedcom_favorites/module.php
@@ -316,7 +316,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 		echo edit_field_yes_no('block', $block);
 		echo '</td></tr>';
 	}
-	
+
 	/**
 	 * deleteFavorite
 	 * deletes a favorite in the database
@@ -349,11 +349,11 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 		$sql.=" AND fv_file=? AND fv_username=?";
 		$vars[]=$favorite["file"];
 		$vars[]=$favorite["username"];
-	
+
 		if (WT_DB::prepare($sql)->execute($vars)->fetchOne()) {
 			return false;
 		}
-	
+
 		//-- add the favorite to the database
 		return (bool)
 			WT_DB::prepare("INSERT INTO `##favorites` (fv_username, fv_gid, fv_type, fv_file, fv_url, fv_title, fv_note) VALUES (?, ? ,? ,? ,? ,? ,?)")
@@ -370,7 +370,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 			WT_DB::prepare("SELECT * FROM `##favorites` WHERE fv_username=?")
 			->execute(array($username))
 			->fetchAll();
-	
+
 		$favorites = array();
 		foreach ($rows as $row) {
 			if (get_id_from_gedcom($row->fv_file)) { // If gedcom exists
diff --git a/modules/gedcom_stats/module.php b/modules/gedcom_stats/module.php
index e9c49205c5..4c07df0f23 100644
--- a/modules/gedcom_stats/module.php
+++ b/modules/gedcom_stats/module.php
@@ -100,7 +100,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 			// I18N: %s = date
 			$content .= i18n::translate('This GEDCOM was created on <b>%s</b>.', $date);
 		}
-		
+
 		$content .= '<br /><table><tr><td valign="top" class="width20"><table cellspacing="1" cellpadding="0">';
 		if ($stat_indi) {
 			$content.='<tr><td class="facts_label">'.i18n::translate('Individuals').'</td><td class="facts_value"><div dir="rtl"><a href="'.encode_url("indilist.php?surname_sublist=no&ged=".WT_GEDCOM).'">'.$stats->totalIndividuals().'</a></div></td></tr>';
diff --git a/modules/googlemap/admin_config.php b/modules/googlemap/admin_config.php
index 92c79953e2..a640b9e44b 100644
--- a/modules/googlemap/admin_config.php
+++ b/modules/googlemap/admin_config.php
@@ -62,10 +62,9 @@ if (WT_USER_IS_ADMIN) { ?>
 	  </td>
    </tr>
 </table>
-<?php 
+<?php
 print_footer();
 } else {
 	header("Location: login.php?url=module.php?mod=googlemap&mod_action=admin_config");
 	exit;
 }
-?>
diff --git a/modules/googlemap/defaultconfig.php b/modules/googlemap/defaultconfig.php
index 97eb247ed7..0f84c67b72 100644
--- a/modules/googlemap/defaultconfig.php
+++ b/modules/googlemap/defaultconfig.php
@@ -57,7 +57,7 @@ $GOOGLEMAP_MAX_ZOOM    = get_module_setting('googlemap', 'GM_MAX_ZOOM',    '13')
 
 global $GOOGLEMAP_XSIZE;
 $GOOGLEMAP_XSIZE       = get_module_setting('googlemap', 'GM_XSIZE',       '600');      // X-size of Google map
-global $GOOGLEMAP_YSIZE; 
+global $GOOGLEMAP_YSIZE;
 $GOOGLEMAP_YSIZE       = get_module_setting('googlemap', 'GM_YSIZE',       '400');      // Y-size of Google map
 
 global $GOOGLEMAP_PRECISION_0;
@@ -84,7 +84,7 @@ $GOOGLEMAP_COORD       = get_module_setting('googlemap', 'GM_COORD',
 //Place Hierarchy
 global $GOOGLEMAP_PLACE_HIERARCHY;
 $GOOGLEMAP_PLACE_HIERARCHY=get_module_setting('googlemap', 'GM_PLACE_HIERARCHY',  '1'     ); // Enable or disable Display Map in place herarchy
-global $GOOGLEMAP_PH_XSIZE; 
+global $GOOGLEMAP_PH_XSIZE;
 $GOOGLEMAP_PH_XSIZE       =get_module_setting('googlemap', 'GM_PH_XSIZE',         '500'   ); // X-size of Place Hierarchy Google map
 global $GOOGLEMAP_PH_YSIZE;
 $GOOGLEMAP_PH_YSIZE       =get_module_setting('googlemap', 'GM_PH_YSIZE',         '350'   ); // Y-size of Place Hierarchy Google map
@@ -167,6 +167,3 @@ $GM_MARKER_SIZE  [9]=get_module_setting('googlemap', 'GM_MARKER_SIZE_9',   'Larg
 $GM_PREFIX       [9]=get_module_setting('googlemap', 'GM_PREFIX_9',        ''     );
 $GM_POSTFIX      [9]=get_module_setting('googlemap', 'GM_POSTFIX_9',       ''     );
 $GM_PRE_POST_MODE[9]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_9', '0'    );
-
-
-?>
diff --git a/modules/googlemap/editconfig.php b/modules/googlemap/editconfig.php
index 817cc8db63..f660ac9446 100644
--- a/modules/googlemap/editconfig.php
+++ b/modules/googlemap/editconfig.php
@@ -436,12 +436,10 @@ if ($action=="update" && !isset($security_user)) {
 </table>
 </form>
 <?php
-				
+
 if (empty($SEARCH_SPIDER)) {
 	print_footer();
 } else {
 	echo i18n::translate('Search Engine Spider Detected'), ": ", $SEARCH_SPIDER;
 	echo "</div></body></html>";
 }
-
-?>
diff --git a/modules/googlemap/googlemap.php b/modules/googlemap/googlemap.php
index de683c050d..1796d00632 100644
--- a/modules/googlemap/googlemap.php
+++ b/modules/googlemap/googlemap.php
@@ -261,7 +261,7 @@ function create_possible_place_names ($placename, $level) {
 
 function abbreviate($text) {
 	if (utf8_strlen($text)>13) {
-		if (trim(utf8_substr($text, 10, 1))!="") 
+		if (trim(utf8_substr($text, 10, 1))!="")
 			$desc = utf8_substr($text, 0, 11).".";
 		else $desc = trim(utf8_substr($text, 0, 11));
 	}
@@ -655,7 +655,7 @@ function build_indiv_map($indifacts, $famids) {
 
 				if ($multimarker == 0) {        // Only one location with this long/lati combination
 					$markers[$j]["placed"] = "yes";
-					if (($markers[$j]["lati"] == NULL) || ($markers[$j]["lng"] == NULL) || (($markers[$j]["lati"] == "0") && ($markers[$j]["lng"] == "0"))) { 
+					if (($markers[$j]["lati"] == NULL) || ($markers[$j]["lng"] == NULL) || (($markers[$j]["lati"] == "0") && ($markers[$j]["lng"] == "0"))) {
 						echo "var Marker{$j}_flag = new GIcon();\n";
 						echo " Marker{$j}_flag.image = \"modules/googlemap/images/marker_yellow.png\";\n";
 						echo " Marker{$j}_flag.shadow = \"modules/googlemap/images/shadow50.png\";\n";
diff --git a/modules/googlemap/help_text.php b/modules/googlemap/help_text.php
index 2311fcb5e2..ca20e66d55 100644
--- a/modules/googlemap/help_text.php
+++ b/modules/googlemap/help_text.php
@@ -24,7 +24,7 @@
  *
  * @version $Id$
  */
- 
+
 if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
diff --git a/modules/googlemap/module.php b/modules/googlemap/module.php
index 7e1fe228b1..ec1ca7170d 100644
--- a/modules/googlemap/module.php
+++ b/modules/googlemap/module.php
@@ -72,7 +72,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 	public function defaultTabOrder() {
 		return 80;
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getPreLoadContent() {
 		ob_start();
@@ -101,7 +101,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 		?>
 <table border="0" width="100%">
 	<tr>
-		<td><?php 
+		<td><?php
 		if (!array_key_exists('googlemap', WT_Module::getActiveModules())) {
 			print "<table class=\"facts_table\">\n";
 			print "<tr><td id=\"no_tab8\" colspan=\"2\" class=\"facts_value\">".i18n::translate('GoogleMap module disabled')."</td></tr>\n";
diff --git a/modules/googlemap/pedigree_map.php b/modules/googlemap/pedigree_map.php
index bc91252731..b10cd0b70c 100644
--- a/modules/googlemap/pedigree_map.php
+++ b/modules/googlemap/pedigree_map.php
@@ -185,7 +185,7 @@ echo PrintReady($controller->getPersonName())."</h2>";
 	  </form>
 	</td></tr>
 </table>
-	
+
 <!-- end of form -->
 
 <!-- count records by type -->
@@ -316,7 +316,7 @@ echo "</div>";
 //<![CDATA[
 
 if (GBrowserIsCompatible()) {
-	
+
 // this variable will collect the html which will eventually be placed in the side_bar
 var side_bar_html = "";
 
@@ -604,7 +604,7 @@ for ($i=0; $i<($controller->treesize); $i++) {
 		$datamid  .= "</a></span>";
 		$dataright = "<br /><strong>". i18n::translate('Birth:') . "&nbsp;</strong>" .
 				addslashes($bdate->Display(false))."<br />".$bplace;
-	
+
 		$latlongval[$i] = get_lati_long_placelocation($person->getBirthPlace());
 		if ($latlongval[$i] != NULL){
 			$lat[$i] = str_replace(array('N', 'S', ','), array('', '-', '.'), $latlongval[$i]["lati"]);
@@ -667,7 +667,7 @@ for ($i=0; $i<($controller->treesize); $i++) {
 				if ($clustersize != 5) echo "&clustersize=". $clustersize; // ignoring the default of 5
 				echo "' title='" . i18n::translate('Pedigree Map') . "'>" . $dataleft . "</a>" . $datamid . $dataright . "</div>\", \"".$marker_number."\");\n";
 				echo "pm_map.addOverlay(marker);\n";
-	
+
 				if (!$hidelines) {
 					$to_child = (intval(($i-1)/2)); // Draw a line from parent to child
 					if (($to_child > -1) && ($to_child < 127) && (!empty($lat[$to_child]))) {
diff --git a/modules/googlemap/placecheck.php b/modules/googlemap/placecheck.php
index 5bd4daa044..73cb1a2cd8 100644
--- a/modules/googlemap/placecheck.php
+++ b/modules/googlemap/placecheck.php
@@ -180,12 +180,12 @@ case 'go':
 		}
 	}
 	$place_list=preg_grep('/'.$filter.'/', $place_list);
-	
+
 	//sort the array, limit to unique values, and count them
 	$place_parts=array();
 	usort($place_list, "utf8_strcasecmp");
 	$i=count($place_list);
-	
+
 	//calculate maximum no. of levels to display
 	$x=0;
 	$max=0;
@@ -195,7 +195,7 @@ case 'go':
 		if ($parts>$max) $max=$parts;
 	$x++;}
 	$x=0;
-	
+
 	//scripts for edit, add and refresh
 	?>
 	<script language="JavaScript" type="text/javascript">
@@ -204,7 +204,7 @@ case 'go':
 		window.open('module.php?mod=googlemap&mod_action=places_edit&action=update&placeid='+placeid+"&"+sessionname+"="+sessionid, '_blank', 'top=50, left=50, width=680, height=550, resizable=1, scrollbars=1');
 		return false;
 	}
-	
+
 	function add_place_location(placeid) {
 		window.open('module.php?mod=googlemap&mod_action=places_edit&action=add&placeid='+placeid+"&"+sessionname+"="+sessionid, '_blank', 'top=50, left=50, width=680, height=550, resizable=1, scrollbars=1');
 		return false;
@@ -215,7 +215,7 @@ case 'go':
 	//-->
 	</script>
 	<?php
-	
+
 	//start to produce the display table
 	$cols=0;
 	$span=$max*3+3;
@@ -264,9 +264,9 @@ case 'go':
 		while ($z<$parts) {
 			if ($levels[$z]==' ' || $levels[$z]=='')
 				$levels[$z]="unknown";// GoogleMap module uses "unknown" while GEDCOM uses , ,
-	
+
 			$levels[$z]=rtrim(ltrim($levels[$z]));
-	
+
 			$placelist=create_possible_place_names($levels[$z], $z+1); // add the necessary prefix/postfix values to the place name
 			foreach ($placelist as $key=>$placename) {
 				$row=
@@ -281,7 +281,7 @@ case 'go':
 			if ($row['pl_id']!='') {
 				$id=$row['pl_id'];
 			}
-	
+
 			if ($row['pl_place']!='') {
 				$placestr2=$mapstr_edit.$id."&amp;level=".$level.$mapstr3.$mapstr5.i18n::translate('Zoom=').$row['pl_zoom'].$mapstr6.$row['pl_placerequested'].$mapstr8;
 				if ($row['pl_place']=='unknown')
@@ -333,7 +333,7 @@ case 'go':
 		}
 		$x++;
 	}
-	
+
 	// echo final row of table
 	echo "<tr><td colspan=\"2\" class=\"list_label\">", i18n::translate('Total unique places'), ": ", $countrows, "</td></tr></table><br /><br />";
 	break;
diff --git a/modules/googlemap/placehierarchy.php b/modules/googlemap/placehierarchy.php
index 95735aae17..505081be9a 100644
--- a/modules/googlemap/placehierarchy.php
+++ b/modules/googlemap/placehierarchy.php
@@ -383,7 +383,7 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place
 		$temp=str_replace(array('&lrm;', '&rlm;'), array(WT_UTF8_LRM, WT_UTF8_RLM), $temp);
 		if (!$GOOGLEMAP_COORD){
 			echo "<br /><br /></div></td>\", icon_type, \"", $temp, "\");\n";
-		} else { 
+		} else {
 			echo "<br /><br />", $place2['lati'], ", ", $place2['long'], "</div></td>\", icon_type, \"", $temp, "\");\n";
 		}
 	}
diff --git a/modules/googlemap/places.php b/modules/googlemap/places.php
index 31a668946b..a27c776351 100644
--- a/modules/googlemap/places.php
+++ b/modules/googlemap/places.php
@@ -327,8 +327,8 @@ if ($action=="ImportFile") {
 				<select name="localfile">
 					<option></option>
 					<?php foreach($placefiles as $p=>$placefile) { ?>
-					<option value="<?php echo htmlspecialchars($placefile); ?>"><?php 
-						if (substr($placefile, 0, 1)=="/") echo substr($placefile, 1); 
+					<option value="<?php echo htmlspecialchars($placefile); ?>"><?php
+						if (substr($placefile, 0, 1)=="/") echo substr($placefile, 1);
 						else echo $placefile; ?></option>
 					<?php } ?>
 				</select>
@@ -508,7 +508,7 @@ if ($action=="DeleteRecord") {
 		WT_DB::prepare("SELECT 1 FROM `##placelocation` WHERE pl_parent_id=?")
 		->execute(array($deleteRecord))
 		->fetchOne();
-	
+
 	if (!$exists) {
 		WT_DB::prepare("DELETE FROM `##placelocation` WHERE pl_id=?")
 			->execute(array($deleteRecord));
diff --git a/modules/html/module.php b/modules/html/module.php
index 6f4186839d..a224506719 100644
--- a/modules/html/module.php
+++ b/modules/html/module.php
@@ -179,7 +179,7 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		}
 
 		require_once WT_ROOT.'includes/functions/functions_edit.php';
-		
+
 		$templates=array(
 			i18n::translate('Keyword examples')=>
 			'#getAllTagsTable#',
diff --git a/modules/individual_ext_report/module.php b/modules/individual_ext_report/module.php
index 31f2ed4af3..7ccda66807 100644
--- a/modules/individual_ext_report/module.php
+++ b/modules/individual_ext_report/module.php
@@ -62,7 +62,7 @@ class individual_ext_report_WT_Module extends WT_Module implements WT_Module_Rep
 		} else {
 			$pid='';
 		}
-		
+
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('indis');
diff --git a/modules/individual_report/module.php b/modules/individual_report/module.php
index 71d1b950fa..248e8a5a08 100644
--- a/modules/individual_report/module.php
+++ b/modules/individual_report/module.php
@@ -62,7 +62,7 @@ class individual_report_WT_Module extends WT_Module implements WT_Module_Report
 		} else {
 			$pid='';
 		}
-		
+
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('indis');
diff --git a/modules/individuals/module.php b/modules/individuals/module.php
index 0ff90e7148..9b642253dc 100644
--- a/modules/individuals/module.php
+++ b/modules/individuals/module.php
@@ -79,14 +79,14 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		$out = '<script type="text/javascript">
 		<!--
 		var loadedNames = new Array();
-		
+
 		function searchQ() {
 			var query = jQuery("#sb_indi_name").attr("value");
 			if (query.length>1) {
 				jQuery("#sb_indi_content").load("sidebar.php?sb_action=individuals&search="+query);
 			}
 		}
-		
+
 		jQuery(document).ready(function(){
 			jQuery("#sb_indi_name").focus(function(){this.select();});
 			jQuery("#sb_indi_name").blur(function(){if (this.value=="") this.value="'.i18n::translate('Search').'";});
@@ -102,7 +102,7 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			jQuery(".sb_indi_surname").live("click", function() {
 				var surname = jQuery(this).attr("title");
 				var alpha = jQuery(this).attr("alt");
-				
+
 				if (!loadedNames[surname]) {
 					jQuery.ajax({
 					  url: "sidebar.php?sb_action=individuals&alpha="+alpha+"&surname="+surname,
@@ -151,7 +151,7 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 
 		$out .= '</p>';
 		$out .= '<div id="sb_indi_content">';
-		
+
 		if (isset($_SESSION['sb_individuals_last'])) {
 			$last = $_SESSION['sb_individuals_last'];
 			$alpha = $last['alpha'];
@@ -160,7 +160,7 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 			if (!empty($search)) $out.= $this->search($search);
 			else if (!empty($alpha)) $out.= $this->getAlphaSurnames($alpha, $surname);
 		}
-		
+
 		$out .= '</div></form>';
 		return $out;
 	}
@@ -177,7 +177,7 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 				$out .= '</div>';
 			}
 			else
-				$out .= '<div class="name_tree_div"></div>'; 
+				$out .= '<div class="name_tree_div"></div>';
 			$out .= '</li>';
 		}
 		$out .= '</ul>';
diff --git a/modules/lightbox/admin_config.php b/modules/lightbox/admin_config.php
index b90056a7ca..27ac4ef9ed 100644
--- a/modules/lightbox/admin_config.php
+++ b/modules/lightbox/admin_config.php
@@ -46,9 +46,8 @@ if (WT_USER_IS_ADMIN) { ?>
 		</a><?php echo help_link('LIGHTBOX_CONFIG', $this->getName()); ?>
 	  </td>
       <td class="optionbox">
-		
+
 	  </td>
    </tr>
 
 <?php }
-?>
diff --git a/modules/lightbox/functions/lb_head.php b/modules/lightbox/functions/lb_head.php
index d0c51f56f1..9b65615b3b 100644
--- a/modules/lightbox/functions/lb_head.php
+++ b/modules/lightbox/functions/lb_head.php
@@ -60,7 +60,7 @@ $reorder=safe_get('reorder', '1', '0');
 		"inverselink.php?linktoid=<?php print $pid; ?>&linkto=person", "win04", "resizable=1, scrollbars=1, top=50, HEIGHT=300, WIDTH=450 ");
 		win04.focus()
 	}
-	
+
 	function goto_config_lightbox() {
 		window.location = "module.php?mod=lightbox&mod_action=lb_editconfig&pid=<?php print $pid; ?>&gedcom=<?php print $GEDCOM; ?>#lightbox";
 	}
@@ -242,4 +242,3 @@ require_once WT_ROOT.'includes/media_reorder_count.php';
 
 		print "</tr></table>";
 	}
-?>
diff --git a/modules/lightbox/functions/lb_horiz_sort.php b/modules/lightbox/functions/lb_horiz_sort.php
index 45edecf0ab..ff16e7dfd2 100644
--- a/modules/lightbox/functions/lb_horiz_sort.php
+++ b/modules/lightbox/functions/lb_horiz_sort.php
@@ -44,7 +44,7 @@ if (!defined('WT_WEBTREES')) {
 	function getGroupOrder() {
 		// var sections = document.getElementsByClassName('section');
 		var sections = $$('.section');
-		
+
 		var alerttext = '';
 		var order = '';
 
diff --git a/modules/lightbox/functions/lb_indi_doors_0.php b/modules/lightbox/functions/lb_indi_doors_0.php
index 84fc59882d..9dfca9cac8 100644
--- a/modules/lightbox/functions/lb_indi_doors_0.php
+++ b/modules/lightbox/functions/lb_indi_doors_0.php
@@ -60,4 +60,4 @@ if (!defined('WT_WEBTREES')) {
 		<dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('Map')?></a></dd>
 	<?php } ?>
 <!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php print "Spare Tab" ?></a></dd>  -->
-	<dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('All')?></a></dd> 
+	<dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('All')?></a></dd>
diff --git a/modules/lightbox/functions/lb_indi_doors_1.php b/modules/lightbox/functions/lb_indi_doors_1.php
index 108ab25cce..3ffdfa4377 100644
--- a/modules/lightbox/functions/lb_indi_doors_1.php
+++ b/modules/lightbox/functions/lb_indi_doors_1.php
@@ -63,5 +63,5 @@ if (!defined('WT_WEBTREES')) {
 		<dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('Map')?></a></dd>
 	<?php } ?>
 <!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php print "Spare Tab" ?></a></dd> -->
-	
-	<dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('All')?></a></dd> 
+
+	<dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('All')?></a></dd>
diff --git a/modules/lightbox/functions/lightbox_print_media.php b/modules/lightbox/functions/lightbox_print_media.php
index 29bddff516..1e386922fc 100644
--- a/modules/lightbox/functions/lightbox_print_media.php
+++ b/modules/lightbox/functions/lightbox_print_media.php
@@ -58,7 +58,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 	global $is_media, $cntm1, $cntm2, $cntm3, $cntm4, $t, $mgedrec;
 	global $res, $typ2b, $edit, $tabno, $n, $item, $items, $p, $note, $rowm, $note_text, $reorder;
 	global $action, $order, $order2, $rownum, $rownum1, $rownum2, $rownum3, $rownum4, $media_data, $sort_i;
-	
+
 	global $GEDCOM_ID_PREFIX;
 	$ged_id=get_id_from_gedcom($GEDCOM);
 
@@ -270,13 +270,13 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 				$foundObjs[$rowm['m_media']]=true;
 			}
 		}
-		
+
 		// =====================================================================================
 		//-- Objects are removed from the $current_objes list as they are printed.
 		//-- Any "Extra" objects left in the list are new objects recently added to the gedcom
-		//-- but not yet accepted into the database.  
+		//-- but not yet accepted into the database.
 		//-- We will print them too, and put any "Extra Items not in DB" into a new Row.
-		
+
 		// Firstly, get count of Items in Database for this Individual
 		$indiobjs = "SELECT ";
 		$indiobjs .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM `##media`, `##media_mapping` where ";
@@ -330,7 +330,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 								echo "<tr><td align=\"center\" colspan=\"4\">";
 								echo $row['m_media'];
 								echo "</td></tr>";
-								
+
 								$res =  lightbox_print_media_row('new', $row, $pid);
 								$media_found = $media_found || $res;
 							}
@@ -347,7 +347,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 						$row['m_gedrec'] = $newrec;
 						$et = preg_match("/(\.\w+)$/", $row['m_file'], $ematch);
 						$ext = "";
-						if ($et>0) { 
+						if ($et>0) {
 							$ext = substr(trim($ematch[1]), 1);
 						}
 						$row['m_ext'] = $ext;
@@ -361,7 +361,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 							echo "<tr><td align=\"center\" colspan=\"4\">";
 							echo $row['m_media'];
 							echo "</td></tr>";
-							
+
 							$res =  lightbox_print_media_row('new', $row, $pid);
 							$media_found = $media_found || $res;
 						}
@@ -370,7 +370,7 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 				}
 			}
 		}
-		
+
 		// No "Extra" Media Items ============================
 		if ($kind==5 && $ct==$numindiobjs) {
 		// "Extra" Media Item in GEDCOM but NOT in DB ========
@@ -401,11 +401,10 @@ Requests for commercial publication of these or other UK census images appearing
 			echo '</tr>';
 			echo '</table>' . "\n\n";
 		}
-		
+
 	}
 
 	if ($media_found) return $is_media="YES" ;
 	else return $is_media="NO" ;
 
 }
-?>
diff --git a/modules/lightbox/help_text.php b/modules/lightbox/help_text.php
index de6fe041ad..9e1e5276f6 100644
--- a/modules/lightbox/help_text.php
+++ b/modules/lightbox/help_text.php
@@ -42,9 +42,9 @@ case 'lb_tt_balloon':
 	$title=i18n::translate('Album Tab Thumbnail - Notes Link Tooltip');
 	$text=i18n::translate('This option lets you determine whether the \'View Notes\' link should show a \'Balloon\' Tooltip or \'Normal\' Tooltip when clicked. <br /><br />The link shown here show you the Notes associated with a Media item (if available).<br />');
 	break;
-	
-// VERSION 4.1.3 
-	
+
+// VERSION 4.1.3
+
 case 'mediatab':
 	$title=i18n::translate('Media Tab Appearance');
 	$text=i18n::translate('This option lets you determine whether the Media tab should be shown on the Individual Information page.<br /><br />When this option is set to <b>Hide</b>, only the <b>Lightbox</b> tab will be shown.<br />');
diff --git a/modules/lightbox/lb_editconfig.php b/modules/lightbox/lb_editconfig.php
index b056640170..59d1fec0b8 100644
--- a/modules/lightbox/lb_editconfig.php
+++ b/modules/lightbox/lb_editconfig.php
@@ -211,7 +211,7 @@ if ($action=='update' && !isset($security_user)) {
 			<?php }else{ ?>
 				<INPUT TYPE="button" VALUE="<?php echo i18n::translate('Return to Admin Page'); ?>" onclick="javascript:window.location='module_admin.php'" />
 			<?php } ?>
-			
+
 			</td>
 
 		</tr>
diff --git a/modules/lightbox/module.php b/modules/lightbox/module.php
index 0e2b7c737b..4b2e788b73 100644
--- a/modules/lightbox/module.php
+++ b/modules/lightbox/module.php
@@ -73,7 +73,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul
 		global $MULTI_MEDIA;
 		return $MULTI_MEDIA && (WT_USER_CAN_EDIT || $this->get_media_count()>0);
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getTabContent() {
 		global $MULTI_MEDIA, $MEDIA_EXTERNAL;
@@ -86,7 +86,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul
 
 		ob_start();
 		require_once 'modules/lightbox/functions/lb_head.php';
-		
+
 		$media_found = false;
 		if (!$this->controller->indi->canDisplayDetails()) {
 			print "<table class=\"facts_table\" cellpadding=\"0\">\n";
@@ -111,16 +111,16 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul
 	public function getPreLoadContent() {
 		ob_start();
 		require_once WT_ROOT.'modules/lightbox/functions/lb_call_js.php';
-		return ob_get_clean(); 
+		return ob_get_clean();
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		return 'CB_Init();';
 	}
 
 	protected $mediaCount = null;
-	
+
 	private function get_media_count() {
 		if ($this->mediaCount===null) {
 			$ct = preg_match("/\d OBJE/", $this->controller->indi->getGedcomRecord());
diff --git a/modules/logged_in/module.php b/modules/logged_in/module.php
index 2d61368f92..7cdecacddd 100644
--- a/modules/logged_in/module.php
+++ b/modules/logged_in/module.php
@@ -88,7 +88,7 @@ class logged_in_WT_Module extends WT_Module implements WT_Module_Block {
 			}
 		}
 		$content .= "</table>";
-		
+
 		if ($template) {
 			require $THEME_DIR.'templates/block_main_temp.php';
 		} else {
diff --git a/modules/media/module.php b/modules/media/module.php
index 8cdd8abbcd..08cbac44ce 100644
--- a/modules/media/module.php
+++ b/modules/media/module.php
@@ -49,7 +49,7 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function defaultTabOrder() {
 		return 50;
 	}
-	
+
 	protected $mediaCount = null;
 
 	// Implement WT_Module_Tab
@@ -57,11 +57,11 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab {
 		global $MULTI_MEDIA;
 		return $MULTI_MEDIA && (WT_USER_CAN_EDIT || $this->get_media_count()>0);
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getTabContent() {
 		global $MULTI_MEDIA, $NAV_MEDIA;
-		
+
 		ob_start();
 		// For Reorder media ------------------------------------
 		if (WT_USER_CAN_EDIT) {
@@ -101,7 +101,7 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab {
 	<?php
 		return '<div id="'.$this->getName().'_content">'.ob_get_clean().'</div>';
 	}
-	
+
 	/**
 	* get the number of media items for this person
 	* @return int
@@ -125,10 +125,10 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function getPreLoadContent() {
 		return '';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		return '';
 	}
-	
+
 }
diff --git a/modules/notes/module.php b/modules/notes/module.php
index 405a5453c1..d8726fe840 100644
--- a/modules/notes/module.php
+++ b/modules/notes/module.php
@@ -49,7 +49,7 @@ class notes_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function defaultTabOrder() {
 		return 40;
 	}
-	
+
 	protected $noteCount = null;
 
 	// Implement WT_Module_Tab
@@ -152,10 +152,10 @@ if (!$SHOW_LEVEL2_NOTES) {
 	public function getPreLoadContent() {
 		return '';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		return '';
 	}
-	
+
 }
diff --git a/modules/page_menu/module.php b/modules/page_menu/module.php
index 602d896fce..170956166c 100644
--- a/modules/page_menu/module.php
+++ b/modules/page_menu/module.php
@@ -49,9 +49,9 @@ class page_menu_WT_Module extends WT_Module implements WT_Module_Menu {
 	public function defaultMenuOrder() {
 		return 10;
 	}
-	
+
 	// Implement WT_Module_Menu
-	public function getMenu() { 
+	public function getMenu() {
 		global $TEXT_DIRECTION, $controller;
 
 		$menu = null;
diff --git a/modules/pedigree_report/module.php b/modules/pedigree_report/module.php
index 848b3e1fd6..0cd30ac8ad 100644
--- a/modules/pedigree_report/module.php
+++ b/modules/pedigree_report/module.php
@@ -62,7 +62,7 @@ class pedigree_report_WT_Module extends WT_Module implements WT_Module_Report {
 		} else {
 			$pid='';
 		}
-		
+
 		$menus=array();
 		$menu=new Menu($this->getTitle().' - '.i18n::translate('Portrait'), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report_portrait.xml'.$pid);
 		$menu->addIcon('pedigree');
@@ -77,4 +77,3 @@ class pedigree_report_WT_Module extends WT_Module implements WT_Module_Report {
 		return $menus;
 	}
 }
-?>
diff --git a/modules/personal_facts/module.php b/modules/personal_facts/module.php
index 24fe646caf..ff205e112b 100644
--- a/modules/personal_facts/module.php
+++ b/modules/personal_facts/module.php
@@ -49,7 +49,7 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function defaultTabOrder() {
 		return 10;
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getTabContent() {
 		global $FACT_COUNT, $WT_IMAGES, $EXPAND_RELATIVES_EVENTS;
@@ -131,7 +131,7 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab {
 		<?php
 		return '<div id="'.$this->getName().'_content">'.ob_get_clean().'</div>';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function hasTabContent() {
 		return true;
@@ -146,10 +146,10 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function getPreLoadContent() {
 		return '';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		return '';
 	}
-	
+
 }
diff --git a/modules/relative_ext_report/module.php b/modules/relative_ext_report/module.php
index 2f4dc67c58..c3704b206f 100644
--- a/modules/relative_ext_report/module.php
+++ b/modules/relative_ext_report/module.php
@@ -62,8 +62,8 @@ class relative_ext_report_WT_Module extends WT_Module implements WT_Module_Repor
 		} else {
 			$pid='';
 		}
-		
-		
+
+
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('cfamily');
diff --git a/modules/relative_report/module.php b/modules/relative_report/module.php
index fac2bb72f4..906bbb6729 100644
--- a/modules/relative_report/module.php
+++ b/modules/relative_report/module.php
@@ -62,7 +62,7 @@ class relative_report_WT_Module extends WT_Module implements WT_Module_Report {
 		} else {
 			$pid='';
 		}
-		
+
 		$menus=array();
 		$menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&amp;action=setup&amp;report=modules/'.$this->getName().'/report.xml'.$pid);
 		$menu->addIcon('cfamily');
diff --git a/modules/relatives/module.php b/modules/relatives/module.php
index 5ce69fe534..cee66fcfbb 100644
--- a/modules/relatives/module.php
+++ b/modules/relatives/module.php
@@ -49,17 +49,17 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function defaultTabOrder() {
 		return 20;
 	}
-	
+
 	function printFamilyHeader($famid, $label) {
 		global $WT_IMAGES, $SEARCH_SPIDER;
-	
+
 		echo '<table>
 			<tr>';
 			if (isset($WT_IMAGES["cfamily"])) {
 				echo '<td><img src="', $WT_IMAGES["cfamily"], '" border="0" class="icon" alt="" /></td>';
 			}
 			echo '<td><span class="subheaders">', PrintReady($label), '</span>';
-			if (empty($SEARCH_SPIDER)) { 
+			if (empty($SEARCH_SPIDER)) {
 				echo ' - <a href="family.php?famid=', $famid, '">', i18n::translate('View Family'), '</a>';
 			 }
 			echo '</td>
@@ -336,7 +336,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 			<?php
 		}
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getTabContent() {
 		global $WT_IMAGES, $SHOW_AGE_DIFF, $GEDCOM, $ABBREVIATE_CHART_LABELS, $show_full, $personcount;
@@ -346,7 +346,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 
 		$saved_ABBREVIATE_CHART_LABELS = $ABBREVIATE_CHART_LABELS;
 		$ABBREVIATE_CHART_LABELS = false; // Override GEDCOM configuration
-		
+
 		ob_start();
 		?>
 		<table class="facts_table"><tr><td style="width:20%; padding:4px"></td><td class="descriptionbox rela">
@@ -519,10 +519,10 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function getPreLoadContent() {
 		return '';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		return '';
 	}
-	
+
 }
diff --git a/modules/sitemap/index.php b/modules/sitemap/index.php
index 4d7029ba54..57d250a66b 100644
--- a/modules/sitemap/index.php
+++ b/modules/sitemap/index.php
@@ -76,10 +76,10 @@ if ($action=="sendFiles") {
 
 	echo "<?xml version='1.0' encoding='UTF-8'?>\n";
 	echo "<?xml-stylesheet type=\"text/xsl\" href=\"", WT_SERVER_NAME.WT_SCRIPT_PATH, "modules/sitemap/gss.xsl\"?>\n";
-	echo "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n"; 
-	echo " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; 
-	echo " xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9\n"; 
-	echo " http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd\">\n"; 
+	echo "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n";
+	echo " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
+	echo " xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9\n";
+	echo " http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd\">\n";
 
 	if (isset($welcome)) {
 		echo " <url>\n";
@@ -193,7 +193,7 @@ if ($action=="sendIndex") {
 	echo "url=\"http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd\"\n";
 	echo "xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n";
 
-	
+
 	if (isset($filenames)) {
 		foreach($filenames as $ged_index=>$ged_name) {
 			$xml_name = str_ireplace(".ged",".xml", $ged_name);
diff --git a/modules/sources_tab/module.php b/modules/sources_tab/module.php
index 134ec56ac1..ca2cc21989 100644
--- a/modules/sources_tab/module.php
+++ b/modules/sources_tab/module.php
@@ -49,13 +49,13 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function defaultTabOrder() {
 		return 30;
 	}
-	
+
 	protected $sourceCount = null;
 
 	// Implement WT_Module_Tab
 	public function getTabContent() {
 		global $FACT_COUNT, $SHOW_LEVEL2_NOTES, $NAV_SOURCES;
-		
+
 		/*if (isset($_COOKIE['row_sour2'])) $SHOW_LEVEL2_SOURCES = ($_COOKIE['row_sour2']);
 		else*/ $SHOW_LEVEL2_SOURCES = $SHOW_LEVEL2_NOTES;
 
@@ -74,7 +74,7 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab {
 				<td class="descriptionbox rela">
 					<input id="checkbox_sour2" type="checkbox" <?php if ($SHOW_LEVEL2_SOURCES) echo " checked=\"checked\""?> onclick="toggleByClassName('TR', 'row_sour2');" />
 					<label for="checkbox_sour2"><?php echo i18n::translate('Show all sources'), help_link('show_fact_sources'); ?></label>
-					
+
 				</td>
 			</tr>
 			<?php
@@ -141,7 +141,7 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function getPreLoadContent() {
 		return '';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		return '';
diff --git a/modules/stories/module.php b/modules/stories/module.php
index c3d942c22d..c229a4c470 100644
--- a/modules/stories/module.php
+++ b/modules/stories/module.php
@@ -159,7 +159,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 
 		require_once WT_ROOT.'includes/functions/functions_edit.php';
 		if (WT_USER_CAN_EDIT) {
-		
+
 			if (safe_POST_bool('save')) {
 				$block_id=safe_POST('block_id');
 				if ($block_id) {
@@ -350,7 +350,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 	}
 	// Following function allows Story list to be added manually as a menu item in header.php if required, using link such as "module.php?mod=stories&mod_action=show_list"
 	// No privacy restrictions included here though - so use with care!
-	private function show_list() { 
+	private function show_list() {
 		global $WT_IMAGES, $TEXT_DIRECTION;
 
 			print_header($this->getTitle());
diff --git a/modules/todays_events/module.php b/modules/todays_events/module.php
index a71fc9f048..4fa00ac207 100644
--- a/modules/todays_events/module.php
+++ b/modules/todays_events/module.php
@@ -128,14 +128,14 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 		}
 
 		require_once WT_ROOT.'includes/functions/functions_edit.php';
-		
+
 		$filter=get_block_setting($block_id, 'filter', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo i18n::translate('Show only events of living people?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('filter', $filter);
 		echo '</td></tr>';
-		
+
 		$onlyBDM=get_block_setting($block_id, 'onlyBDM', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo i18n::translate('Show only Births, Deaths, and Marriages?');
diff --git a/modules/top10_surnames/module.php b/modules/top10_surnames/module.php
index fef91ceec7..9655ae8ece 100644
--- a/modules/top10_surnames/module.php
+++ b/modules/top10_surnames/module.php
@@ -46,10 +46,10 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block {
 	// Implement class WT_Module_Block
 	public function getBlock($block_id, $template=true, $cfg=null) {
 		global $ctype, $WT_IMAGES, $SURNAME_LIST_STYLE, $THEME_DIR;
-		
+
 		$COMMON_NAMES_REMOVE=get_gedcom_setting(WT_GED_ID, 'COMMON_NAMES_REMOVE');
 		$COMMON_NAMES_THRESHOLD=get_gedcom_setting(WT_GED_ID, 'COMMON_NAMES_THRESHOLD');
-		
+
 		$num=get_block_setting($block_id, 'num', 10);
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
 		$block=get_block_setting($block_id, 'block', false);
@@ -185,4 +185,3 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block {
 		return $countb - $counta;
 	}
 }
-?>
diff --git a/modules/tree/module.php b/modules/tree/module.php
index c984227c63..1d2b38d82d 100644
--- a/modules/tree/module.php
+++ b/modules/tree/module.php
@@ -50,7 +50,7 @@ class tree_WT_Module extends WT_Module implements WT_Module_Tab {
 	public function defaultTabOrder() {
 		return 70;
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getJSCallback() {
 		return
@@ -62,7 +62,7 @@ class tree_WT_Module extends WT_Module implements WT_Module_Tab {
 			' outdiv.style.width = (parent.offsetWidth-30) + "px";'.
 			'}';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function getTabContent() {
 		ob_start();
@@ -72,7 +72,7 @@ class tree_WT_Module extends WT_Module implements WT_Module_Tab {
 		$inav->drawViewport('treetab', "auto", "500px");
 		return '<div id="'.$this->getName().'_content">'.ob_get_clean().'</div>';
 	}
-	
+
 	// Implement WT_Module_Tab
 	public function hasTabContent() {
 		return true;
diff --git a/modules/user_favorites/module.php b/modules/user_favorites/module.php
index 21084fc5b6..7ba65a9db0 100644
--- a/modules/user_favorites/module.php
+++ b/modules/user_favorites/module.php
@@ -310,7 +310,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 		echo edit_field_yes_no('block', $block);
 		echo '</td></tr>';
 	}
-	
+
 	/**
 	 * deleteFavorite
 	 * deletes a favorite in the database
@@ -343,11 +343,11 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 		$sql.=" AND fv_file=? AND fv_username=?";
 		$vars[]=$favorite["file"];
 		$vars[]=$favorite["username"];
-	
+
 		if (WT_DB::prepare($sql)->execute($vars)->fetchOne()) {
 			return false;
 		}
-	
+
 		//-- add the favorite to the database
 		return (bool)
 			WT_DB::prepare("INSERT INTO `##favorites` (fv_username, fv_gid, fv_type, fv_file, fv_url, fv_title, fv_note) VALUES (?, ? ,? ,? ,? ,? ,?)")
@@ -364,7 +364,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 			WT_DB::prepare("SELECT * FROM `##favorites` WHERE fv_username=?")
 			->execute(array($username))
 			->fetchAll();
-	
+
 		$favorites = array();
 		foreach ($rows as $row) {
 			if (get_id_from_gedcom($row->fv_file)) { // If gedcom exists
diff --git a/pgv_to_wt.php b/pgv_to_wt.php
index 9fd1790bbc..a69c6b7832 100644
--- a/pgv_to_wt.php
+++ b/pgv_to_wt.php
@@ -136,14 +136,13 @@ if ($error || empty($PGV_PATH)) {
 		'<dt>',i18n::translate('Installation directory'), '</dt>',
 		'<dd><input type="text" name="PGV_PATH" size="40" value="'.htmlspecialchars($PGV_PATH).'">',
 		'</dd>';
-		echo '<dt>', /* find better english before translating */ 'PhpGedView might be found in these locations', '</dt>';
-		echo '<dd>';
-			foreach ($pgv_dirs as $pgvpath) {
-				echo '<p class="pgv">', $pgvpath, '</p>';
-			}
-		echo '</dd>';
-		
+	echo '<dt>', /* find better english before translating */ 'PhpGedView might be found in these locations', '</dt>';
+	echo '<dd>';
+	foreach ($pgv_dirs as $pgvpath) {
+		echo '<p class="pgv">', $pgvpath, '</p>';
+	}
 	echo
+		'</dd>',
 		'</dl>',
 		'<div class="center"><input type="submit" value="'.i18n::translate('next').'"></div>',
 		'</form>',
diff --git a/themes/clouds/header.php b/themes/clouds/header.php
index 7dcc08866b..f5da676ab9 100644
--- a/themes/clouds/header.php
+++ b/themes/clouds/header.php
@@ -69,7 +69,7 @@ echo
 
 
 echo
-	$javascript, 
+	$javascript,
 	'<script type="text/javascript" src="js/jquery/jquery.min.js"></script>',
 	'<script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script>',
 	'<script type="text/javascript" src="js/jquery/jquery.tablesorter.js"></script>',
@@ -83,20 +83,20 @@ echo
 <?php
 if ($TEXT_DIRECTION=='rtl') { ?>
 	<link type="text/css" href="<?php echo WT_THEME_DIR?>jquery/jquery-ui_theme_rtl.css" rel="Stylesheet" />
-<?php } 
+<?php }
 
 echo
 	'<link rel="stylesheet" href="', $modules, '" type="text/css" />',
 	'<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />';
-	
+
 if ($BROWSERTYPE!='other') { ?>
 	<link rel="stylesheet" href="<?php echo $THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
-<?php 
+<?php
 }
-	
-	
-if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) {?> 
-	<link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" /> 
+
+
+if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) {?>
+	<link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" />
 <?php }
 	echo '</head><body id="body" ', $bodyOnLoad, '>';
 ?>
@@ -112,7 +112,7 @@ if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) {?>
 		 '<div class="title">';
 	print_gedcom_title_link(TRUE);
 
-if (empty($SEARCH_SPIDER)) { 
+if (empty($SEARCH_SPIDER)) {
 	echo '<td valign="middle" align="center">',
 		 '<div class="blanco" style="COLOR: #6699ff;" >';
 	print_user_links();
@@ -126,7 +126,7 @@ if (empty($SEARCH_SPIDER)) {
 		 '<input type="hidden" name="action" value="general" />',
 		 '<input type="hidden" name="topsearch" value="yes" />',
 		 '<input type="text" class="formbut" name="query" size="15" value="', i18n::translate('Search'), '" onfocus="if (this.value==\'', i18n::translate('Search'), '\') this.value=\'\'; focusHandler();" onblur="if (this.value==\'\') this.value=\'', i18n::translate('Search'), '\';" />',
-		 '<input type="image" src="', WT_THEME_DIR, 'images/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />', 
+		 '<input type="image" src="', WT_THEME_DIR, 'images/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />',
 		 '</form>',
 		 '</div>';
 }
@@ -176,7 +176,7 @@ echo '<table id="toplinks">',
 		echo '<td>', $menu->getMenu(), '</td>';
 	}
 	$menus=MenuBar::getModuleMenus();
-		foreach ($menus as $menu) { 
+		foreach ($menus as $menu) {
 			if ($menu) {
 				$menu->addLabel('', 'none');
 				echo '<td>', $menu->getMenu(), '</td>';
diff --git a/themes/colors/header.php b/themes/colors/header.php
index e355226ae5..f6b4ffdad2 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -70,7 +70,7 @@ echo
 
 
 echo
-	$javascript, 
+	$javascript,
 	'<script type="text/javascript" src="js/jquery/jquery.min.js"></script>',
 	'<script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script>',
 	'<script type="text/javascript" src="js/jquery/jquery.tablesorter.js"></script>',
@@ -84,27 +84,27 @@ echo
 <?php
 if ($TEXT_DIRECTION=='rtl') { ?>
 	<link type="text/css" href="<?php echo WT_THEME_DIR?>jquery/jquery-ui_theme_rtl.css" rel="Stylesheet" />
-<?php } 
+<?php }
 
 echo
 	'<link rel="stylesheet" href="', $modules, '" type="text/css" />',
 	'<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />';
-	
+
 if ($BROWSERTYPE!='other') { ?>
 	<link rel="stylesheet" href="<?php echo $THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
-<?php 
+<?php
 }
-	
-	
-if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) {?> 
-	<link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" /> 
+
+
+if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) {?>
+	<link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" />
 <?php }
 	echo '</head><body id="body" ', $bodyOnLoad, '>';
 ?>
 
 <!-- Remove header for edit windows -->
 <!-- begin header section -->
-<?php 
+<?php
 if ($view!='simple') {
 	echo
 		'<div id="header" class="', $TEXT_DIRECTION, '">',
@@ -114,7 +114,7 @@ if ($view!='simple') {
 		'<div class="title">';
 	print_gedcom_title_link(TRUE);
 	echo '</div></td><td>';
-	if (empty($SEARCH_SPIDER)) { 
+	if (empty($SEARCH_SPIDER)) {
 		echo '<div style="float:', WT_CSS_REVERSE_ALIGN, ';"><ul class="makeMenu">';
 		if (WT_USER_ID) {
 			echo
@@ -141,21 +141,21 @@ if ($view!='simple') {
 		if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) {
 			echo ' | ', MenuBar::getThemeMenu()->getMenuAsList();
 		}
-		echo 
+		echo
 			'</span> | <form style="display:inline;" action="search.php" method="get">',
 			'<input type="hidden" name="action" value="general" />',
 			'<input type="hidden" name="topsearch" value="yes" />',
 			'<input type="text" name="query" size="15" value="', i18n::translate('Search'), '" onfocus="if (this.value==\'', i18n::translate('Search'), '\') this.value=\'\'; focusHandler();" onblur="if (this.value==\'\') this.value=\'', i18n::translate('Search'), '\';" />',
 			'<input type="image" src="', WT_THEME_DIR, 'images/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />',
 			'</form>',
-			'</ui></div>'; 
+			'</ui></div>';
 	}
 
 	echo '</td></tr></table></div>';
 ?>
 <!--end header section -->
 <!--begin menu section -->
-<?php 
+<?php
 	echo
 		'<table id="toplinks"><tr><td class="toplinks_left">',
 		'<table align="', $TEXT_DIRECTION=="ltr"?"left":"right", '">',
@@ -196,7 +196,7 @@ if ($view!='simple') {
 		echo '<td>', $menu->getMenu(), '</td>';
 	}
 	$menus=MenuBar::getModuleMenus();
-	foreach ($menus as $m=>$menu) { 
+	foreach ($menus as $m=>$menu) {
 		if ($menu) {
 			$menu->addLabel('', 'none');
 			echo '<td>', $menu->getMenu(), '</td>';
@@ -208,7 +208,7 @@ if ($view!='simple') {
 		echo '<td>', $menu->getMenu(), '</td>';
 	}
 	echo '</tr></table></td>';
-	if (empty($SEARCH_SPIDER)) { 
+	if (empty($SEARCH_SPIDER)) {
 		echo '<td class="toplinks_right"><div align="', $TEXT_DIRECTION=="rtl"?"left":"right", '">';
 		echo color_theme_dropdown();
 		echo '</div></td>';
diff --git a/themes/colors/theme.php b/themes/colors/theme.php
index 4e0ba09d69..93f0eebc8f 100644
--- a/themes/colors/theme.php
+++ b/themes/colors/theme.php
@@ -50,7 +50,7 @@ function color_theme_dropdown($style=0) {
 /**
  *  Define the default palette to be used.  Set $subColor
  *  to one of the collowing values to determine the default:
- *  
+ *
  */
 
 $COLOR_THEME_LIST=array(
diff --git a/themes/fab/header.php b/themes/fab/header.php
index 1fc5abe32c..1b4918f0c4 100644
--- a/themes/fab/header.php
+++ b/themes/fab/header.php
@@ -66,13 +66,13 @@ echo
 	'<meta name="generator" content="', WT_WEBTREES, ' ', WT_VERSION_TEXT, '" />';
 
 echo
-	$javascript, 
+	$javascript,
 	'<script type="text/javascript" src="js/jquery/jquery.min.js"></script>',
 	'<script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script>',
 	'<script type="text/javascript" src="js/jquery/jquery.tablesorter.js"></script>',
 	'<script type="text/javascript" src="js/jquery/jquery.tablesorter.pager.js"></script>',
 	'<link type="text/css" href="js/jquery/css/jquery-ui.custom.css" rel="Stylesheet" />';
-	
+
 if ($BROWSERTYPE!='other') {
 	echo '<link type="text/css" href="', WT_THEME_DIR, 'jquery/jquery-ui_theme.css" rel="Stylesheet" />';
 }
diff --git a/themes/fab/theme.php b/themes/fab/theme.php
index 5c93c117e7..8a25b1dd53 100644
--- a/themes/fab/theme.php
+++ b/themes/fab/theme.php
@@ -198,7 +198,7 @@ $Darrowwidth=15; // additional width to include for the up arrows
 $CHARTS_CLOSE_HTML=true; // should the charts, pedigree, descendacy, etc close the HTML on the page
 
 // The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels
-$WT_STATS_S_CHART_X=440; 
+$WT_STATS_S_CHART_X=440;
 $WT_STATS_S_CHART_Y=125;
 $WT_STATS_L_CHART_X=900;
 
diff --git a/themes/minimal/header.php b/themes/minimal/header.php
index 628ae527c4..5dda177c6e 100644
--- a/themes/minimal/header.php
+++ b/themes/minimal/header.php
@@ -37,7 +37,7 @@ if (!defined('WT_WEBTREES')) {
 <html xmlns="http://www.w3.org/1999/xhtml" <?php echo i18n::html_markup(); ?>>
 	<head>
 		<?php if (isset($_GET["mod_action"]) && $_GET["mod_action"]=="places_edit") { ?>
-			<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <?php } 
+			<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <?php }
 		?>
 		<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 		<title><?php echo htmlspecialchars($title); ?></title>
diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
index 04f2cf9c80..96da53e7b0 100644
--- a/themes/webtrees/header.php
+++ b/themes/webtrees/header.php
@@ -41,7 +41,7 @@ echo
 	'<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />';
 
 
-if (isset($_GET["mod_action"]) && $_GET["mod_action"]=="places_edit") { 
+if (isset($_GET["mod_action"]) && $_GET["mod_action"]=="places_edit") {
 	echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />';
 }
 
@@ -86,8 +86,8 @@ echo
 	'<link type="text/css" href="', WT_THEME_DIR, 'modules.css" rel="Stylesheet" />',
 	'</head>',
 	'<body id="body" ',$bodyOnLoad, '>';
-	
-// begin header section 
+
+// begin header section
 if ($view!='simple') {
 	echo '<div id="header" class="', $TEXT_DIRECTION, '">',
 	'<table width="100%">',
diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php
index 843e82fa25..7b16f84915 100644
--- a/themes/webtrees/theme.php
+++ b/themes/webtrees/theme.php
@@ -192,7 +192,7 @@ $bxspacing=0;    // -- horizontal spacing between boxes on the pedigree chart
 $byspacing=5;    // -- vertical spacing between boxes on the pedigree chart
 $brborder=1;     // -- box right border thickness
 
-// -- descendancy chart variables 
+// -- descendancy chart variables
 $Dbaseyoffset=0; // -- position the entire descendancy tree relative to the top of the page
 $Dbasexoffset=0; // -- position the entire descendancy tree relative to the left of the page
 $Dbxspacing=0;   // -- horizontal spacing between boxes
diff --git a/themes/xenea/header.php b/themes/xenea/header.php
index 2ffbce692b..f6fda95e8c 100644
--- a/themes/xenea/header.php
+++ b/themes/xenea/header.php
@@ -41,7 +41,7 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA
 <html xmlns="http://www.w3.org/1999/xhtml" <?php echo i18n::html_markup(); ?>>
 	<head>
 		<?php if (isset($_GET["mod_action"]) && $_GET["mod_action"]=="places_edit") { ?>
-			<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <?php } 
+			<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <?php }
 		?>
 		<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
author	fisharebest <fisharebest@gmail.com>	2010-09-25 19:25:10 +0000
committer	fisharebest <fisharebest@gmail.com>	2010-09-25 19:25:10 +0000
commit	8e34d70b279a52c64eec2f2b727416f7b1b1bca3 (patch)
tree	c4b382be493795aa5c0b1bccce173b0897540970
parent	c3c1e07595f0efb20d13c858d96810dc7ed295ad (diff)
download	webtrees-8e34d70b279a52c64eec2f2b727416f7b1b1bca3.tar.gz webtrees-8e34d70b279a52c64eec2f2b727416f7b1b1bca3.tar.bz2 webtrees-8e34d70b279a52c64eec2f2b727416f7b1b1bca3.zip