diff options
Diffstat (limited to 'modules_v3/GEDFact_assistant')
17 files changed, 38 insertions, 40 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); } } |