diff options
Diffstat (limited to 'modules_v3')
121 files changed, 501 insertions, 572 deletions
diff --git a/modules_v3/GEDFact_assistant/CENS_ctrl.php b/modules_v3/GEDFact_assistant/CENS_ctrl.php index b103107c43..d5eb11193e 100644 --- a/modules_v3/GEDFact_assistant/CENS_ctrl.php +++ b/modules_v3/GEDFact_assistant/CENS_ctrl.php @@ -4,7 +4,7 @@ // GEDFact Census information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA $xref = WT_Filter::get('xref', WT_REGEX_XREF); diff --git a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php index 81a70c9b28..2854fb8bb1 100644 --- a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php +++ b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php @@ -4,7 +4,7 @@ // GEDFact information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2008 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA $controller=new WT_Controller_Individual(); diff --git a/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php b/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php index e1bf42993d..6ca5019dde 100644 --- a/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php +++ b/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php @@ -2,7 +2,7 @@ // Include for GEDFact Assistant - Census. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // This file is required by the addnoteaction_assisted function in edit_interface.php diff --git a/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php b/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php index 8684f625f2..968991b8e2 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php @@ -4,7 +4,7 @@ // Census information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/GEDFact_assistant/_CENS/census_2_source_input.php b/modules_v3/GEDFact_assistant/_CENS/census_2_source_input.php index c1c865544e..44fe01f1bd 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_2_source_input.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_2_source_input.php @@ -4,7 +4,7 @@ // Census and Souce Input Area File File // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2007 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -562,7 +562,7 @@ if (!defined('WT_WEBTREES')) { } var cens_ctry_a = document.getElementById('censCtry'); var cens_ctry = cens_ctry_a.value; - document.getElementById('Titl').value = '<?php echo WT_I18N::translate('Census transcript'),' - ',$wholename, ' - ', WT_I18N::translate('Household'); ?>'; + document.getElementById('Titl').value = '<?php echo WT_I18N::translate('Census transcript'),' - ', WT_Filter::escapeJs($wholename), ' - ', WT_I18N::translate('Household'); ?>'; var prev = document.getElementById('prevYear'); prev.value = cenyear; } @@ -1110,7 +1110,7 @@ if (!defined('WT_WEBTREES')) { <div class="cens_sour_1"> <div class="cens_sour_2"><?php echo WT_I18N::translate('Title'); ?></div> <script> - document.writeln('<input id="Titl" name="Titl" type="text" value="<?php echo WT_I18N::translate('Census transcript'),' - ',$wholename, ' - ', WT_I18N::translate('Household'); ?>">'); + document.writeln('<input id="Titl" name="Titl" type="text" value="<?php echo WT_I18N::translate('Census transcript'),' - ', WT_Filter::escapeJs($wholename), ' - ', WT_I18N::translate('Household'); ?>">'); </script> </div> <div class="cens_sour_1"> diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php index 79f57f9c8e..3d334fbd03 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php @@ -2,7 +2,7 @@ // Facility for Census assistant that will allow a user to search for a person // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA $controller=new WT_Controller_Simple(); diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php index 772603c9d3..058b544d0b 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php @@ -4,7 +4,7 @@ // Census Search and Add Area File // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2007 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -1271,7 +1271,6 @@ if (!defined('WT_WEBTREES')) { */ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $currpid, $censyear) { - global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $SCRIPT_NAME; global $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES; global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY; global $chart_style, $box_width, $generations, $show_spouse, $show_full; diff --git a/modules_v3/GEDFact_assistant/_CENS/census_4_text.php b/modules_v3/GEDFact_assistant/_CENS/census_4_text.php index 478f09b29c..67b0d48844 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_4_text.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_4_text.php @@ -4,7 +4,7 @@ // Census Proposed Text Area File // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2007 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/GEDFact_assistant/_CENS/census_5_input.php b/modules_v3/GEDFact_assistant/_CENS/census_5_input.php index 20fa38acbb..8f160a7d80 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_5_input.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_5_input.php @@ -4,7 +4,7 @@ // Census input table area // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA require WT_ROOT.WT_MODULES_DIR.'GEDFact_assistant/_CENS/js/census_5_input.js.php'; diff --git a/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php b/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php index 45d7e03e56..19fcb48321 100644 --- a/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php +++ b/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php @@ -4,7 +4,7 @@ // Census information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // modified from tabledeleterow.js version 1.2 2006-02-21 // mredkj.com diff --git a/modules_v3/GEDFact_assistant/_CENS/js/chapman_codes.js b/modules_v3/GEDFact_assistant/_CENS/js/chapman_codes.js index 2923901b4a..443c6f93af 100644 --- a/modules_v3/GEDFact_assistant/_CENS/js/chapman_codes.js +++ b/modules_v3/GEDFact_assistant/_CENS/js/chapman_codes.js @@ -3,7 +3,7 @@ // Chapman Code information // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -20,7 +20,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA function getChapmanCode(location) { // Countries diff --git a/modules_v3/GEDFact_assistant/_CENS/js/date.js b/modules_v3/GEDFact_assistant/_CENS/js/date.js index 7628b20b0f..4d6a0b5446 100644 --- a/modules_v3/GEDFact_assistant/_CENS/js/date.js +++ b/modules_v3/GEDFact_assistant/_CENS/js/date.js @@ -23,7 +23,7 @@ Date.$VERSION = 1.02; // Census information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -40,7 +40,7 @@ Date.$VERSION = 1.02; // // 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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // Utility function to append a 0 to single-digit numbers Date.LZ = function(x) {return(x<0||x>9?"":"0")+x}; diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php index fd9e181307..ec04709d2d 100644 --- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php +++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php @@ -4,7 +4,7 @@ // Media Link information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // GEDFact Media assistant replacement code for inverselink.php: =========================== diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php b/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php index 1dd745be19..f3f2c40871 100644 --- a/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php +++ b/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php @@ -4,7 +4,7 @@ // Media Link information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2008 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -537,7 +537,6 @@ if ($pid=="") { * @param string $pid the Gedcom Xref ID of the to print */ function print_pedigree_person_nav2($pid) { - global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES; global $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES; global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY; global $chart_style, $box_width, $generations, $show_spouse, $show_full; diff --git a/modules_v3/GEDFact_assistant/css/cens_style.css b/modules_v3/GEDFact_assistant/css/cens_style.css index 6ed9fa680b..607ec1c2ea 100644 --- a/modules_v3/GEDFact_assistant/css/cens_style.css +++ b/modules_v3/GEDFact_assistant/css/cens_style.css @@ -2,7 +2,7 @@ * Census Assistant module for webtrees * * webtrees: Web based Family History software - * Copyright (C) 2013 webtrees development team. + * Copyright (C) 2014 webtrees development team. * * Derived from PhpGedView * Copyright (C) 2002 to 2007 John Finlay and Others @@ -19,7 +19,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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ .cens_header {text-align:left; margin:5px; height:40px;} diff --git a/modules_v3/GEDFact_assistant/css/gf_styles.css b/modules_v3/GEDFact_assistant/css/gf_styles.css index 923650ec65..5edbbc8509 100644 --- a/modules_v3/GEDFact_assistant/css/gf_styles.css +++ b/modules_v3/GEDFact_assistant/css/gf_styles.css @@ -4,7 +4,7 @@ * Media Link information about an individual * * webtrees: Web based Family History software - * Copyright (C) 2013 webtrees development team. + * Copyright (C) 2014 webtrees development team. * * Derived from PhpGedView * Copyright (C) 2002 to 2007 John Finlay and Others @@ -21,7 +21,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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* --------- Styles used in /_MEDIA/media_3_search.php ---*/ diff --git a/modules_v3/GEDFact_assistant/module.php b/modules_v3/GEDFact_assistant/module.php index 6068ae9007..5651692bfc 100644 --- a/modules_v3/GEDFact_assistant/module.php +++ b/modules_v3/GEDFact_assistant/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -214,7 +214,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { // Convert custom markup into HTML public static function formatCensusNote(WT_Note $note) { - global $controller; + global $controller, $WT_TREE; $headers = array( 'AgM' => 'Age at first marriage', @@ -303,7 +303,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { '<p>' . $postamble . '</p>'; } else { // Not a census-assistant shared note - apply default formatting - return WT_Filter::expandUrls($note->getNote()); + return WT_Filter::formatText($note->getNote(), $WT_TREE); } } diff --git a/modules_v3/ahnentafel_report/module.php b/modules_v3/ahnentafel_report/module.php index ef72200194..85cf6a87b0 100644 --- a/modules_v3/ahnentafel_report/module.php +++ b/modules_v3/ahnentafel_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/batch_update/admin_batch_update.php b/modules_v3/batch_update/admin_batch_update.php index c948a698aa..b405ba484b 100644 --- a/modules_v3/batch_update/admin_batch_update.php +++ b/modules_v3/batch_update/admin_batch_update.php @@ -2,10 +2,7 @@ // Batch update module // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// -// Derived from PhpGedView -// Copyright (C) 2008 PGV Development Team. All rights reserved. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -341,8 +338,8 @@ class base_plugin { return '<tr><th>'.WT_I18N::translate('Do not update the “last change” record').'</th>'. '<td><select name="chan" onchange="this.form.submit();">'. - '<option value="yes"' . ($this->chan ? '' : ' selected="selected"') . '>'.WT_I18N::translate('yes') .'</option>'. - '<option value="no"' . ($this->chan ? ' selected="selected"' : '') . '>'.WT_I18N::translate('no').'</option>'. + '<option value="0"' . ($this->chan ? '' : ' selected="selected"') . '>'.WT_I18N::translate('yes') .'</option>'. + '<option value="1"' . ($this->chan ? ' selected="selected"' : '') . '>'.WT_I18N::translate('no').'</option>'. '</select></td></tr>'; } diff --git a/modules_v3/batch_update/module.php b/modules_v3/batch_update/module.php index 6d912cb77b..bf18f50b8a 100644 --- a/modules_v3/batch_update/module.php +++ b/modules_v3/batch_update/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/batch_update/plugins/death_y.php b/modules_v3/batch_update/plugins/death_y.php index 8185dc1982..779d4df124 100644 --- a/modules_v3/batch_update/plugins/death_y.php +++ b/modules_v3/batch_update/plugins/death_y.php @@ -2,10 +2,7 @@ // Batch Update plugin for phpGedView - add missing 1 BIRT/DEAT Y // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// -// Derived from PhpGedView -// Copyright (C) 2008 Greg Roach. All rights reserved. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/batch_update/plugins/duplicate_links.php b/modules_v3/batch_update/plugins/duplicate_links.php index c7d23f4022..587fbf8dc2 100644 --- a/modules_v3/batch_update/plugins/duplicate_links.php +++ b/modules_v3/batch_update/plugins/duplicate_links.php @@ -2,10 +2,7 @@ // Batch Update plugin for phpGedView - remove duplicate links in records // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// -// Derived from PhpGedView -// Copyright (C) 2008 Greg Roach. All rights reserved. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/batch_update/plugins/married_names.php b/modules_v3/batch_update/plugins/married_names.php index 01eebbefae..c903ee0084 100644 --- a/modules_v3/batch_update/plugins/married_names.php +++ b/modules_v3/batch_update/plugins/married_names.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -107,4 +107,4 @@ class married_names_bu_plugin extends base_plugin { ($this->surname=='add' ? ' selected="selected"' : ''). '">'.WT_I18N::translate('Wife’s maiden surname becomes new given name').'</option></select></td></tr>'; } -}
\ No newline at end of file +} diff --git a/modules_v3/batch_update/plugins/name_format.php b/modules_v3/batch_update/plugins/name_format.php index aec23764d0..b710913740 100644 --- a/modules_v3/batch_update/plugins/name_format.php +++ b/modules_v3/batch_update/plugins/name_format.php @@ -2,10 +2,7 @@ // Batch Update plugin for phpGedView - fix spacing in names, particularly that before/after the surname slashes // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// -// Derived from PhpGedView -// Copyright (C) 2008 Greg Roach. All rights reserved. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -37,15 +34,15 @@ class name_format_bu_plugin extends base_plugin { static function doesRecordNeedUpdate($xref, $gedrec) { return - preg_match('/^(?:1 NAME|2 _MARNM|2 _AKA) [^\/\n]*\/[^\/\n]*$/m', $gedrec) || - preg_match('/^(?:1 NAME|2 _MARNM|2 _AKA) [^\/\n]*[^\/ ]\//m', $gedrec); + preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*$/m', $gedrec) || + preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*[^\/ ]\//m', $gedrec); } static function updateRecord($xref, $gedrec) { return preg_replace( array( - '/^((?:1 NAME|2 _MARNM|2 _AKA) [^\/\n]*\/[^\/\n]*)$/m', - '/^((?:1 NAME|2 _MARNM|2 _AKA) [^\/\n]*[^\/ ])(\/)/m' + '/^((?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*)$/m', + '/^((?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*[^\/ ])(\/)/m' ), array( '$1/', diff --git a/modules_v3/batch_update/plugins/search_replace.php b/modules_v3/batch_update/plugins/search_replace.php index 1c2636183a..8314b10241 100644 --- a/modules_v3/batch_update/plugins/search_replace.php +++ b/modules_v3/batch_update/plugins/search_replace.php @@ -2,7 +2,7 @@ // Batch Update plugin for phpGedView - search/replace // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/bdm_report/module.php b/modules_v3/bdm_report/module.php index ccf10302fe..0e79db1a65 100644 --- a/modules_v3/bdm_report/module.php +++ b/modules_v3/bdm_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/birth_report/module.php b/modules_v3/birth_report/module.php index 9b942095c2..0f025a6bd3 100644 --- a/modules_v3/birth_report/module.php +++ b/modules_v3/birth_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/cemetery_report/module.php b/modules_v3/cemetery_report/module.php index def9ef0fbd..6e6b188259 100644 --- a/modules_v3/cemetery_report/module.php +++ b/modules_v3/cemetery_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/change_report/module.php b/modules_v3/change_report/module.php index 6c92435610..fd2e34ae73 100644 --- a/modules_v3/change_report/module.php +++ b/modules_v3/change_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/charts/help_text.php b/modules_v3/charts/help_text.php index 27477a2d6e..dd5a7bd254 100644 --- a/modules_v3/charts/help_text.php +++ b/modules_v3/charts/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php index e9bd8205d1..b10311196e 100644 --- a/modules_v3/charts/module.php +++ b/modules_v3/charts/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/ckeditor/ckeditor-4.2.2-custom/LICENSE.md b/modules_v3/ckeditor/ckeditor-4.2.2-custom/LICENSE.md index cf70e61e62..0ddd13bf0b 100644 --- a/modules_v3/ckeditor/ckeditor-4.2.2-custom/LICENSE.md +++ b/modules_v3/ckeditor/ckeditor-4.2.2-custom/LICENSE.md @@ -336,7 +336,7 @@ GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/modules_v3/ckeditor/module.php b/modules_v3/ckeditor/module.php index bed6a3ef6d..c456c7dc15 100755 --- a/modules_v3/ckeditor/module.php +++ b/modules_v3/ckeditor/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/clippings/clippings_ctrl.php b/modules_v3/clippings/clippings_ctrl.php index 1ba548014f..6b0b6a82e0 100644 --- a/modules_v3/clippings/clippings_ctrl.php +++ b/modules_v3/clippings/clippings_ctrl.php @@ -4,7 +4,7 @@ // NOTE THAT THIS IS NOT A PAGE CONTROLLER, AND DOES NOT EXTEND WT_CONTROLLER_BASE // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. @@ -21,7 +21,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/clippings/help_text.php b/modules_v3/clippings/help_text.php index 4c52c0a195..73d74e8c11 100644 --- a/modules_v3/clippings/help_text.php +++ b/modules_v3/clippings/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/clippings/module.php b/modules_v3/clippings/module.php index 0119262dfa..51f10d57a2 100644 --- a/modules_v3/clippings/module.php +++ b/modules_v3/clippings/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/death_report/module.php b/modules_v3/death_report/module.php index f6b1e57dac..d682719acb 100644 --- a/modules_v3/death_report/module.php +++ b/modules_v3/death_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/descendancy/module.php b/modules_v3/descendancy/module.php index 13607208cf..334464481b 100644 --- a/modules_v3/descendancy/module.php +++ b/modules_v3/descendancy/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/descendancy_report/module.php b/modules_v3/descendancy_report/module.php index 959eda2b7e..7f0df6ec67 100644 --- a/modules_v3/descendancy_report/module.php +++ b/modules_v3/descendancy_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/extra_info/module.php b/modules_v3/extra_info/module.php index edafc3d387..6aa5826964 100644 --- a/modules_v3/extra_info/module.php +++ b/modules_v3/extra_info/module.php @@ -2,7 +2,7 @@ // A sidebar to show extra/non-genealogical information about an individual // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/fact_sources/module.php b/modules_v3/fact_sources/module.php index c7258d35a7..fdf6b25c75 100644 --- a/modules_v3/fact_sources/module.php +++ b/modules_v3/fact_sources/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/families/module.php b/modules_v3/families/module.php index 396c8c2f67..5b65ca66b0 100644 --- a/modules_v3/families/module.php +++ b/modules_v3/families/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/family_group_report/module.php b/modules_v3/family_group_report/module.php index f3b57bc583..dfeb2e927d 100644 --- a/modules_v3/family_group_report/module.php +++ b/modules_v3/family_group_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/family_nav/module.php b/modules_v3/family_nav/module.php index 9d69499ab9..fd62383882 100644 --- a/modules_v3/family_nav/module.php +++ b/modules_v3/family_nav/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -108,8 +108,15 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { private function drawFamily(WT_Individual $root, WT_Family $family) { global $controller; global $spouselinks, $parentlinks; + global $SHOW_PRIVATE_RELATIONSHIPS; - foreach ($family->getFacts('HUSB') as $fact) { + if ($SHOW_PRIVATE_RELATIONSHIPS) { + $access_level = WT_PRIV_HIDE; + } else { + $access_level = WT_USER_ACCESS_LEVEL; + } + + foreach ($family->getFacts('HUSB', false, $access_level) as $fact) { $spouse = $fact->getTarget(); if ($spouse instanceof WT_Individual) { $menu = new WT_Menu(get_close_relationship_name($root, $spouse)); @@ -125,7 +132,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } } - foreach ($family->getFacts('WIFE') as $fact) { + foreach ($family->getFacts('WIFE', false, $access_level) as $fact) { $spouse = $fact->getTarget(); if ($spouse instanceof WT_Individual) { $menu = new WT_Menu(get_close_relationship_name($root, $spouse)); @@ -141,7 +148,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } } - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->getFacts('CHIL', false, $access_level) as $fact) { $child = $fact->getTarget(); if ($child instanceof WT_Individual) { $menu = new WT_Menu(get_close_relationship_name($root, $child)); diff --git a/modules_v3/faq/help_text.php b/modules_v3/faq/help_text.php index 4e5596ab41..fa4451c7d0 100644 --- a/modules_v3/faq/help_text.php +++ b/modules_v3/faq/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/faq/module.php b/modules_v3/faq/module.php index 6d20950d30..f0dedbbeff 100644 --- a/modules_v3/faq/module.php +++ b/modules_v3/faq/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_block/module.php b/modules_v3/gedcom_block/module.php index c31e2b29ec..b455cea24e 100644 --- a/modules_v3/gedcom_block/module.php +++ b/modules_v3/gedcom_block/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_favorites/db_schema/db_schema_0_1.php b/modules_v3/gedcom_favorites/db_schema/db_schema_0_1.php index 1d8cb95a56..ac240cc206 100644 --- a/modules_v3/gedcom_favorites/db_schema/db_schema_0_1.php +++ b/modules_v3/gedcom_favorites/db_schema/db_schema_0_1.php @@ -12,7 +12,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2009 Greg Roach @@ -29,7 +29,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_favorites/db_schema/db_schema_1_2.php b/modules_v3/gedcom_favorites/db_schema/db_schema_1_2.php index f883af46a2..6fb8df551f 100644 --- a/modules_v3/gedcom_favorites/db_schema/db_schema_1_2.php +++ b/modules_v3/gedcom_favorites/db_schema/db_schema_1_2.php @@ -9,7 +9,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_favorites/db_schema/db_schema_2_3.php b/modules_v3/gedcom_favorites/db_schema/db_schema_2_3.php index e303d63ed8..9d3e03587f 100644 --- a/modules_v3/gedcom_favorites/db_schema/db_schema_2_3.php +++ b/modules_v3/gedcom_favorites/db_schema/db_schema_2_3.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -24,7 +24,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_favorites/db_schema/db_schema_3_4.php b/modules_v3/gedcom_favorites/db_schema/db_schema_3_4.php index 20243f151c..c6b0051c88 100644 --- a/modules_v3/gedcom_favorites/db_schema/db_schema_3_4.php +++ b/modules_v3/gedcom_favorites/db_schema/db_schema_3_4.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -24,7 +24,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_favorites/module.php b/modules_v3/gedcom_favorites/module.php index 17bbf6bbf6..56ff589843 100644 --- a/modules_v3/gedcom_favorites/module.php +++ b/modules_v3/gedcom_favorites/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_news/db_schema/db_schema_0_1.php b/modules_v3/gedcom_news/db_schema/db_schema_0_1.php index da856118b4..c4a5fcada9 100644 --- a/modules_v3/gedcom_news/db_schema/db_schema_0_1.php +++ b/modules_v3/gedcom_news/db_schema/db_schema_0_1.php @@ -12,10 +12,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// -// Derived from PhpGedView -// Copyright (C) 2009 Greg Roach +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -29,7 +26,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_news/db_schema/db_schema_1_2.php b/modules_v3/gedcom_news/db_schema/db_schema_1_2.php index f26a5d4a75..8a3c534108 100644 --- a/modules_v3/gedcom_news/db_schema/db_schema_1_2.php +++ b/modules_v3/gedcom_news/db_schema/db_schema_1_2.php @@ -9,7 +9,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_news/db_schema/db_schema_2_3.php b/modules_v3/gedcom_news/db_schema/db_schema_2_3.php index e29522f403..5ff3810af6 100644 --- a/modules_v3/gedcom_news/db_schema/db_schema_2_3.php +++ b/modules_v3/gedcom_news/db_schema/db_schema_2_3.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -24,7 +24,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_news/module.php b/modules_v3/gedcom_news/module.php index ddaa9eb769..fcb1ca664f 100644 --- a/modules_v3/gedcom_news/module.php +++ b/modules_v3/gedcom_news/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/gedcom_stats/module.php b/modules_v3/gedcom_stats/module.php index 6cf5f21b15..8575bde9b4 100644 --- a/modules_v3/gedcom_stats/module.php +++ b/modules_v3/gedcom_stats/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/admin_places.php b/modules_v3/googlemap/admin_places.php index 3aed1fd254..41fb9cd96c 100644 --- a/modules_v3/googlemap/admin_places.php +++ b/modules_v3/googlemap/admin_places.php @@ -2,7 +2,7 @@ // Interface to edit place locations // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/css/wt_v3_googlemap.css b/modules_v3/googlemap/css/wt_v3_googlemap.css index a6546e60f0..02c598afc3 100644 --- a/modules_v3/googlemap/css/wt_v3_googlemap.css +++ b/modules_v3/googlemap/css/wt_v3_googlemap.css @@ -2,7 +2,7 @@ * webtrees googlemap V3 css * * webtrees: Web based Family History software - * Copyright (C) 2013 webtrees development team. + * Copyright (C) 2014 webtrees development team. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ div.infowindow { diff --git a/modules_v3/googlemap/db_schema/db_schema_0_1.php b/modules_v3/googlemap/db_schema/db_schema_0_1.php index c0ac5a7ac7..3f003ddcdd 100644 --- a/modules_v3/googlemap/db_schema/db_schema_0_1.php +++ b/modules_v3/googlemap/db_schema/db_schema_0_1.php @@ -12,10 +12,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// -// Derived from PhpGedView -// Copyright (C) 2009 Greg Roach +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -29,7 +26,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/db_schema/db_schema_1_2.php b/modules_v3/googlemap/db_schema/db_schema_1_2.php index 8c1f706842..35bf11a21f 100644 --- a/modules_v3/googlemap/db_schema/db_schema_1_2.php +++ b/modules_v3/googlemap/db_schema/db_schema_1_2.php @@ -13,10 +13,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// -// Derived from PhpGedView -// Copyright (C) 2009 Greg Roach +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -30,7 +27,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/db_schema/db_schema_2_3.php b/modules_v3/googlemap/db_schema/db_schema_2_3.php index 7c7b7887f4..e99278f46c 100644 --- a/modules_v3/googlemap/db_schema/db_schema_2_3.php +++ b/modules_v3/googlemap/db_schema/db_schema_2_3.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,7 +25,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/db_schema/db_schema_3_4.php b/modules_v3/googlemap/db_schema/db_schema_3_4.php index 53d233c078..86b2a77bf8 100644 --- a/modules_v3/googlemap/db_schema/db_schema_3_4.php +++ b/modules_v3/googlemap/db_schema/db_schema_3_4.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,7 +25,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/db_schema/db_schema_4_5.php b/modules_v3/googlemap/db_schema/db_schema_4_5.php index 94ad3b085e..06b95617d0 100644 --- a/modules_v3/googlemap/db_schema/db_schema_4_5.php +++ b/modules_v3/googlemap/db_schema/db_schema_4_5.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,7 +25,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/defaultconfig.php b/modules_v3/googlemap/defaultconfig.php index f7ca70c0b4..60d697fd33 100644 --- a/modules_v3/googlemap/defaultconfig.php +++ b/modules_v3/googlemap/defaultconfig.php @@ -2,7 +2,7 @@ // Configuration file required by GoogleMap module // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/googlemap.php b/modules_v3/googlemap/googlemap.php index 3ab5c75f17..8ac04a1d63 100644 --- a/modules_v3/googlemap/googlemap.php +++ b/modules_v3/googlemap/googlemap.php @@ -2,7 +2,7 @@ // Google map module for webtrees // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/help_text.php b/modules_v3/googlemap/help_text.php index b74927cd69..015cc6a0df 100644 --- a/modules_v3/googlemap/help_text.php +++ b/modules_v3/googlemap/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php index 24864a42c8..81afc5d0af 100644 --- a/modules_v3/googlemap/module.php +++ b/modules_v3/googlemap/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -70,10 +70,11 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu break; case 'admin_places': case 'places_edit': + case 'wt_v3_street_view': // TODO: these files should be methods in this class - require_once WT_ROOT.WT_MODULES_DIR.'googlemap/googlemap.php'; - require_once WT_ROOT.WT_MODULES_DIR.'googlemap/defaultconfig.php'; - require WT_ROOT.WT_MODULES_DIR.$this->getName().'/'.$mod_action.'.php'; + require WT_ROOT . WT_MODULES_DIR . 'googlemap/googlemap.php'; + require WT_ROOT . WT_MODULES_DIR . 'googlemap/defaultconfig.php'; + require WT_ROOT . WT_MODULES_DIR . $this->getName() . '/' . $mod_action . '.php'; break; default: header('HTTP/1.0 404 Not Found'); @@ -271,7 +272,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu </td> </tr> <tr> - <th><?php echo WT_I18N::translate('Google Street View™'); ?></th> + <th><?php echo /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ WT_I18N::translate('Google Street View™'); ?></th> <td><?php echo radio_buttons('NEW_GM_USE_STREETVIEW', array(false=>WT_I18N::translate('hide'),true=>WT_I18N::translate('show')), get_module_setting('googlemap', 'GM_USE_STREETVIEW', '0')); ?></td> </tr> <tr> diff --git a/modules_v3/googlemap/placehierarchy.php b/modules_v3/googlemap/placehierarchy.php index 0214f48e2b..75c6cb2efe 100644 --- a/modules_v3/googlemap/placehierarchy.php +++ b/modules_v3/googlemap/placehierarchy.php @@ -2,7 +2,7 @@ // Displays a place hierachy // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -227,12 +227,9 @@ function create_map($placelevels) { $sv_zoom=1; } - $_map = WT_I18N::translate('Google Maps™'); - $_reset = WT_I18N::translate('Reset'); - $_streetview = /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ WT_I18N::translate('Google Street View™'); ?> <div> - <iframe style="background:transparent; margin-top:-3px; margin-left:2px; width:530px;height:405px;padding:0;border:solid 0px black" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/wt_v3_street_view.php?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>&z=18&t=2&c=1&s=1&b=<?php echo $sv_dir; ?>&p=<?php echo $sv_pitch; ?>&m=<?php echo $sv_zoom; ?>&j=1&k=1&v=1&map=<?php echo $_map; ?>&reset=<?php echo $_reset; ?>&streetview=<?php echo $_streetview; ?>" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe> + <iframe style="background:transparent; margin-top:-3px; margin-left:2px; width:530px;height:405px;padding:0;border:solid 0px black" src="module.php?mod=googlemap&mod_action=wt_v3_street_view&?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>&z=18&t=2&c=1&s=1&b=<?php echo $sv_dir; ?>&p=<?php echo $sv_pitch; ?>&m=<?php echo $sv_zoom; ?>&j=1&k=1&v=1" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe> </div> <?php @@ -657,4 +654,4 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla } } $controller->addInlineJavascript(ob_get_clean()); -}
\ No newline at end of file +} diff --git a/modules_v3/googlemap/places_edit.php b/modules_v3/googlemap/places_edit.php index f4761c1af7..ab4cc75c8a 100644 --- a/modules_v3/googlemap/places_edit.php +++ b/modules_v3/googlemap/places_edit.php @@ -2,7 +2,7 @@ // Interface to edit place locations // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -19,14 +19,13 @@ // // 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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); exit; } -require WT_ROOT.WT_MODULES_DIR.'googlemap/defaultconfig.php'; require WT_ROOT.'includes/functions/functions_edit.php'; $action = WT_Filter::post('action', null, WT_Filter::get('action')); @@ -103,23 +102,20 @@ if ($action=='updaterecord' && WT_USER_IS_ADMIN) { exit; } -// Update placelocation STREETVIEW fields ---------------------------------------------------------- -if ($action=='update_sv_params' && WT_USER_IS_ADMIN) { - echo "Google Street View™ parameters updated"; - echo "<br><br>"; - echo "LATI = ".$_REQUEST['svlati']."<br>"; - echo "LONG = ".$_REQUEST['svlong']."<br>"; - echo "BEAR = ".$_REQUEST['svbear']."<br>"; - echo "ELEV = ".$_REQUEST['svelev']."<br>"; - echo "ZOOM = ".$_REQUEST['svzoom']."<br>"; - echo "<br><br>"; - $statement= - WT_DB::prepare("UPDATE `##placelocation` SET sv_lati=?, sv_long=?, sv_bearing=?, sv_elevation=?, sv_zoom=? WHERE pl_id=?"); - $statement->execute(array($_REQUEST['svlati'], $_REQUEST['svlong'], $_REQUEST['svbear'], $_REQUEST['svelev'], $_REQUEST['svzoom'], $placeid)); - if (!WT_DEBUG) { - $controller->addInlineJavaScript('closePopupAndReloadParent();'); - } - echo "<div class=\"center\"><button onclick=\"closePopupAndReloadParent();return false;\">", WT_I18N::translate('close'), "</button></div>"; +// Update placelocation STREETVIEW fields +// TODO: This ought to be a POST request, rather than a GET request +if ($action == 'update_sv_params' && WT_USER_IS_ADMIN) { + WT_DB::prepare( + "UPDATE `##placelocation` SET sv_lati=?, sv_long=?, sv_bearing=?, sv_elevation=?, sv_zoom=? WHERE pl_id=?" + )->execute(array( + WT_Filter::get('svlati'), + WT_Filter::get('svlong'), + WT_Filter::get('svbear'), + WT_Filter::get('svelev'), + WT_Filter::get('svzoom'), + $placeid + )); + $controller->addInlineJavaScript('window.close();'); exit; } diff --git a/modules_v3/googlemap/wt_v3_places_edit.js.php b/modules_v3/googlemap/wt_v3_places_edit.js.php index 2e40b80c10..286081aa2f 100644 --- a/modules_v3/googlemap/wt_v3_places_edit.js.php +++ b/modules_v3/googlemap/wt_v3_places_edit.js.php @@ -2,7 +2,7 @@ // Included script file for Interface to edit place locations // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/googlemap/wt_v3_places_edit_overlays.js.php b/modules_v3/googlemap/wt_v3_places_edit_overlays.js.php index 894c23770e..5a797828c1 100644 --- a/modules_v3/googlemap/wt_v3_places_edit_overlays.js.php +++ b/modules_v3/googlemap/wt_v3_places_edit_overlays.js.php @@ -2,7 +2,7 @@ // Overlays file for Interface to edit place locations // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ?> // === Create Borders for the UK Countries ========================================================= diff --git a/modules_v3/googlemap/wt_v3_street_view.php b/modules_v3/googlemap/wt_v3_street_view.php index c870cf406c..1b10218147 100644 --- a/modules_v3/googlemap/wt_v3_street_view.php +++ b/modules_v3/googlemap/wt_v3_street_view.php @@ -2,7 +2,7 @@ // Displays a streetview map // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,82 +16,67 @@ // // 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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// This PHP script *really* ought to include session.php, so it picks up -// language, access, etc... -define('WT_GM_SCRIPT', 'https://maps.google.com/maps/api/js?v=3.2&sensor=false'); +if (!defined('WT_WEBTREES')) { + header('HTTP/1.0 403 Forbidden'); + exit; +} header('Content-type: text/html; charset=UTF-8'); ?> - <html> -<head> -<meta name="viewport" content="initial-scale=1.0, user-scalable=no"> -<script src="<?php echo WT_GM_SCRIPT; ?>"></script> + <head> + <meta name="viewport" content="initial-scale=1.0, user-scalable=no"> + <script src="https://maps.google.com/maps/api/js?v=3.2&sensor=false"></script> + <script> -<script> - - // Following function creates an array of the google map parameters passed --------------------- - var qsParm = new Array(); - function qs() { - var query = window.location.search.substring(1); - var parms = query.split('&'); - for (var i=0; i<parms.length; i++) { - var pos = parms[i].indexOf('='); - if (pos > 0) { - var key = parms[i].substring(0,pos); - var val = parms[i].substring(pos+1); - qsParm[key] = val; - } +// Following function creates an array of the google map parameters passed --------------------- +var qsParm = new Array(); +function qs() { + var query = window.location.search.substring(1); + var parms = query.split('&'); + for (var i=0; i<parms.length; i++) { + var pos = parms[i].indexOf('='); + if (pos > 0) { + var key = parms[i].substring(0,pos); + var val = parms[i].substring(pos+1); + qsParm[key] = val; } } - qsParm['x'] = null; - qsParm['y'] = null; - qs(); - // --------------------------------------------------------------------------------------------- - - - // --------------------------------------------------------------------------------------------- +} +qsParm['x'] = null; +qsParm['y'] = null; +qs(); var geocoder = new google.maps.Geocoder(); function geocodePosition(pos) { - geocoder.geocode({ - latLng: pos - }, function(responses) { - if (responses && responses.length > 0) { - updateMarkerAddress(responses[0].formatted_address); - } else { - updateMarkerAddress('Cannot determine address at this location.'); - } - }); + geocoder.geocode({ + latLng: pos + }, function(responses) { + if (responses && responses.length > 0) { + updateMarkerAddress(responses[0].formatted_address); + } else { + updateMarkerAddress('Cannot determine address at this location.'); + } + }); } function updateMarkerStatus(str) { - document.getElementById('markerStatus').innerHTML = str; + document.getElementById('markerStatus').innerHTML = str; } - - -//function updateMarkerBearing(bearing) { -// document.getElementById('sv_bearText').value; = str; -//} - -// var bearing = document.getElementById('sv_bearText').value; - function updateMarkerPosition(latLng) { - // document.getElementById('sv_latiText').value = pos.lat()+"\u00B0"; - // document.getElementById('sv_longText').value = pos.lng()+"\u00B0"; - document.getElementById('info').innerHTML = [ - latLng.lat(), - latLng.lng() - ].join(', '); + document.getElementById('info').innerHTML = [ + latLng.lat(), + latLng.lng() + ].join(', '); } function updateMarkerAddress(str) { - document.getElementById('address').innerHTML = str; + document.getElementById('address').innerHTML = str; } function roundNumber(num, dec) { @@ -100,196 +85,190 @@ function roundNumber(num, dec) { } function initialize() { - var x = qsParm['x']; - var y = qsParm['y']; - var b = parseFloat(qsParm['b']); - var p = parseFloat(qsParm['p']); - var m = parseFloat(qsParm['m']); + var y = qsParm['y']; + var b = parseFloat(qsParm['b']); + var p = parseFloat(qsParm['p']); + var m = parseFloat(qsParm['m']); - var latLng = new google.maps.LatLng(y, x); + var latLng = new google.maps.LatLng(y, x); - // Create the map and mapOptions + // Create the map and mapOptions var mapOptions = { zoom: 16, center: latLng, - mapTypeId: google.maps.MapTypeId.ROADMAP, // ROADMAP, SATELLITE, HYBRID, TERRAIN + mapTypeId: google.maps.MapTypeId.ROADMAP, // ROADMAP, SATELLITE, HYBRID, TERRAIN mapTypeControlOptions: { - style: google.maps.MapTypeControlStyle.DROPDOWN_MENU // DEFAULT, DROPDOWN_MENU, HORIZONTAL_BAR + style: google.maps.MapTypeControlStyle.DROPDOWN_MENU // DEFAULT, DROPDOWN_MENU, HORIZONTAL_BAR }, navigationControl: true, - navigationControlOptions: { - position: google.maps.ControlPosition.TOP_RIGHT, // BOTTOM, BOTTOM_LEFT, LEFT, TOP, etc - style: google.maps.NavigationControlStyle.SMALL // ANDROID, DEFAULT, SMALL, ZOOM_PAN - }, - streetViewControl: false, // Show Pegman or not - scrollwheel: true + navigationControlOptions: { + position: google.maps.ControlPosition.TOP_RIGHT, // BOTTOM, BOTTOM_LEFT, LEFT, TOP, etc + style: google.maps.NavigationControlStyle.SMALL // ANDROID, DEFAULT, SMALL, ZOOM_PAN + }, + streetViewControl: false, // Show Pegman or not + scrollwheel: true }; - var map = new google.maps.Map(document.getElementById('mapCanvas'), mapOptions); + var map = new google.maps.Map(document.getElementById('mapCanvas'), mapOptions); - var bearing = b; - if (bearing < 0) { - bearing=bearing+360; - } - var pitch = p; - var svzoom = m; + var bearing = b; + if (bearing < 0) { + bearing=bearing+360; + } + var pitch = p; + var svzoom = m; var imageNum = Math.round(bearing/22.5) % 16; - var image = new google.maps.MarkerImage('images/panda-icons/panda-' + imageNum + '.png', - // This marker is 50 pixels wide by 50 pixels tall. - new google.maps.Size(50, 50), - // The origin for this image is 0,0. - new google.maps.Point(0, 0), - // The anchor for this image is the base of the flagpole at 0,32. - new google.maps.Point(26, 36) - ); + var image = new google.maps.MarkerImage('<?php echo WT_SCRIPT_PATH . WT_MODULES_DIR; ?>/googlemap/images/panda-icons/panda-' + imageNum + '.png', + // This marker is 50 pixels wide by 50 pixels tall. + new google.maps.Size(50, 50), + // The origin for this image is 0,0. + new google.maps.Point(0, 0), + // The anchor for this image is the base of the flagpole at 0,32. + new google.maps.Point(26, 36) + ); - var shape = { - coord: [1, 1, 1, 20, 18, 20, 18 , 1], - type: 'poly' - }; - - var marker = new google.maps.Marker({ - icon: image, - // shape: shape, - position: latLng, - title: 'Drag me to a Blue Street', - map: map, - draggable: true - }); + var shape = { + coord: [1, 1, 1, 20, 18, 20, 18 , 1], + type: 'poly' + }; + var marker = new google.maps.Marker({ + icon: image, + // shape: shape, + position: latLng, + title: 'Drag me to a Blue Street', + map: map, + draggable: true + }); - // ===Next, get the map’s default panorama and set up some defaults. =========================== + // ===Next, get the map’s default panorama and set up some defaults. =========================== - // --- First check if Browser supports html5 --- - var browserName=navigator.appName; - if (browserName=='Microsoft Internet Explorer') { - var render_type = ''; - } else { - var render_type = 'html5'; - } + // --- First check if Browser supports html5 --- + var browserName=navigator.appName; + if (browserName=='Microsoft Internet Explorer') { + var render_type = ''; + } else { + var render_type = 'html5'; + } // --- Create the panorama --- - var panoramaOptions = { - navigationControl: true, - navigationControlOptions: { - position: google.maps.ControlPosition.TOP_RIGHT, // BOTTOM, BOTTOM_LEFT, LEFT, TOP, etc - style: google.maps.NavigationControlStyle.SMALL // ANDROID, DEFAULT, SMALL, ZOOM_PAN - }, - linksControl: true, - addressControl: true, - addressControlOptions: { - style: { - // display: 'none', // USE CSS notation here - // backgroundColor: 'red' - } - }, - position: latLng, - mode: render_type, - pov: { - heading: bearing, - pitch: pitch, - zoom: svzoom - } - }; + var panoramaOptions = { + navigationControl: true, + navigationControlOptions: { + position: google.maps.ControlPosition.TOP_RIGHT, // BOTTOM, BOTTOM_LEFT, LEFT, TOP, etc + style: google.maps.NavigationControlStyle.SMALL // ANDROID, DEFAULT, SMALL, ZOOM_PAN + }, + linksControl: true, + addressControl: true, + addressControlOptions: { + style: { + // display: 'none' + // backgroundColor: 'red' + } + }, + position: latLng, + mode: render_type, + pov: { + heading: bearing, + pitch: pitch, + zoom: svzoom + } + }; panorama = new google.maps.StreetViewPanorama(document.getElementById('mapCanvas'), panoramaOptions); panorama.setPosition(latLng); setTimeout(function() { panorama.setVisible(true); }, 1000); - setTimeout(function() { panorama.setVisible(true); }, 2000); - setTimeout(function() { panorama.setVisible(true); }, 3000); - - - // Enable navigator contol and address control to be toggled with right mouse button ------- - var aLink = document.createElement('a'); - aLink.href = 'javascript:void(0)'; onmousedown=function(e) { - if (parseInt(navigator.appVersion)>3) { - var clickType=1; - if (navigator.appName=='Netscape') { - clickType=e.which; - } else { - clickType=event.button; - } - if (clickType==1) { - self.status='Left button!'; - } - if (clickType!=1) { - if (panorama.get('addressControl') == false) { - panorama.set('navigationControl', false); - panorama.set('addressControl', true); - panorama.set('linksControl', true); - } else { - panorama.set('navigationControl', false); - panorama.set('addressControl', false); - panorama.set('linksControl', false); - } - } - } - return true; - }; - panorama.controls[google.maps.ControlPosition.TOP_RIGHT].push(aLink); - // ----------------------------------------------------------------------------------------- + setTimeout(function() { panorama.setVisible(true); }, 2000); + setTimeout(function() { panorama.setVisible(true); }, 3000); + // Enable navigator contol and address control to be toggled with right mouse button ------- + var aLink = document.createElement('a'); + aLink.href = 'javascript:void(0)'; onmousedown=function(e) { + if (parseInt(navigator.appVersion)>3) { + var clickType=1; + if (navigator.appName=='Netscape') { + clickType=e.which; + } else { + clickType=event.button; + } + if (clickType==1) { + self.status='Left button!'; + } + if (clickType!=1) { + if (panorama.get('addressControl') == false) { + panorama.set('navigationControl', false); + panorama.set('addressControl', true); + panorama.set('linksControl', true); + } else { + panorama.set('navigationControl', false); + panorama.set('addressControl', false); + panorama.set('linksControl', false); + } + } + } + return true; + }; + panorama.controls[google.maps.ControlPosition.TOP_RIGHT].push(aLink); - // Update current position info. - updateMarkerPosition(latLng); - geocodePosition(latLng); + // Update current position info. + updateMarkerPosition(latLng); + geocodePosition(latLng); - // Add dragging event listeners. - google.maps.event.addListener(marker, 'dragstart', function() { - updateMarkerAddress('Dragging...'); - }); + // Add dragging event listeners. + google.maps.event.addListener(marker, 'dragstart', function() { + updateMarkerAddress('Dragging...'); + }); - google.maps.event.addListener(marker, 'drag', function() { - updateMarkerStatus('Dragging...'); - updateMarkerPosition(marker.getPosition()); - panorama.setPosition(marker.getPosition()); - }); + google.maps.event.addListener(marker, 'drag', function() { + updateMarkerStatus('Dragging...'); + updateMarkerPosition(marker.getPosition()); + panorama.setPosition(marker.getPosition()); + }); - google.maps.event.addListener(marker, 'dragend', function() { - updateMarkerStatus('Drag ended'); - geocodePosition(marker.getPosition()); - }); + google.maps.event.addListener(marker, 'dragend', function() { + updateMarkerStatus('Drag ended'); + geocodePosition(marker.getPosition()); + }); google.maps.event.addListener(panorama, 'pov_changed', function() { povLevel = panorama.getPov(); - parent.document.getElementById('sv_bearText').value = roundNumber(povLevel.heading, 2)+"\u00B0"; - parent.document.getElementById('sv_elevText').value = roundNumber(povLevel.pitch, 2)+"\u00B0"; - parent.document.getElementById('sv_zoomText').value = roundNumber(povLevel.zoom, 2); + parent.document.getElementById('sv_bearText').value = roundNumber(povLevel.heading, 2)+"\u00B0"; + parent.document.getElementById('sv_elevText').value = roundNumber(povLevel.pitch, 2)+"\u00B0"; + parent.document.getElementById('sv_zoomText').value = roundNumber(povLevel.zoom, 2); }); google.maps.event.addListener(panorama, 'position_changed', function() { pos = panorama.getPosition(); marker.setPosition(pos); - parent.document.getElementById('sv_latiText').value = pos.lat()+"\u00B0"; - parent.document.getElementById('sv_longText').value = pos.lng()+"\u00B0"; + parent.document.getElementById('sv_latiText').value = pos.lat()+"\u00B0"; + parent.document.getElementById('sv_longText').value = pos.lng()+"\u00B0"; }); - //============================================================================================== // CREATE THE MAP PANE STREETVIEW BLUE STREETS //====================================================================================== - // First lets create the Traffic ImageMap + // First lets create the Traffic ImageMap //-------------------------------------------------------------------------------------- var traffic = new google.maps.ImageMapType({ getTileUrl: function(coord, zoom) { var X = coord.x % (1 << zoom); // wrap - return 'http://mt3.google.com/mapstt?' + - 'zoom=' + zoom + '&x=' + X + '&y=' + coord.y + '&client=api'; + return 'http://mt3.google.com/mapstt?' + 'zoom=' + zoom + '&x=' + X + '&y=' + coord.y + '&client=api'; }, tileSize: new google.maps.Size(256, 256), isPng: true }); + //====================================================================================== - // Now add the ImageMapType overlay to the map + // Now add the ImageMapType overlay to the map //-------------------------------------------------------------------------------------- map.overlayMapTypes.push(traffic); map.overlayMapTypes.push(null); + //====================================================================================== - // Now create the StreetView ImageMap + // Now create the StreetView ImageMap //-------------------------------------------------------------------------------------- - // http://cbk0.google.com/cbk?output=overlay&zoom=12&x=2045&y=1361&cb_client=api var street = new google.maps.ImageMapType({ getTileUrl: function(coord, zoom) { var X = coord.x % (1 << zoom); // wrap @@ -299,26 +278,23 @@ function initialize() { tileSize: new google.maps.Size(256, 256), isPng: true }); + //====================================================================================== // Add the Street view Image Map //-------------------------------------------------------------------------------------- map.overlayMapTypes.setAt(1, street); //============================================================================================== +} - -} // end init - -var mapbutt = "<?php echo $_GET['map']; ?>"; -var svbutt = "<?php echo $_GET['streetview']; ?>"; function toggleStreetView() { - var toggle = panorama.getVisible(); - if (toggle == false) { - panorama.setVisible(true); - document.myForm.butt1.value=mapbutt; - } else { - panorama.setVisible(false); - document.myForm.butt1.value=svbutt; - } + var toggle = panorama.getVisible(); + if (toggle == false) { + panorama.setVisible(true); + document.myForm.butt1.value = "<?php echo WT_I18N::translate('Google Maps™'); ?>"; + } else { + panorama.setVisible(false); + document.myForm.butt1.value = "<?php echo WT_I18N::translate('Google Street View™'); ?>"; + } } function resetview() { @@ -330,70 +306,46 @@ google.maps.event.addDomListener(window, 'load', initialize); </script> </head> + <body> + <style> + #mapCanvas { + width: 520px; + height: 350px; + margin: 0 auto; + margin-top: -10px; + border:1px solid black; + } + #infoPanel { + display: none; + margin: 0 auto; + margin-top: 5px; + } + #infoPanel div { + display: none; + margin-bottom: 5px; + background: #ffffff; + } + div { + text-align: center; + } + </style> -<body> - - <style> -/* Fixed widths don't work well with different DPI settings or some translations - #butt0 { - width:105px; - } - #butt1{ - width:120px; - } - #butt2 { - width:90px; - } -*/ - #mapCanvas { - width: 520px; - height: 350px; - margin: 0 auto; - margin-top: -10px; - border:1px solid black; - // float: left; - } - #infoPanel { - display: none; - margin: 0 auto; - margin-top: 5px; - //float: left; - //margin-left: 10px; - } - #infoPanel div { - display: none; - margin-bottom: 5px; - background: #ffffff; - } - div { - text-align: center; - } - </style> - - <div id="toggle"> - <form name="myForm" title="myForm"> - <?php - $map = $_GET['map']; - $reset = $_GET['reset']; - echo '<input id="butt1" name ="butt1" type="button" value="', $map, '" onclick="toggleStreetView();"></input>'; - echo '<input id="butt2" name ="butt2" type="button" value="', $reset, '" onclick="resetview();"></input>'; - ?> - - </form> - </div> - - <div id="mapCanvas"> - - </div> + <div id="toggle"> + <form name="myForm" title="myForm"> + <?php + echo '<input id="butt1" name ="butt1" type="button" value="', WT_I18N::translate('Google Maps™'), '" onclick="toggleStreetView();"></input>'; + echo '<input id="butt2" name ="butt2" type="button" value="', WT_I18N::translate('Reset'), '" onclick="resetview();"></input>'; + ?> + </form> + </div> - <div id="infoPanel"> - <!-- <b>Marker status:</b> --> - <div id="markerStatus"><em>Click and drag the marker.</em></div> -<!-- <b>Current position:</b> --> - <div id="info" ></div> -<!-- <b>Closest matching address:</b> --> - <div id="address"></div> - </div> + <div id="mapCanvas"> + </div> -</body> + <div id="infoPanel"> + <div id="markerStatus"><em>Click and drag the marker.</em></div> + <div id="info" ></div> + <div id="address"></div> + </div> + </body> </html> diff --git a/modules_v3/html/help_text.php b/modules_v3/html/help_text.php index 33d5a04c8c..b5245c8e30 100644 --- a/modules_v3/html/help_text.php +++ b/modules_v3/html/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/html/module.php b/modules_v3/html/module.php index abc0605a18..19d9a3d0f1 100644 --- a/modules_v3/html/module.php +++ b/modules_v3/html/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/individual_ext_report/module.php b/modules_v3/individual_ext_report/module.php index 4243d11e7a..b3c9807a16 100644 --- a/modules_v3/individual_ext_report/module.php +++ b/modules_v3/individual_ext_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/individual_report/module.php b/modules_v3/individual_report/module.php index e41b34c7c4..7cc4cc1561 100644 --- a/modules_v3/individual_report/module.php +++ b/modules_v3/individual_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/individuals/module.php b/modules_v3/individuals/module.php index d64d377039..589ea801b1 100644 --- a/modules_v3/individuals/module.php +++ b/modules_v3/individuals/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/lightbox/css/album_page.css b/modules_v3/lightbox/css/album_page.css index 1308ea2d40..a0331c6ab5 100644 --- a/modules_v3/lightbox/css/album_page.css +++ b/modules_v3/lightbox/css/album_page.css @@ -4,7 +4,7 @@ * Display media Items using Lightbox * * webtrees: Web based Family History software - * Copyright (C) 2013 webtrees development team. + * Copyright (C) 2014 webtrees development team. * * Derived from PhpGedView * Copyright (C) 2002 to 2007 John Finlay and Others @@ -21,7 +21,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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* lightbox_plus.css version 3.00 29/06/2007 */ diff --git a/modules_v3/lightbox/module.php b/modules_v3/lightbox/module.php index b902af717b..dd905845c8 100644 --- a/modules_v3/lightbox/module.php +++ b/modules_v3/lightbox/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/logged_in/help_text.php b/modules_v3/logged_in/help_text.php index a704378c82..494fa37950 100644 --- a/modules_v3/logged_in/help_text.php +++ b/modules_v3/logged_in/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/logged_in/module.php b/modules_v3/logged_in/module.php index 605f2f0ba1..1be7e80598 100644 --- a/modules_v3/logged_in/module.php +++ b/modules_v3/logged_in/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/login_block/module.php b/modules_v3/login_block/module.php index ebb4f75c6c..2dc0d15f97 100644 --- a/modules_v3/login_block/module.php +++ b/modules_v3/login_block/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/marriage_report/module.php b/modules_v3/marriage_report/module.php index 2397a1b70b..08183efa50 100644 --- a/modules_v3/marriage_report/module.php +++ b/modules_v3/marriage_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/media/module.php b/modules_v3/media/module.php index e83e3edb21..8c8839cecb 100644 --- a/modules_v3/media/module.php +++ b/modules_v3/media/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/missing_facts_report/module.php b/modules_v3/missing_facts_report/module.php index 67e51c62f4..719a5fe599 100644 --- a/modules_v3/missing_facts_report/module.php +++ b/modules_v3/missing_facts_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/notes/module.php b/modules_v3/notes/module.php index b638a9891f..0f858415ec 100644 --- a/modules_v3/notes/module.php +++ b/modules_v3/notes/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/occupation_report/module.php b/modules_v3/occupation_report/module.php index ad099ef6cd..ee74f71714 100644 --- a/modules_v3/occupation_report/module.php +++ b/modules_v3/occupation_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/page_menu/module.php b/modules_v3/page_menu/module.php index a4b902ab86..3921c92526 100644 --- a/modules_v3/page_menu/module.php +++ b/modules_v3/page_menu/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/pedigree_report/module.php b/modules_v3/pedigree_report/module.php index 866a2ae9c2..3ca0a7f7fc 100644 --- a/modules_v3/pedigree_report/module.php +++ b/modules_v3/pedigree_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/personal_facts/module.php b/modules_v3/personal_facts/module.php index 23085027d2..bdd1c447c2 100644 --- a/modules_v3/personal_facts/module.php +++ b/modules_v3/personal_facts/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/random_media/module.php b/modules_v3/random_media/module.php index 85a88ba288..af44dda782 100644 --- a/modules_v3/random_media/module.php +++ b/modules_v3/random_media/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/recent_changes/module.php b/modules_v3/recent_changes/module.php index 6e821eb51c..50666451a3 100644 --- a/modules_v3/recent_changes/module.php +++ b/modules_v3/recent_changes/module.php @@ -3,7 +3,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -20,7 +20,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/relative_ext_report/module.php b/modules_v3/relative_ext_report/module.php index 27c27906f1..88c83374f0 100644 --- a/modules_v3/relative_ext_report/module.php +++ b/modules_v3/relative_ext_report/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/relatives/module.php b/modules_v3/relatives/module.php index 42b765efc4..7d88d90f84 100644 --- a/modules_v3/relatives/module.php +++ b/modules_v3/relatives/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -131,7 +131,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ///// WIFE ///// $found = false; - foreach ($family->getFacts('WIFE', $access_level) as $fact) { + foreach ($family->getFacts('WIFE', false, $access_level) as $fact) { $person = $fact->getTarget(); if ($person instanceof WT_Individual) { $found |= !$fact->isOld(); @@ -207,7 +207,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ///// CHIL ///// $child_number = 0; - foreach ($family->getFacts('CHIL', $access_level) as $fact) { + foreach ($family->getFacts('CHIL', false, $access_level) as $fact) { $person = $fact->getTarget(); if ($person instanceof WT_Individual) { if ($fact->isNew()) { diff --git a/modules_v3/review_changes/help_text.php b/modules_v3/review_changes/help_text.php index 6a4ae995e0..39ff8226e0 100644 --- a/modules_v3/review_changes/help_text.php +++ b/modules_v3/review_changes/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/review_changes/module.php b/modules_v3/review_changes/module.php index 69fbba8155..8c130b50e3 100644 --- a/modules_v3/review_changes/module.php +++ b/modules_v3/review_changes/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/sitemap/module.php b/modules_v3/sitemap/module.php index bdecb2d0b9..987f727f5e 100644 --- a/modules_v3/sitemap/module.php +++ b/modules_v3/sitemap/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/sources_tab/module.php b/modules_v3/sources_tab/module.php index 3c093990d2..7ceaea295e 100644 --- a/modules_v3/sources_tab/module.php +++ b/modules_v3/sources_tab/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/stories/module.php b/modules_v3/stories/module.php index 58798c1e81..6420fcaaa8 100644 --- a/modules_v3/stories/module.php +++ b/modules_v3/stories/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/theme_select/module.php b/modules_v3/theme_select/module.php index 7ff0e91016..bac9f0ddcd 100644 --- a/modules_v3/theme_select/module.php +++ b/modules_v3/theme_select/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/todays_events/module.php b/modules_v3/todays_events/module.php index 9fc4ad1bb7..2246dbb0ec 100644 --- a/modules_v3/todays_events/module.php +++ b/modules_v3/todays_events/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/todo/help_text.php b/modules_v3/todo/help_text.php index d3c21d7956..4613b0da65 100644 --- a/modules_v3/todo/help_text.php +++ b/modules_v3/todo/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/todo/module.php b/modules_v3/todo/module.php index 02f077f0b8..20f9a5c1c1 100644 --- a/modules_v3/todo/module.php +++ b/modules_v3/todo/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/top10_givnnames/module.php b/modules_v3/top10_givnnames/module.php index ef50810323..977406c1ac 100644 --- a/modules_v3/top10_givnnames/module.php +++ b/modules_v3/top10_givnnames/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/top10_pageviews/module.php b/modules_v3/top10_pageviews/module.php index af450b5ad8..57e806ee39 100644 --- a/modules_v3/top10_pageviews/module.php +++ b/modules_v3/top10_pageviews/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/top10_surnames/module.php b/modules_v3/top10_surnames/module.php index 540dc54015..89b258693f 100644 --- a/modules_v3/top10_surnames/module.php +++ b/modules_v3/top10_surnames/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/tree/class_treeview.php b/modules_v3/tree/class_treeview.php index 0abb31bf66..4a18739eb9 100644 --- a/modules_v3/tree/class_treeview.php +++ b/modules_v3/tree/class_treeview.php @@ -2,7 +2,7 @@ // Class file for the tree navigator // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/tree/css/treeview.css b/modules_v3/tree/css/treeview.css index cffbc8b1a1..d6aef26ef3 100644 --- a/modules_v3/tree/css/treeview.css +++ b/modules_v3/tree/css/treeview.css @@ -2,7 +2,7 @@ * CSS for TreeView module * * webtrees: Web based Family History software - * Copyright (C) 2013 webtrees development team. + * Copyright (C) 2014 webtrees development team. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #tree-title {text-align:center; margin-bottom:100px;} diff --git a/modules_v3/tree/js/treeview.js b/modules_v3/tree/js/treeview.js index 2a0dafd696..65f98fc67e 100644 --- a/modules_v3/tree/js/treeview.js +++ b/modules_v3/tree/js/treeview.js @@ -1,7 +1,7 @@ /** * TreeViewHandler * - * Copyright (C) 2013 webtrees development team + * Copyright (C) 2014 webtrees development team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,7 +15,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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ function TreeViewHandler(treeviewInstance, allPartners) { this.treeview = jQuery("#" + treeviewInstance + "_in"); diff --git a/modules_v3/tree/module.php b/modules_v3/tree/module.php index 24437b5143..fa4e22229c 100644 --- a/modules_v3/tree/module.php +++ b/modules_v3/tree/module.php @@ -3,7 +3,7 @@ // // Tip : you could change the number of generations loaded before ajax calls both in individual page and in treeview page to optimize speed and server load // -// Copyright (C) 2013 webtrees development team +// Copyright (C) 2014 webtrees development team // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -17,7 +17,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/upcoming_events/module.php b/modules_v3/upcoming_events/module.php index ff32059aa6..857d0e4214 100644 --- a/modules_v3/upcoming_events/module.php +++ b/modules_v3/upcoming_events/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/user_blog/db_schema/db_schema_0_1.php b/modules_v3/user_blog/db_schema/db_schema_0_1.php index 56245fe10e..5b698432d9 100644 --- a/modules_v3/user_blog/db_schema/db_schema_0_1.php +++ b/modules_v3/user_blog/db_schema/db_schema_0_1.php @@ -12,8 +12,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. -// +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -27,7 +26,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/user_blog/db_schema/db_schema_1_2.php b/modules_v3/user_blog/db_schema/db_schema_1_2.php index 7104b64c46..c8e3390998 100644 --- a/modules_v3/user_blog/db_schema/db_schema_1_2.php +++ b/modules_v3/user_blog/db_schema/db_schema_1_2.php @@ -9,7 +9,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/user_blog/db_schema/db_schema_2_3.php b/modules_v3/user_blog/db_schema/db_schema_2_3.php index e29522f403..5ff3810af6 100644 --- a/modules_v3/user_blog/db_schema/db_schema_2_3.php +++ b/modules_v3/user_blog/db_schema/db_schema_2_3.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -24,7 +24,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/user_blog/module.php b/modules_v3/user_blog/module.php index 81e519438d..5bab32b5e9 100644 --- a/modules_v3/user_blog/module.php +++ b/modules_v3/user_blog/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); @@ -124,4 +124,4 @@ class user_blog_WT_Module extends WT_Module implements WT_Module_Block { // Implement class WT_Module_Block public function configureBlock($block_id) { } -}
\ No newline at end of file +} diff --git a/modules_v3/user_favorites/module.php b/modules_v3/user_favorites/module.php index b74eb676a5..411f036c6a 100644 --- a/modules_v3/user_favorites/module.php +++ b/modules_v3/user_favorites/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/user_messages/module.php b/modules_v3/user_messages/module.php index 5d9ddc8252..c99af11017 100644 --- a/modules_v3/user_messages/module.php +++ b/modules_v3/user_messages/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/user_welcome/module.php b/modules_v3/user_welcome/module.php index ff4a0cacd0..4fd482f54f 100644 --- a/modules_v3/user_welcome/module.php +++ b/modules_v3/user_welcome/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/yahrzeit/help_text.php b/modules_v3/yahrzeit/help_text.php index bbb529d2c0..3c9d9e39a2 100644 --- a/modules_v3/yahrzeit/help_text.php +++ b/modules_v3/yahrzeit/help_text.php @@ -5,7 +5,7 @@ // It simply needs to set $title and $text for the help topic $help_topic // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='help_text.php') { header('HTTP/1.0 403 Forbidden'); diff --git a/modules_v3/yahrzeit/module.php b/modules_v3/yahrzeit/module.php index c4fe402cf4..edc69ab2c1 100644 --- a/modules_v3/yahrzeit/module.php +++ b/modules_v3/yahrzeit/module.php @@ -2,7 +2,7 @@ // Classes and libraries for module system // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 John Finlay @@ -19,7 +19,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 +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); |