diff options
Diffstat (limited to 'includes')
45 files changed, 178 insertions, 185 deletions
diff --git a/includes/authentication.php b/includes/authentication.php index 31d0c5adc6..4833bf821b 100644 --- a/includes/authentication.php +++ b/includes/authentication.php @@ -9,7 +9,7 @@ // Other possible options are to use LDAP for authentication. // // 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. @@ -26,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/includes/config_data.php b/includes/config_data.php index c755c7965b..31deb3c6d5 100644 --- a/includes/config_data.php +++ b/includes/config_data.php @@ -7,7 +7,7 @@ // customised their local copy of this file. // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2010 PGV Development Team. @@ -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/includes/db_schema/db_schema_10_11.php b/includes/db_schema/db_schema_10_11.php index 0459300fa8..17bc8888e6 100644 --- a/includes/db_schema/db_schema_10_11.php +++ b/includes/db_schema/db_schema_10_11.php @@ -12,7 +12,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -26,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/includes/db_schema/db_schema_11_12.php b/includes/db_schema/db_schema_11_12.php index 5672d77c26..9473dbf0b4 100644 --- a/includes/db_schema/db_schema_11_12.php +++ b/includes/db_schema/db_schema_11_12.php @@ -14,7 +14,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -28,7 +28,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/includes/db_schema/db_schema_12_13.php b/includes/db_schema/db_schema_12_13.php index 4defb3596f..64dd1ee7c9 100644 --- a/includes/db_schema/db_schema_12_13.php +++ b/includes/db_schema/db_schema_12_13.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_13_14.php b/includes/db_schema/db_schema_13_14.php index 74ea5b2d44..27332a94d1 100644 --- a/includes/db_schema/db_schema_13_14.php +++ b/includes/db_schema/db_schema_13_14.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_14_15.php b/includes/db_schema/db_schema_14_15.php index 76e6ff1531..c174c1a968 100644 --- a/includes/db_schema/db_schema_14_15.php +++ b/includes/db_schema/db_schema_14_15.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_15_16.php b/includes/db_schema/db_schema_15_16.php index b734632d76..701995902e 100644 --- a/includes/db_schema/db_schema_15_16.php +++ b/includes/db_schema/db_schema_15_16.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2012 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 @@ -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/includes/db_schema/db_schema_16_17.php b/includes/db_schema/db_schema_16_17.php index bb7f419f96..fad0cc9dcb 100644 --- a/includes/db_schema/db_schema_16_17.php +++ b/includes/db_schema/db_schema_16_17.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2012 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 @@ -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/includes/db_schema/db_schema_17_18.php b/includes/db_schema/db_schema_17_18.php index e637cac071..e89850ce1b 100644 --- a/includes/db_schema/db_schema_17_18.php +++ b/includes/db_schema/db_schema_17_18.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2012 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 @@ -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/includes/db_schema/db_schema_18_19.php b/includes/db_schema/db_schema_18_19.php index 68b6e9e731..9d0b79caa3 100644 --- a/includes/db_schema/db_schema_18_19.php +++ b/includes/db_schema/db_schema_18_19.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2012 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 @@ -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/includes/db_schema/db_schema_19_20.php b/includes/db_schema/db_schema_19_20.php index 8cd7765d3e..8e43a40733 100644 --- a/includes/db_schema/db_schema_19_20.php +++ b/includes/db_schema/db_schema_19_20.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2012 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 @@ -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/includes/db_schema/db_schema_1_2.php b/includes/db_schema/db_schema_1_2.php index e6cae91d76..4ff36b297d 100644 --- a/includes/db_schema/db_schema_1_2.php +++ b/includes/db_schema/db_schema_1_2.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_20_21.php b/includes/db_schema/db_schema_20_21.php index 410661d505..97211cc892 100644 --- a/includes/db_schema/db_schema_20_21.php +++ b/includes/db_schema/db_schema_20_21.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2012 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 @@ -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/includes/db_schema/db_schema_21_22.php b/includes/db_schema/db_schema_21_22.php index ccf63bd18e..0d8935be96 100644 --- a/includes/db_schema/db_schema_21_22.php +++ b/includes/db_schema/db_schema_21_22.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 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 @@ -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/includes/db_schema/db_schema_22_23.php b/includes/db_schema/db_schema_22_23.php index 16d2dc8b02..027b396ec9 100644 --- a/includes/db_schema/db_schema_22_23.php +++ b/includes/db_schema/db_schema_22_23.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 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 @@ -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/includes/db_schema/db_schema_23_24.php b/includes/db_schema/db_schema_23_24.php index 6e7c2bd078..0c7acc97aa 100644 --- a/includes/db_schema/db_schema_23_24.php +++ b/includes/db_schema/db_schema_23_24.php @@ -11,7 +11,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 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 @@ -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/includes/db_schema/db_schema_24_25.php b/includes/db_schema/db_schema_24_25.php index 084561b829..fa369303a2 100644 --- a/includes/db_schema/db_schema_24_25.php +++ b/includes/db_schema/db_schema_24_25.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 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 @@ -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/includes/db_schema/db_schema_25_26.php b/includes/db_schema/db_schema_25_26.php index caea80200b..478a973baa 100644 --- a/includes/db_schema/db_schema_25_26.php +++ b/includes/db_schema/db_schema_25_26.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 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 @@ -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/includes/db_schema/db_schema_26_27.php b/includes/db_schema/db_schema_26_27.php index b5c917ff37..9904ee57eb 100644 --- a/includes/db_schema/db_schema_26_27.php +++ b/includes/db_schema/db_schema_26_27.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2013 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 @@ -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/includes/db_schema/db_schema_2_3.php b/includes/db_schema/db_schema_2_3.php index 9f4a6d6b5a..3cb8bc1e8b 100644 --- a/includes/db_schema/db_schema_2_3.php +++ b/includes/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) 2011 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 @@ -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/includes/db_schema/db_schema_3_4.php b/includes/db_schema/db_schema_3_4.php index 7703d6aa76..6eb92a0fa5 100644 --- a/includes/db_schema/db_schema_3_4.php +++ b/includes/db_schema/db_schema_3_4.php @@ -14,7 +14,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -28,7 +28,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/includes/db_schema/db_schema_4_5.php b/includes/db_schema/db_schema_4_5.php index 0ca94e3fba..3623f33903 100644 --- a/includes/db_schema/db_schema_4_5.php +++ b/includes/db_schema/db_schema_4_5.php @@ -12,7 +12,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -26,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/includes/db_schema/db_schema_5_6.php b/includes/db_schema/db_schema_5_6.php index b96ea7d5a0..86aea09020 100644 --- a/includes/db_schema/db_schema_5_6.php +++ b/includes/db_schema/db_schema_5_6.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_6_7.php b/includes/db_schema/db_schema_6_7.php index e76392d052..d934c409e6 100644 --- a/includes/db_schema/db_schema_6_7.php +++ b/includes/db_schema/db_schema_6_7.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_7_8.php b/includes/db_schema/db_schema_7_8.php index 1790623b68..a8f5974431 100644 --- a/includes/db_schema/db_schema_7_8.php +++ b/includes/db_schema/db_schema_7_8.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_8_9.php b/includes/db_schema/db_schema_8_9.php index de063cfc60..4cd61616b8 100644 --- a/includes/db_schema/db_schema_8_9.php +++ b/includes/db_schema/db_schema_8_9.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/db_schema/db_schema_9_10.php b/includes/db_schema/db_schema_9_10.php index 8f582472c6..f1dbc678e9 100644 --- a/includes/db_schema/db_schema_9_10.php +++ b/includes/db_schema/db_schema_9_10.php @@ -10,7 +10,7 @@ // seconds, for systems with low timeout values. // // webtrees: Web based Family History software -// Copyright (C) 2011 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 @@ -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/includes/functions/functions.php b/includes/functions/functions.php index 01ec985f0d..0f8e0d61f6 100644 --- a/includes/functions/functions.php +++ b/includes/functions/functions.php @@ -2,7 +2,7 @@ // Core Functions // // 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/includes/functions/functions_charts.php b/includes/functions/functions_charts.php index fc847b8f69..429187afa0 100644 --- a/includes/functions/functions_charts.php +++ b/includes/functions/functions_charts.php @@ -2,7 +2,7 @@ // Functions used for charts // // 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/includes/functions/functions_date.php b/includes/functions/functions_date.php index 6884576fab..945040d663 100644 --- a/includes/functions/functions_date.php +++ b/includes/functions/functions_date.php @@ -2,7 +2,7 @@ // Date Functions that can be used by any page in 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 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'); @@ -92,37 +92,37 @@ function parse_time($timestr) function format_timestamp($time) { global $DATE_FORMAT, $TIME_FORMAT; - $time_fmt=$TIME_FORMAT; + $time_fmt = $TIME_FORMAT; // PHP::date() doesn't do I18N. Do it ourselves.... preg_match_all('/%[^%]/', $time_fmt, $matches); foreach ($matches[0] as $match) { switch ($match) { case '%a': - $t=date('His', $time); - if ($t=='000000') { - $time_fmt=str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */ WT_I18N::translate('midnight'), $time_fmt); - } elseif ($t<'120000') { - $time_fmt=str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */ WT_I18N::translate('a.m.'), $time_fmt); - } elseif ($t=='120000') { - $time_fmt=str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */ WT_I18N::translate('noon'), $time_fmt); + $t = gmdate('His', $time); + if ($t == '000000') { + $time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */ WT_I18N::translate('midnight'), $time_fmt); + } elseif ($t < '120000') { + $time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */ WT_I18N::translate('a.m.'), $time_fmt); + } elseif ($t == '120000') { + $time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */ WT_I18N::translate('noon'), $time_fmt); } else { - $time_fmt=str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */ WT_I18N::translate('p.m.'), $time_fmt); + $time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */ WT_I18N::translate('p.m.'), $time_fmt); } break; case '%A': - $t=date('His', $time); - if ($t=='000000') { - $time_fmt=str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */ WT_I18N::translate('Midnight'), $time_fmt); - } elseif ($t<'120000') { - $time_fmt=str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */ WT_I18N::translate('A.M.'), $time_fmt); - } elseif ($t=='120000') { - $time_fmt=str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */ WT_I18N::translate('Noon'), $time_fmt); + $t = gmdate('His', $time); + if ($t == '000000') { + $time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */ WT_I18N::translate('Midnight'), $time_fmt); + } elseif ($t < '120000') { + $time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */ WT_I18N::translate('A.M.'), $time_fmt); + } elseif ($t == '120000') { + $time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */ WT_I18N::translate('Noon'), $time_fmt); } else { - $time_fmt=str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */ WT_I18N::translate('P.M.'), $time_fmt); + $time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */ WT_I18N::translate('P.M.'), $time_fmt); } break; default: - $time_fmt=str_replace($match, WT_I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt); + $time_fmt = str_replace($match, WT_I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt); } } diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php index a742c1a91e..3aab50fc80 100644 --- a/includes/functions/functions_db.php +++ b/includes/functions/functions_db.php @@ -2,7 +2,7 @@ // General functions to query the database. // // 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'); @@ -231,7 +231,7 @@ function search_indis_names($query, $geds, $match) { foreach ($query as $q) { $querysql[]="n_full LIKE ".WT_DB::quote("%{$q}%")." COLLATE '".WT_I18N::$collation."'"; } - $sql="SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom, n_num FROM `##individuals` JOIN `##name` ON i_id=n_id AND i_file=n_file WHERE (".implode(" {$match} ", $querysql).') AND i_file IN ('.implode(',', $geds).')'; + $sql="SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom, n_full FROM `##individuals` JOIN `##name` ON i_id=n_id AND i_file=n_file WHERE (".implode(" {$match} ", $querysql).') AND i_file IN ('.implode(',', $geds).')'; // Group results by gedcom, to minimise switching between privacy files $sql.=' ORDER BY gedcom_id'; @@ -247,14 +247,19 @@ function search_indis_names($query, $geds, $match) { $GED_ID=$row->gedcom_id; } $indi=WT_Individual::getInstance($row->xref, $row->gedcom_id, $row->gedcom); + // The individual may have private names - and the DB search may have found it. if ($indi->canShowName()) { - $indi->setPrimaryName($row->n_num); - // We need to clone $indi, as we may have multiple references to the - // same person in this list, and the "primary name" would otherwise - // be shared amongst all of them. This has some performance/memory - // implications, and there is probably a better way. This, however, - // is clean, easy and works. - $list[]=clone $indi; + foreach ($indi->getAllNames() as $num => $name) { + if ($name['fullNN'] == $row->n_full) { + $indi->setPrimaryName($num); + // We need to clone $indi, as we may have multiple references to the + // same person in this list, and the "primary name" would otherwise + // be shared amongst all of them. + $list[]=clone $indi; + // Only need to match an individual on one name + break; + } + } } } // Switch privacy file if necessary diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php index f9770ac302..a974e7b2dd 100644 --- a/includes/functions/functions_edit.php +++ b/includes/functions/functions_edit.php @@ -2,7 +2,7 @@ // Various functions used by the Edit interface // // 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/includes/functions/functions_export.php b/includes/functions/functions_export.php index 170391570d..cafea98e96 100644 --- a/includes/functions/functions_export.php +++ b/includes/functions/functions_export.php @@ -2,7 +2,7 @@ // Functions for exporting data // // 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/includes/functions/functions_import.php b/includes/functions/functions_import.php index 7aaa1e5d55..0fd2a5028b 100644 --- a/includes/functions/functions_import.php +++ b/includes/functions/functions_import.php @@ -2,13 +2,11 @@ // Import-specific functions // // 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. // -// Modifications Copyright (c) 2010 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 // the Free Software Foundation; either version 2 of the License, or @@ -21,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/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php index 2f8aa959eb..2876f3898f 100644 --- a/includes/functions/functions_mediadb.php +++ b/includes/functions/functions_mediadb.php @@ -2,7 +2,7 @@ // Various functions used by the media DB interface // // 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/includes/functions/functions_print.php b/includes/functions/functions_print.php index 176da44824..444699ad75 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -4,7 +4,7 @@ // Various printing functions used by all scripts and included by the functions.php file. // // 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'); @@ -37,7 +37,7 @@ if (!defined('WT_WEBTREES')) { * @param int $count on some charts it is important to keep a count of how many boxes were printed */ function print_pedigree_person($person, $style=1, $count=0, $personcount="1") { - global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $GEDCOM; + global $GEDCOM; global $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES; global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT; global $chart_style, $box_width, $generations, $show_spouse, $show_full; @@ -227,16 +227,16 @@ function print_pedigree_person($person, $style=1, $count=0, $personcount="1") { // now added as a function here. function header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL) { - $header_links=''; - if (!empty($LINK_CANONICAL)) { - $header_links.= '<link rel="canonical" href="'. $LINK_CANONICAL. '">'; + $header_links = ''; + if ($LINK_CANONICAL) { + $header_links .= '<link rel="canonical" href="' . $LINK_CANONICAL . '">'; } - if (!empty($META_DESCRIPTION)) { - $header_links.= '<meta name="description" content="'. WT_Filter::escapeHtml($META_DESCRIPTION). '">'; + if ($META_DESCRIPTION) { + $header_links .= '<meta name="description" content="' . $META_DESCRIPTION . '">'; } - $header_links.= '<meta name="robots" content="'. $META_ROBOTS. '">'; - if (!empty($META_GENERATOR)) { - $header_links.= '<meta name="generator" content="'. $META_GENERATOR. '">'; + $header_links .= '<meta name="robots" content="' . $META_ROBOTS . '">'; + if ($META_GENERATOR) { + $header_links .= '<meta name="generator" content="' . $META_GENERATOR . '">'; } return $header_links; } @@ -391,69 +391,46 @@ function contact_links($ged_id=WT_GED_ID) { * @return boolean */ function print_note_record($text, $nlevel, $nrec, $textOnly=false) { - global $EXPAND_SOURCES, $EXPAND_NOTES; - $elementID = 'N-'.(int)(microtime()*1000000); - + global $WT_TREE; + $text .= get_cont($nlevel, $nrec); // Check if shared note (we have already checked that it exists) if (preg_match('/^0 @('.WT_REGEX_XREF.')@ NOTE/', $nrec, $match)) { - $note = WT_Note::getInstance($match[1]); + $note = WT_Note::getInstance($match[1]); + $label = 'SHARED_NOTE'; // If Census assistant installed, allow it to format the note if (array_key_exists('GEDFact_assistant', WT_Module::getActiveModules())) { - $text = GEDFact_assistant_WT_Module::formatCensusNote($note); + $html = GEDFact_assistant_WT_Module::formatCensusNote($note); } else { - $text = WT_Filter::expandUrls($note->getNote()); + $html = WT_Filter::formatText($note->getNote(), $WT_TREE); } } else { - $note = null; - $text = WT_Filter::expandUrls($text); + $note = null; + $label = 'NOTE'; + $html = WT_Filter::formatText($text, $WT_TREE); } if ($textOnly) { return strip_tags($text); } - if (strpos($text, "\n") !== false) { - list($first_line, $cont_lines) = explode("\n", $text, 2); - } else { - $first_line = $text; - $cont_lines = ''; - } - - $data = '<div class="fact_NOTE"><span class="label">'; - if ($cont_lines) { - if ($EXPAND_NOTES) { - $plusminus='minus'; - } else { - $plusminus='plus'; - } - $data .= '<a href="#" onclick="expand_layer(\'' . $elementID . '\'); return false;"><i id="' . $elementID . '_img" class="icon-' . $plusminus . '"></i></a> '; - } - - if ($note) { - $data .= WT_I18N::translate('Shared note').': </span> '; + if (strpos($text, "\n") === false) { + // A one-line note? strip the block-level tags, so it displays inline + return WT_Gedcom_Tag::getLabelValue($label, strip_tags($html, '<a><strong><em>')); + } elseif ($WT_TREE->preference('EXPAND_NOTES')) { + // A multi-line note, and we're expanding notes by default + return WT_Gedcom_Tag::getLabelValue($label, $html); } else { - $data .= WT_I18N::translate('Note').': </span>'; - } - - if ($cont_lines) { - if ($note) { - $first_line = '<a href="' . $note->getHtmlUrl() . '">' . $first_line . '</a>'; - } - $data .= '<span class="field" dir="auto">' . $first_line . '</span>'; - $data .= '<div id="' . $elementID . '" dir="auto" style="white-space:pre-wrap; display:'; - $data .= $EXPAND_NOTES ? 'block' : 'none'; - $data .= '">' . $cont_lines. '</div>'; - } else { - if ($note) { - $first_line = '<a href="' . $note->getHtmlUrl() . '">' . $first_line . '</a>'; - } - $data .= '<span class="field" dir="auto">' . $first_line . '</span>'; + // A multi-line note, with an expand/collapse option + $element_id = uniqid('n-'); + // NOTE: class "note-details" is (currently) used only by some third-party themes + return + '<div class="fact_NOTE"><span class="label">' . + '<a href="#" onclick="expand_layer(\'' . $element_id . '\'); return false;"><i id="' . $element_id . '_img" class="icon-plus"></i></a> ' . WT_Gedcom_Tag::getLabel($label) . ': ' . + '</div>' . + '<div class="note-details" id="' . $element_id . '" style="display:none">' . $html . '</div>'; } - $data .= '</div>'; - - return $data; } /** diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php index be5e8811d1..a7f7f7f718 100644 --- a/includes/functions/functions_print_facts.php +++ b/includes/functions/functions_print_facts.php @@ -4,7 +4,7 @@ // Various printing functions used to print fact records // // 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'); @@ -307,8 +307,16 @@ function print_fact(WT_Fact $fact, WT_GedcomRecord $record) { // Print the type of this fact/event if ($type) { - // We don't have a translation for $type - but a custom translation might exist. - echo WT_Gedcom_Tag::getLabelValue('TYPE', WT_I18N::translate(WT_Filter::escapeHtml($type))); + $utype = strtoupper($type); + // Events of close relatives, e.g. _MARR_CHIL + if (substr($fact->getTag(), 0, 6) == '_MARR_' && ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS')) { + // Translate MARR/TYPE using the code that supports MARR_CIVIL, etc. tags + $type = WT_Gedcom_Tag::getLabel('MARR_'.$utype); + } else { + // Allow (custom) translations for other types + $type = WT_I18N::translate($type); + } + echo WT_Gedcom_Tag::getLabelValue('TYPE', WT_Filter::escapeHtml($type)); } // Print the date of this fact/event @@ -755,6 +763,7 @@ function print_main_sources(WT_Fact $fact, $level) { * getSourceStructure() function. */ function printSourceStructure($textSOUR) { + global $WT_TREE; $html = ''; if ($textSOUR['PAGE']) { @@ -774,7 +783,7 @@ function printSourceStructure($textSOUR) { $html .= WT_Gedcom_Tag::getLabelValue('DATA:DATE', $date->Display(false)); } foreach ($textSOUR['TEXT'] as $text) { - $html .= WT_Gedcom_Tag::getLabelValue('TEXT', '<span style="white-space: pre-wrap;">' . WT_Filter::expandUrls($text) . '</span>'); + $html .= WT_Gedcom_Tag::getLabelValue('TEXT', WT_Filter::formatText($text, $WT_TREE)); } } @@ -838,7 +847,7 @@ function getSourceStructure($srec) { // Print a row for the notes tab on the individual page function print_main_notes(WT_Fact $fact, $level) { - global $GEDCOM, $SHOW_FACT_ICONS, $TEXT_DIRECTION; + global $GEDCOM, $WT_TREE, $SHOW_FACT_ICONS, $TEXT_DIRECTION; $factrec = $fact->getGedcom(); $fact_id = $fact->getFactId(); @@ -920,7 +929,7 @@ function print_main_notes(WT_Fact $fact, $level) { if (array_key_exists('GEDFact_assistant', WT_Module::getActiveModules())) { $text = GEDFact_assistant_WT_Module::formatCensusNote($note); } else { - $text = WT_Filter::expandUrls($note->getNote()); + $text = WT_Filter::formatText($note->getNote(), $WT_TREE); } } else { $text = '<span class="error">' . WT_Filter::escapeHtml($nid) . '</span>'; @@ -929,11 +938,11 @@ function print_main_notes(WT_Fact $fact, $level) { // Inline notes $nrec = get_sub_record($level, "$level NOTE", $factrec, $j+1); $text = $match[$j][1] . get_cont($level+1, $nrec); - $text = WT_Filter::expandUrls($text); + $text = WT_Filter::formatText($text, $WT_TREE); } echo '<td class="optionbox', $styleadd, ' wrap">'; - echo '<div style="white-space:pre-wrap;">', $text, '</div>'; + echo $text; if (!empty($noterec)) { echo print_fact_sources($noterec, 1); diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php index 5aeae8170a..886d330b1a 100644 --- a/includes/functions/functions_print_lists.php +++ b/includes/functions/functions_print_lists.php @@ -5,7 +5,7 @@ // used on the indilist, famlist, find, and search pages. // // 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. @@ -22,7 +22,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/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php index dee2abb147..d6e7dc9b7f 100644 --- a/includes/functions/functions_rtl.php +++ b/includes/functions/functions_rtl.php @@ -2,7 +2,7 @@ // RTL Functions for use in the PDF/HTML reports // // 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. @@ -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/includes/functions/functions_utf-8.php b/includes/functions/functions_utf-8.php index c4592a6714..0254bdc80c 100644 --- a/includes/functions/functions_utf-8.php +++ b/includes/functions/functions_utf-8.php @@ -2,7 +2,7 @@ // UTF-8 versions of PHP string functions // // 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/includes/hitcount.php b/includes/hitcount.php index dc8cfb8bd2..9faa7622f7 100644 --- a/includes/hitcount.php +++ b/includes/hitcount.php @@ -2,7 +2,7 @@ // Counts how many hits. // // 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/includes/reportheader.php b/includes/reportheader.php index 441867378b..89f15d164e 100644 --- a/includes/reportheader.php +++ b/includes/reportheader.php @@ -3,7 +3,7 @@ // used by the SAX parser to generate PDF reports from the XML report file. // // 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. @@ -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/includes/session.php b/includes/session.php index 5a950d41ca..d3f42ff1ef 100755 --- a/includes/session.php +++ b/includes/session.php @@ -2,7 +2,7 @@ // Startup and session logic // // 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 2011 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 // WT_SCRIPT_NAME is defined in each script that the user is permitted to load. if (!defined('WT_SCRIPT_NAME')) { @@ -55,7 +55,7 @@ define('WT_JQUERY_DATATABLES_URL', WT_STATIC_URL.'js/jquery.datatables-1.9.4.js' define('WT_JQUERY_JEDITABLE_URL', WT_STATIC_URL.'js/jquery.jeditable-1.7.1.js'); define('WT_JQUERY_WHEELZOOM_URL', WT_STATIC_URL.'js/jquery.wheelzoom-1.1.2.js'); define('WT_MODERNIZR_URL', WT_STATIC_URL.'js/modernizr.custom-2.6.2.js'); -define('WT_WEBTREES_JS_URL', WT_STATIC_URL.'js/webtrees-1.5.1.js'); +define('WT_WEBTREES_JS_URL', WT_STATIC_URL.'js/webtrees-1.5.2.js'); // Location of our modules and themes. These are used as URLs and folder paths. define('WT_MODULES_DIR', 'modules_v3/'); // Update setup.php and build/Makefile when this changes @@ -145,9 +145,12 @@ if (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc()) { } // Invoke the Zend Framework Autoloader, so we can use Zend_XXXXX and WT_XXXXX classes -set_include_path(WT_ROOT.'library'.PATH_SEPARATOR.get_include_path()); +set_include_path(WT_ROOT . 'library' . PATH_SEPARATOR . get_include_path()); require_once 'Zend/Loader/Autoloader.php'; -Zend_Loader_Autoloader::getInstance()->registerNamespace('WT_'); +Zend_Loader_Autoloader::getInstance() + ->registerNamespace('WT_') + ->registerNamespace('HTMLPurifier_') + ->registerNamespace('Michelf\\'); // PHP requires a time zone to be set in php.ini if (!ini_get('date.timezone')) { @@ -162,10 +165,11 @@ if (!ini_get('date.timezone')) { // TODO: we ought to generate this dynamically, but lots of code currently relies on this global $QUERY_STRING=isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : ''; +$https = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'; define('WT_SERVER_NAME', - (empty($_SERVER['HTTPS']) || !in_array($_SERVER['HTTPS'], array('1', 'on', 'On', 'ON')) ? 'http://' : 'https://'). + ($https ? 'https://' : 'http://'). (empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME']). - (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT']==80 ? '' : ':'.$_SERVER['SERVER_PORT']) + (empty($_SERVER['SERVER_PORT']) || (!$https && $_SERVER['SERVER_PORT']==80) || ($https && $_SERVER['SERVER_PORT']==443) ? '' : ':'.$_SERVER['SERVER_PORT']) ); // REDIRECT_URL should be set in the case of Apache following a RedirectRule diff --git a/includes/specialchars.php b/includes/specialchars.php index 1ce62b96fa..40b68258b8 100644 --- a/includes/specialchars.php +++ b/includes/specialchars.php @@ -18,7 +18,7 @@ // Other special characters are all listed at the bottom. // // 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 PGV Development Team @@ -35,7 +35,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'); |