@@ -16,7 +16,6 @@ |
||
| 16 | 16 | namespace Fisharebest\Webtrees\Report; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | -use Fisharebest\Webtrees\Date; |
|
| 20 | 19 | use Fisharebest\Webtrees\I18N; |
| 21 | 20 | |
| 22 | 21 | /** |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -1,18 +1,18 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees\Controller; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\ColorGenerator; |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | $tmp = strtoupper(strtr($this->calendar, |
| 182 | 182 | array('jewish' => 'hebrew', |
| 183 | - 'french' => 'french r', |
|
| 183 | + 'french' => 'french r', |
|
| 184 | 184 | ))); |
| 185 | 185 | $this->calendarEscape = sprintf('@#D%s@', $tmp); |
| 186 | 186 | |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | $that = $this; // PHP5.3 cannot access $this inside a closure |
| 396 | 396 | $acceptedFacts = array_filter($facts, function (Fact $fact) use ($that) { |
| 397 | 397 | return (in_array($fact->getTag(), $that->facts) && $fact->getDate()->isOK()) || |
| 398 | - (($that->place_obj || $that->startDate) && $that->checkFact($fact)); |
|
| 398 | + (($that->place_obj || $that->startDate) && $that->checkFact($fact)); |
|
| 399 | 399 | }); |
| 400 | 400 | |
| 401 | 401 | $eventList = array(); |
@@ -1,18 +1,18 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees\Functions; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
@@ -749,13 +749,13 @@ discard block |
||
| 749 | 749 | public static function getAnniversaryEvents($jd, $facts, Tree $tree) { |
| 750 | 750 | $found_facts = array(); |
| 751 | 751 | foreach (array( |
| 752 | - new GregorianDate($jd), |
|
| 753 | - new JulianDate($jd), |
|
| 754 | - new FrenchDate($jd), |
|
| 755 | - new JewishDate($jd), |
|
| 756 | - new HijriDate($jd), |
|
| 757 | - new JalaliDate($jd), |
|
| 758 | - ) as $anniv) { |
|
| 752 | + new GregorianDate($jd), |
|
| 753 | + new JulianDate($jd), |
|
| 754 | + new FrenchDate($jd), |
|
| 755 | + new JewishDate($jd), |
|
| 756 | + new HijriDate($jd), |
|
| 757 | + new JalaliDate($jd), |
|
| 758 | + ) as $anniv) { |
|
| 759 | 759 | // Build a SQL where clause to match anniversaries in the appropriate calendar. |
| 760 | 760 | $ind_sql = |
| 761 | 761 | "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" . |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | /** @global Controller\SimpleController $controller */ |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Functions\FunctionsEdit; |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |