@@ -21,6 +21,7 @@ |
||
21 | 21 | interface MigrationInterface { |
22 | 22 | /** |
23 | 23 | * Upgrade to to the next version |
24 | + * @return void |
|
24 | 25 | */ |
25 | 26 | public function upgrade(); |
26 | 27 | } |
@@ -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; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | * @param string $xref |
61 | 61 | * @param int $tree_id |
62 | 62 | * |
63 | - * @return null|string |
|
63 | + * @return string |
|
64 | 64 | */ |
65 | 65 | protected static function fetchGedcomRecord($xref, $tree_id) { |
66 | 66 | return Database::prepare( |
@@ -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; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | * @param string $xref |
61 | 61 | * @param int $tree_id |
62 | 62 | * |
63 | - * @return null|string |
|
63 | + * @return string |
|
64 | 64 | */ |
65 | 65 | protected static function fetchGedcomRecord($xref, $tree_id) { |
66 | 66 | return Database::prepare( |
@@ -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; |
@@ -74,8 +74,11 @@ |
||
74 | 74 | <td class="col-xs-2"> |
75 | 75 | <?php if ($module instanceof ModuleConfigInterface): ?> |
76 | 76 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
77 | - <?php else: ?> |
|
78 | - <?php echo $module->getTitle(); ?> |
|
77 | + <?php else { |
|
78 | + : ?> |
|
79 | + <?php echo $module->getTitle(); |
|
80 | +} |
|
81 | +?> |
|
79 | 82 | <?php endif; ?> |
80 | 83 | </td> |
81 | 84 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -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; |
@@ -98,8 +98,11 @@ |
||
98 | 98 | <td class="col-xs-1"> |
99 | 99 | <?php if ($module instanceof ModuleConfigInterface): ?> |
100 | 100 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
101 | - <?php else: ?> |
|
102 | - <?php echo $module->getTitle(); ?> |
|
101 | + <?php else { |
|
102 | + : ?> |
|
103 | + <?php echo $module->getTitle(); |
|
104 | +} |
|
105 | +?> |
|
103 | 106 | <?php endif; ?> |
104 | 107 | </td> |
105 | 108 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -98,8 +98,11 @@ |
||
98 | 98 | <td class="col-xs-1"> |
99 | 99 | <?php if ($module instanceof ModuleConfigInterface): ?> |
100 | 100 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
101 | - <?php else: ?> |
|
102 | - <?php echo $module->getTitle(); ?> |
|
101 | + <?php else { |
|
102 | + : ?> |
|
103 | + <?php echo $module->getTitle(); |
|
104 | +} |
|
105 | +?> |
|
103 | 106 | <?php endif; ?> |
104 | 107 | </td> |
105 | 108 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -61,7 +61,7 @@ |
||
61 | 61 | */ |
62 | 62 | public function newParentNames($child_name, $parent_sex) { |
63 | 63 | if (preg_match(self::REGEX_SURNS, $child_name, $match)) { |
64 | - switch($parent_sex) { |
|
64 | + switch ($parent_sex) { |
|
65 | 65 | case 'M': |
66 | 66 | return array( |
67 | 67 | 'NAME' => '/' . $match['SURN1'] . '/ //', |
@@ -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; |
@@ -207,14 +207,14 @@ |
||
207 | 207 | |
208 | 208 | foreach ($differences as $difference) { |
209 | 209 | switch ($difference[1]) { |
210 | - case MyersDiff::DELETE: |
|
211 | - $diff_lines[] = '<del>' . $difference[0] . '</del>'; |
|
212 | - break; |
|
213 | - case MyersDiff::INSERT: |
|
214 | - $diff_lines[] = '<ins>' . $difference[0] . '</ins>'; |
|
215 | - break; |
|
216 | - default: |
|
217 | - $diff_lines[] = $difference[0]; |
|
210 | + case MyersDiff::DELETE: |
|
211 | + $diff_lines[] = '<del>' . $difference[0] . '</del>'; |
|
212 | + break; |
|
213 | + case MyersDiff::INSERT: |
|
214 | + $diff_lines[] = '<ins>' . $difference[0] . '</ins>'; |
|
215 | + break; |
|
216 | + default: |
|
217 | + $diff_lines[] = $difference[0]; |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $recordsTotal = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne(); |
180 | 180 | |
181 | 181 | $data = array(); |
182 | - $algorithm = new MyersDiff; |
|
182 | + $algorithm = new MyersDiff; |
|
183 | 183 | |
184 | 184 | foreach ($rows as $row) { |
185 | 185 | $old_lines = preg_split('/[\n]+/', $row->old_gedcom, -1, PREG_SPLIT_NO_EMPTY); |
@@ -207,14 +207,12 @@ discard block |
||
207 | 207 | $row->change_time, |
208 | 208 | I18N::translate($row->status), |
209 | 209 | GedcomRecord::getInstance($row->xref, Tree::findByName($gedc)) ? |
210 | - "<a href='gedrecord.php?pid={$row->xref}&ged={$row->gedcom_name}'>{$row->xref}</a>" : |
|
211 | - $row->xref, |
|
210 | + "<a href='gedrecord.php?pid={$row->xref}&ged={$row->gedcom_name}'>{$row->xref}</a>" : $row->xref, |
|
212 | 211 | '<div class="gedcom-data" dir="ltr">' . |
213 | 212 | preg_replace_callback('/@(' . WT_REGEX_XREF . ')@/', |
214 | 213 | function ($match) use ($gedc) { |
215 | 214 | return GedcomRecord::getInstance($match[1], Tree::findByName($gedc)) ? |
216 | - "<a href='#' onclick='return edit_raw(\"{$match[1]}\");'>{$match[0]}</a>" : |
|
217 | - $match[0]; |
|
215 | + "<a href='#' onclick='return edit_raw(\"{$match[1]}\");'>{$match[0]}</a>" : $match[0]; |
|
218 | 216 | }, |
219 | 217 | implode("\n", $diff_lines) |
220 | 218 | ) . |
@@ -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; |
@@ -247,7 +247,7 @@ |
||
247 | 247 | /** |
248 | 248 | * Which months follows this one? Calendars with leap-months should provide their own implementation. |
249 | 249 | * |
250 | - * @return int[] |
|
250 | + * @return integer[] |
|
251 | 251 | */ |
252 | 252 | protected function nextMonth() { |
253 | 253 | if ($this->m == 6 && !$this->isLeapYear()) { |
@@ -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; |