diff options
Diffstat (limited to 'modules/googlemap')
| -rw-r--r-- | modules/googlemap/admin_placecheck.php | 8 | ||||
| -rw-r--r-- | modules/googlemap/places_edit.php | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/modules/googlemap/admin_placecheck.php b/modules/googlemap/admin_placecheck.php index 5df2efcde4..d8a7cd032e 100644 --- a/modules/googlemap/admin_placecheck.php +++ b/modules/googlemap/admin_placecheck.php @@ -40,6 +40,9 @@ $gedcom_id=safe_POST ('gedcom_id', array_keys(get_all_gedcoms()), WT_GED_ID) $openinnew=safe_POST_bool('openinnew' ); $state =safe_POST ('state', WT_REGEX_UNSAFE, 'XYZ' ); $country =safe_POST ('country', WT_REGEX_UNSAFE, 'XYZ' ); +if (isset($_REQUEST['show_changes']) && $_REQUEST['show_changes']=='yes') { + $_POST["matching"] = 1; +} // Must be an admin user to use this module if (!WT_USER_GEDCOM_ADMIN) { @@ -120,8 +123,9 @@ echo WT_I18N::translate('List filtering options'), help_link('PLACECHECK_FILTER' echo "</th></tr><tr><td>"; echo WT_I18N::translate('Include fully matched places: '), help_link('PLACECHECK_MATCH','googlemap'); echo "</td><td><input type=\"checkbox\" name=\"matching\" value=\"active\""; -if ($matching==1) { +if ($matching) { echo " checked=\"checked\""; + $action = 'go'; } echo "></td></tr>"; echo "</table>"; @@ -309,7 +313,7 @@ case 'go': $mapstr4=$mapstr4."&parent[".$z."]=".addslashes(PrintReady(rtrim(ltrim($levels[$z])))); $z++; } - if ($matching==1) { + if ($matching) { $matched[$x]=1; } if ($matched[$x]!=0) { diff --git a/modules/googlemap/places_edit.php b/modules/googlemap/places_edit.php index 8b14399c24..20f5aa8278 100644 --- a/modules/googlemap/places_edit.php +++ b/modules/googlemap/places_edit.php @@ -103,9 +103,9 @@ if ($action=='addrecord' && WT_USER_IS_ADMIN) { // autoclose window when update successful unless debug on if (!WT_DEBUG) { - echo "\n<script type=\"text/javascript\">\n<!--\nedit_close('{$link}');\n//-->\n</script>"; + echo "\n<script type=\"text/javascript\">\n<!--\nedit_close('');\n//-->\n</script>"; } - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('{$link}');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; + echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; print_simple_footer(); exit; } @@ -122,9 +122,9 @@ if ($action=='updaterecord' && WT_USER_IS_ADMIN) { // autoclose window when update successful unless debug on if (!WT_DEBUG) { - echo "\n<script type=\"text/javascript\">\n<!--\nedit_close('{$link}');\n//-->\n</script>"; + echo "\n<script type=\"text/javascript\">\n<!--\nedit_close('');\n//-->\n</script>"; } - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('{$link}');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; + echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; print_simple_footer(); exit; } @@ -777,6 +777,6 @@ if ($action=="add") { <input name="save2" type="submit" value="<?php echo WT_I18N::translate('Save'); ?>" /><br /> </form> <?php -echo "<center><br /><br /><br /><a href=\"javascript:;\" onclick=\"edit_close('{$link}')\">", WT_I18N::translate('Close Window'), "</a><br /></center>\n"; +echo "<center><br /><br /><br /><a href=\"javascript:;\" onclick=\"edit_close('')\">", WT_I18N::translate('Close Window'), "</a><br /></center>\n"; print_simple_footer(); |