Functions should return HTML, rather than output it

11 files changed, 21 insertions, 24 deletions

diff --git a/modules_v3/GEDFact_assistant/_CENS/census_4_text.php b/modules_v3/GEDFact_assistant/_CENS/census_4_text.php
index 4a85603f7e..65439adde9 100644
--- a/modules_v3/GEDFact_assistant/_CENS/census_4_text.php
+++ b/modules_v3/GEDFact_assistant/_CENS/census_4_text.php
@@ -46,7 +46,7 @@ if (!defined('WT_WEBTREES')) {
 	<div class="optionbox">
 		<textarea wrap="off" name="NOTE" id="NOTE"></textarea><br>
 		<center>
-		<?php print_specialchar_link('NOTE',true); ?>
+		<?php echo print_specialchar_link('NOTE'); ?>
 		</center>
 	</div>
 </div>
diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 8dafbeb92f..68ea9ed0df 100644
--- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -189,12 +189,9 @@ if ($action == 'choose' && $paramok) {
 			} else {
 			echo '<button name="addLink" value="" type="button" onclick="blankwin(); return false;">', WT_I18N::translate('Add'), '</button>';
 		}
-		echo '&nbsp;&nbsp;&nbsp;&nbsp;';
-		print_findindi_link("gid", "");
-		echo '&nbsp;';
-		print_findfamily_link("gid");
-		echo '&nbsp;';
-		print_findsource_link("gid");
+		echo ' ', print_findindi_link('gid');
+		echo ' ', print_findfamily_link('gid');
+		echo ' ', print_findsource_link('gid');
 	echo '</td></tr></table>';
 	echo "<sub>" . WT_I18N::translate('Enter or search for the ID of the person, family, or source to which this media item should be linked.') . "</sub>";
 
diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php
index bef1ca37ee..cb14b9b84d 100644
--- a/modules_v3/charts/module.php
+++ b/modules_v3/charts/module.php
@@ -229,7 +229,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 			<td class="optionbox">
 				<input type="text" name="pid" id="pid" value="<?php echo $pid; ?>" size="5">
 				<?php
-				print_findindi_link('pid','');
+				echo print_findindi_link('pid');
 				$root=WT_Person::getInstance($pid);
 				if ($root) {
 					echo ' <span class="list_item">', $root->getFullName(), $root->format_first_major_fact(WT_EVENTS_BIRT, 1), '</span>';
diff --git a/modules_v3/clippings/module.php b/modules_v3/clippings/module.php
index 95127438fc..b8bdc523d1 100644
--- a/modules_v3/clippings/module.php
+++ b/modules_v3/clippings/module.php
@@ -164,7 +164,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 							<input type="text" name="id" id="cart_item_id" size="5">
 						</td>
 						<td class="optionbox">
-							<?php print_findindi_link('cart_item_id', ''); ?>
+							<?php echo print_findindi_link('cart_item_id'); ?>
 							<?php print_findfamily_link('cart_item_id', ''); ?>
 							<?php print_findsource_link('cart_item_id', ''); ?>
 							<input type="submit" value="<?php echo WT_I18N::translate('Add'); ?>">
@@ -259,9 +259,9 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 							<input type="text" name="id" id="cart_item_id" size="8">
 						</td>
 						<td class="optionbox">
-							<?php print_findindi_link('cart_item_id', ''); ?>
-							<?php print_findfamily_link('cart_item_id', ''); ?>
-							<?php print_findsource_link('cart_item_id', ''); ?>
+							<?php echo print_findindi_link('cart_item_id'); ?>
+							<?php echo print_findfamily_link('cart_item_id'); ?>
+							<?php echo print_findsource_link('cart_item_id'); ?>
 							<input type="submit" value="<?php echo WT_I18N::translate('Add'); ?>">
 
 						</td>
diff --git a/modules_v3/descendancy/module.php b/modules_v3/descendancy/module.php
index 18f161f039..91661ca1c4 100644
--- a/modules_v3/descendancy/module.php
+++ b/modules_v3/descendancy/module.php
@@ -126,7 +126,7 @@ class descendancy_WT_Module extends WT_Module implements WT_Module_Sidebar {
 
 		return
 			'<form method="post" action="module.php?mod='.$this->getName().'&amp;mod_action=ajax" onsubmit="return false;">'.
-			'<input type="text" name="sb_desc_name" id="sb_desc_name" placeholder="'.WT_I18N::translate('Search').'">'.
+			'<input type="search" name="sb_desc_name" id="sb_desc_name" placeholder="'.WT_I18N::translate('Search').'">'.
 			'</form>'.
 			'<div id="sb_desc_content">'.
 			'<ul>'.$this->getPersonLi($controller->record, 1).'</ul>'.
diff --git a/modules_v3/families/module.php b/modules_v3/families/module.php
index 9bb2e886f8..31f5558fc1 100644
--- a/modules_v3/families/module.php
+++ b/modules_v3/families/module.php
@@ -140,7 +140,7 @@ class families_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		');
 		$out=
 			'<form method="post" action="module.php?mod='.$this->getName().'&amp;mod_action=ajax" onsubmit="return false;">'.
-			'<input type="text" name="sb_fam_name" id="sb_fam_name" placeholder="'.WT_I18N::translate('Search').'">'.
+			'<input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="'.WT_I18N::translate('Search').'">'.
 			'<p>';
 		foreach ($initials as $letter=>$count) {
 			switch ($letter) {
diff --git a/modules_v3/gedcom_favorites/module.php b/modules_v3/gedcom_favorites/module.php
index 848b71431d..31e229a9cb 100644
--- a/modules_v3/gedcom_favorites/module.php
+++ b/modules_v3/gedcom_favorites/module.php
@@ -207,12 +207,12 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 			$content .= "<tr><td>".WT_I18N::translate('Enter a Person, Family, or Source ID')." <br>";
 			$content .= "<input class=\"pedigree_form\" type=\"text\" name=\"gid\" id=\"gid{$uniqueID}\" size=\"5\" value=\"\">";
 
-			$content .= print_findindi_link("gid{$uniqueID}",'',true);
-			$content .= print_findfamily_link("gid{$uniqueID}",'',true);
-			$content .= print_findsource_link("gid{$uniqueID}",'',true);
-			$content .= print_findrepository_link("gid{$uniqueID}",'',true);
-			$content .= print_findnote_link("gid{$uniqueID}",'',true);
-			$content .= print_findmedia_link("gid{$uniqueID}",'1','',true);
+			$content .= ' '.print_findindi_link('gid'.$uniqueID);
+			$content .= ' '.print_findfamily_link('gid'.$uniqueID);
+			$content .= ' '.print_findsource_link('gid'.$uniqueID);
+			$content .= ' '.print_findrepository_link('gid'.$uniqueID);
+			$content .= ' '.print_findnote_link('gid'.$uniqueID);
+			$content .= ' '.print_findmedia_link('gid'.$uniqueID);
 
 			$content .= "<br>".WT_I18N::translate('OR<br />Enter a URL and a title');
 			$content .= "<table><tr><td>".WT_Gedcom_Tag::getLabel('URL')."</td><td><input type=\"text\" name=\"url\" size=\"40\" value=\"\"></td></tr>";
diff --git a/modules_v3/googlemap/pedigree_map.php b/modules_v3/googlemap/pedigree_map.php
index 4265c377e4..5691a134d3 100644
--- a/modules_v3/googlemap/pedigree_map.php
+++ b/modules_v3/googlemap/pedigree_map.php
@@ -112,7 +112,7 @@ echo '<h2>', $controller->getPageTitle(), '</h2>';
 			<tr>
 				<td class="optionbox">
 					<input class="pedigree_form" type="text" id="rootid" name="rootid" size="3" value="<?php echo $controller->root->getXref(); ?>">
-					<?php print_findindi_link("rootid",""); ?>
+					<?php echo print_findindi_link('rootid'); ?>
 				</td>
 				<td class="optionbox">
 					<select name="PEDIGREE_GENERATIONS">
diff --git a/modules_v3/googlemap/places_edit.php b/modules_v3/googlemap/places_edit.php
index 839f0eec4e..b9e4923133 100644
--- a/modules_v3/googlemap/places_edit.php
+++ b/modules_v3/googlemap/places_edit.php
@@ -276,7 +276,7 @@ $api='v3';
 		<td class="descriptionbox"><?php echo WT_Gedcom_Tag::getLabel('PLAC'); ?></td>
 		 <td class="optionbox"><input type="text" id="new_pl_name" name="NEW_PLACE_NAME" value="<?php echo htmlspecialchars($place_name); ?>" size="25" class="address_input">
 			<div id="INDI_PLAC_pop" style="display: inline;">
-			<?php print_specialchar_link("NEW_PLACE_NAME", false); ?></div></td><td class="optionbox">
+			<?php echo print_specialchar_link('NEW_PLACE_NAME'); ?></div></td><td class="optionbox">
 			<label for="new_pl_name"><a href="#" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo WT_I18N::translate('Search globally'); ?></a></label>
 			&nbsp;&nbsp;|&nbsp;&nbsp;
 			<label for="new_pl_name"><a href="#" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo WT_I18N::translate('Search locally'); ?></a></label>
diff --git a/modules_v3/individuals/module.php b/modules_v3/individuals/module.php
index 4ffc1f82f0..3f55de9d62 100644
--- a/modules_v3/individuals/module.php
+++ b/modules_v3/individuals/module.php
@@ -142,7 +142,7 @@ class individuals_WT_Module extends WT_Module implements WT_Module_Sidebar {
 		
 		$out='
 		<form method="post" action="module.php?mod='.$this->getName().'&amp;mod_action=ajax" onsubmit="return false;">
-		<input type="text" name="sb_indi_name" id="sb_indi_name" placeholder="'.WT_I18N::translate('Search').'">
+		<input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="'.WT_I18N::translate('Search').'">
 		<p>';
 		foreach ($initials as $letter=>$count) {
 			switch ($letter) {
diff --git a/modules_v3/stories/module.php b/modules_v3/stories/module.php
index dea9614da0..2f1e424854 100644
--- a/modules_v3/stories/module.php
+++ b/modules_v3/stories/module.php
@@ -274,7 +274,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_
 				echo '<tr>';
 				echo '<td class="optionbox">';
 				echo '<input type="text" name="xref" id="pid" size="4" value="'.$xref.'">';
-				print_findindi_link("pid", "xref");
+				echo print_findindi_link('pid');
 				if ($xref) {
 					$person=WT_Person::getInstance($xref);
 					if ($person) {