summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addmedia.php8
-rw-r--r--familybook.php4
-rw-r--r--hourglass.php2
-rw-r--r--modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php2
-rw-r--r--modules_v3/googlemap/module.php12
-rw-r--r--modules_v3/random_media/module.php160
-rw-r--r--modules_v3/relatives/module.php2
-rw-r--r--modules_v3/sources_tab/module.php2
-rw-r--r--pedigree.php2
9 files changed, 113 insertions, 81 deletions
diff --git a/addmedia.php b/addmedia.php
index f64b08cedf..316809970c 100644
--- a/addmedia.php
+++ b/addmedia.php
@@ -678,12 +678,12 @@ if (!empty($gedrec)) {
}
}
if (Auth::isAdmin()) {
- echo "<tr><td class=\"descriptionbox wrap width25\">";
- echo WT_Gedcom_Tag::getLabel('CHAN'), "</td><td class=\"optionbox wrap\">";
+ echo '<tr><td class="descriptionbox wrap width25">';
+ echo WT_Gedcom_Tag::getLabel('CHAN'), '</td><td class="optionbox wrap">';
if ($NO_UPDATE_CHAN) {
- echo "<input type=\"checkbox\" checked=\"checked\" name=\"preserve_last_changed\">";
+ echo '<input type="checkbox" checked= name="preserve_last_changed">';
} else {
- echo "<input type=\"checkbox\" name=\"preserve_last_changed\">";
+ echo '<input type="checkbox" name="preserve_last_changed">';
}
echo WT_I18N::translate('Do not update the “last change” record'), help_link('no_update_CHAN'), '<br>';
echo '</td></tr>';
diff --git a/familybook.php b/familybook.php
index 59cbf3425f..07e8c2d141 100644
--- a/familybook.php
+++ b/familybook.php
@@ -49,7 +49,7 @@ $controller
</td>
<td class="optionbox">
<input type="hidden" name="show_full" value="<?php echo $controller->show_full; ?>">
- <input type="checkbox" value="<?php if ($controller->show_full) echo "1\" checked=\"checked\" onclick=\"document.people.show_full.value='0';"; else echo "0\" onclick=\"document.people.show_full.value='1';"; ?>">
+ <input type="checkbox" value="<?php if ($controller->show_full) echo "1\" checked= onclick=\"document.people.show_full.value='0';"; else echo "0\" onclick=\"document.people.show_full.value='1';"; ?>">
</td>
<td rowspan="3" class="topbottombar vmiddle">
<input type="submit" value="<?php echo /* I18N: Submit button, on a form */ WT_I18N::translate('View'); ?>">
@@ -74,7 +74,7 @@ $controller
<?php echo WT_I18N::translate('Show spouses'), help_link('show_spouse'); ?>
</td>
<td class="optionbox">
- <input type="checkbox" value="1" name="show_spouse" <?php if ($controller->show_spouse) echo " checked=\"checked\""; ?>>
+ <input type="checkbox" value="1" name="show_spouse" <?php if ($controller->show_spouse) echo " checked"; ?>>
</td>
</tr>
<tr>
diff --git a/hourglass.php b/hourglass.php
index fa2a1d885e..f5cc82ad32 100644
--- a/hourglass.php
+++ b/hourglass.php
@@ -55,7 +55,7 @@ $gencount = 0;
<?php echo WT_I18N::translate('Show details'); ?>
</td>
<td class="optionbox">
- <input type="checkbox" value="<?php if ($controller->show_full) echo "1\" checked=\"checked\" onclick=\"document.people.show_full.value='0';"; else echo "0\" onclick=\"document.people.show_full.value='1';"; ?>">
+ <input type="checkbox" value="<?php if ($controller->show_full) echo "1\" checked onclick=\"document.people.show_full.value='0';"; else echo "0\" onclick=\"document.people.show_full.value='1';"; ?>">
</td>
<td rowspan="3" class="topbottombar vmiddle">
<input type="submit" value="<?php echo WT_I18N::translate('View'); ?>">
diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 2d408305ab..7e238090a5 100644
--- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -573,7 +573,7 @@ function shiftlinks() {
echo "<tr><td class=\"descriptionbox wrap width25\">";
echo WT_Gedcom_Tag::getLabel('CHAN'), "</td><td class=\"optionbox wrap\">";
if ($NO_UPDATE_CHAN) {
- echo "<input type=\"checkbox\" checked=\"checked\" name=\"preserve_last_changed\">";
+ echo "<input type=\"checkbox\" checked name=\"preserve_last_changed\">";
} else {
echo "<input type=\"checkbox\" name=\"preserve_last_changed\">";
}
diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php
index a61cb1ce90..a047e1bc60 100644
--- a/modules_v3/googlemap/module.php
+++ b/modules_v3/googlemap/module.php
@@ -3996,17 +3996,17 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
}
?>
<td class="optionbox" colspan="2">
- <input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) echo "checked=\"checked\""; ?> value="<?php echo $this->getSetting('GM_PRECISION_0'); ?>">
+ <input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_0'); ?>">
<label for="new_prec_0"><?php echo WT_I18N::translate('Country'); ?></label>
- <input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) echo "checked=\"checked\""; ?> value="<?php echo $this->getSetting('GM_PRECISION_1'); ?>">
+ <input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_1'); ?>">
<label for="new_prec_1"><?php echo WT_I18N::translate('State'); ?></label>
- <input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_2')) echo "checked=\"checked\""; ?> value="<?php echo $this->getSetting('GM_PRECISION_2'); ?>">
+ <input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_2')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_2'); ?>">
<label for="new_prec_2"><?php echo WT_I18N::translate('City'); ?></label>
- <input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_3')) echo "checked=\"checked\""; ?> value="<?php echo $this->getSetting('GM_PRECISION_3'); ?>">
+ <input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_3')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_3'); ?>">
<label for="new_prec_3"><?php echo WT_I18N::translate('Neighborhood'); ?></label>
- <input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_4')) echo "checked=\"checked\""; ?> value="<?php echo $this->getSetting('GM_PRECISION_4'); ?>">
+ <input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_4')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_4'); ?>">
<label for="new_prec_4"><?php echo WT_I18N::translate('House'); ?></label>
- <input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision >= $this->getSetting('GM_PRECISION_5')) echo "checked=\"checked\""; ?> value="<?php echo $this->getSetting('GM_PRECISION_5'); ?>">
+ <input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision >= $this->getSetting('GM_PRECISION_5')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_5'); ?>">
<label for="new_prec_5"><?php echo WT_I18N::translate('Max'); ?></label>
</td>
</tr>
diff --git a/modules_v3/random_media/module.php b/modules_v3/random_media/module.php
index 853f29f0ac..d3612086d9 100644
--- a/modules_v3/random_media/module.php
+++ b/modules_v3/random_media/module.php
@@ -295,76 +295,108 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
echo '<tr><td class="descriptionbox wrap width33">';
echo WT_I18N::translate('Filter');
-?>
+ ?>
</td>
- <td class="optionbox">
- <center><b><?php echo WT_Gedcom_Tag::getLabel('FORM'); ?></b></center>
- <table class="width100">
- <tr>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_avi"
- <?php if ($filters['avi']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;avi&nbsp;&nbsp;</td>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_bmp"
- <?php if ($filters['bmp']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;bmp&nbsp;&nbsp;</td>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_gif"
- <?php if ($filters['gif']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;gif&nbsp;&nbsp;</td>
- </tr>
- <tr>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_jpeg"
- <?php if ($filters['jpeg']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;jpeg&nbsp;&nbsp;</td>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_mp3"
- <?php if ($filters['mp3']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;mp3&nbsp;&nbsp;</td>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_ole"
- <?php if ($filters['ole']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;ole&nbsp;&nbsp;</td>
- </tr>
- <tr>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_pcx"
- <?php if ($filters['pcx']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;pcx&nbsp;&nbsp;</td>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_pdf"
- <?php if ($filters['pdf']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;pdf&nbsp;&nbsp;</td>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_png"
- <?php if ($filters['png']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;png&nbsp;&nbsp;</td>
- </tr>
- <tr>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_tiff"
- <?php if ($filters['tiff']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;tiff&nbsp;&nbsp;</td>
- <td class="width33"><input type="checkbox" value="yes"
- name="filter_wav"
- <?php if ($filters['wav']) echo " checked=\"checked\""; ?>>&nbsp;&nbsp;wav&nbsp;&nbsp;</td>
- <td class="width33"></td>
- <td class="width33"></td>
- </tr>
- </table>
+ <td class="optionbox">
+ <center><b><?php echo WT_Gedcom_Tag::getLabel('FORM'); ?></b></center>
+ <table class="width100">
+ <tr>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_avi" <?php echo $filters['avi'] ? 'checked' : ''; ?>>
+ avi
+ </td>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_bmp" <?php echo $filters['bmp'] ? 'checked' : ''; ?>>
+ bmp
+ </label>
+ </td>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_gif" <?php echo $filters['gif'] ? 'checked' : ''; ?>>
+ gif
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_jpeg" <?php echo $filters['jpeg'] ? 'checked' : ''; ?>>
+ jpeg
+ </label>
+ </td>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_mp3" <?php echo $filters['mp3'] ? 'checked' : ''; ?>>
+ mp3
+ </label>
+ </td>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_ole" <?php echo $filters['ole'] ? 'checked' : ''; ?>>
+ ole
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_pcx" <?php echo $filters['pcx'] ? 'checked' : ''; ?>>
+ pcx
+ </label>
+ </td>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_pdf" <?php echo $filters['pdf'] ? 'checked' : ''; ?>>
+ pdf
+ </label>
+ </td>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_png" <?php echo $filters['png'] ? 'checked' : ''; ?>>
+ png
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_tiff" <?php echo $filters['tiff'] ? 'checked' : ''; ?>>
+ tiff
+ </label>
+ </td>
+ <td class="width33">
+ <label>
+ <input type="checkbox" value="yes" name="filter_wav" <?php echo $filters['wav'] ? 'checked' : ''; ?>>
+ wav
+ </label>
+ </td>
+ <td class="width33"></td>
+ <td class="width33"></td>
+ </tr>
+ </table>
<br>
<center><b><?php echo WT_Gedcom_Tag::getLabel('TYPE'); ?></b></center>
- <table class="width100">
- <tr>
- <?php
- //-- Build the list of checkboxes
- $i = 0;
- foreach (WT_Gedcom_Tag::getFileFormTypes() as $typeName => $typeValue) {
- $i++;
- if ($i > 3) {
- $i = 1;
- echo "</tr><tr>";
+ <table class="width100">
+ <tr>
+ <?php
+ //-- Build the list of checkboxes
+ $i = 0;
+ foreach (WT_Gedcom_Tag::getFileFormTypes() as $typeName => $typeValue) {
+ $i++;
+ if ($i > 3) {
+ $i = 1;
+ echo '</tr><tr>';
+ }
+ echo '<td class="width33"><label><input type="checkbox" value="yes" name="filter_' . $typeName . '" ';
+ echo ($filters[$typeName]) ? 'checked' : '';
+ echo '> ' . $typeValue . '</label></td>';
}
- echo "<td class=\"width33\"><input type=\"checkbox\" value=\"yes\" name=\"filter_" . $typeName . "\"";
- if ($filters[$typeName]) echo " checked=\"checked\"";
- echo ">&nbsp;&nbsp;" . $typeValue . "&nbsp;&nbsp;</td>";
- }
- ?>
+ ?>
</tr>
</table>
- </td>
+ </td>
</tr>
<?php
diff --git a/modules_v3/relatives/module.php b/modules_v3/relatives/module.php
index c3c02ee827..a15c24663b 100644
--- a/modules_v3/relatives/module.php
+++ b/modules_v3/relatives/module.php
@@ -288,7 +288,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
ob_start();
?>
<table class="facts_table"><tr><td class="descriptionbox rela">
- <input id="checkbox_elder" type="checkbox" onclick="jQuery('div.elderdate').toggle();" <?php if ($SHOW_AGE_DIFF) echo "checked=\"checked\""; ?>>
+ <input id="checkbox_elder" type="checkbox" onclick="jQuery('div.elderdate').toggle();" <?php echo $SHOW_AGE_DIFF ? 'checked' : ''; ?>>
<label for="checkbox_elder"><?php echo WT_I18N::translate('Show date differences'); ?></label>
</td></tr></table>
<?php
diff --git a/modules_v3/sources_tab/module.php b/modules_v3/sources_tab/module.php
index d68e131ef3..913183edcb 100644
--- a/modules_v3/sources_tab/module.php
+++ b/modules_v3/sources_tab/module.php
@@ -59,7 +59,7 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab {
<table class="facts_table">
<tr>
<td colspan="2" class="descriptionbox rela">
- <input id="checkbox_sour2" type="checkbox" <?php if ($SHOW_LEVEL2_NOTES) echo " checked=\"checked\""; ?> onclick="jQuery('tr.row_sour2').toggle();">
+ <input id="checkbox_sour2" type="checkbox" <?php echo $SHOW_LEVEL2_NOTES ? 'checked' : ''; ?> onclick="jQuery('tr.row_sour2').toggle();">
<label for="checkbox_sour2"><?php echo WT_I18N::translate('Show all sources'), help_link('show_fact_sources'); ?></label>
</td>
</tr>
diff --git a/pedigree.php b/pedigree.php
index 04bbb9e7b5..7a622dc67e 100644
--- a/pedigree.php
+++ b/pedigree.php
@@ -75,7 +75,7 @@ $controller
</td>
<td class="optionbox center">
<input type="checkbox" value="<?php if ($controller->show_full) {
- echo "1\" checked=\"checked\" onclick=\"document.people.show_full.value='0';";
+ echo "1\" checked onclick=\"document.people.show_full.value='0';";
} else {
echo "0\" onclick=\"document.people.show_full.value='1';";
} ?>">