@@ -1147,7 +1147,7 @@ |
||
1147 | 1147 | } |
1148 | 1148 | } |
1149 | 1149 | } |
1150 | - $colors = [ |
|
1150 | + $colors = [ |
|
1151 | 1151 | '0000FF', |
1152 | 1152 | 'FFA0CB', |
1153 | 1153 | '9F00FF', |
@@ -745,7 +745,7 @@ discard block |
||
745 | 745 | * @return Response |
746 | 746 | */ |
747 | 747 | public function changesLogData(Request $request): Response { |
748 | - list($select, , $where, $args1) = $this->changesQuery($request); |
|
748 | + list($select,, $where, $args1) = $this->changesQuery($request); |
|
749 | 749 | list($order_by, $limit, $args2) = $this->dataTablesPagination($request); |
750 | 750 | |
751 | 751 | $rows = Database::prepare( |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | * @return Response |
820 | 820 | */ |
821 | 821 | public function changesLogDownload(Request $request): Response { |
822 | - list($select, , $where, $args) = $this->changesQuery($request); |
|
822 | + list($select,, $where, $args) = $this->changesQuery($request); |
|
823 | 823 | |
824 | 824 | $rows = Database::prepare($select . $where)->execute($args)->fetchAll(); |
825 | 825 | |
@@ -970,7 +970,7 @@ discard block |
||
970 | 970 | $args = []; |
971 | 971 | |
972 | 972 | if ($search !== '') { |
973 | - $where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))"; |
|
973 | + $where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))"; |
|
974 | 974 | $args['search1'] = $search; |
975 | 975 | $args['search2'] = $search; |
976 | 976 | } |
@@ -1151,7 +1151,7 @@ discard block |
||
1151 | 1151 | $data = array_map(function (string $thumbnail) { |
1152 | 1152 | $original = $this->findOriginalFileFromThumbnail($thumbnail); |
1153 | 1153 | |
1154 | - $original_url = route('unused-media-thumbnail', [ |
|
1154 | + $original_url = route('unused-media-thumbnail', [ |
|
1155 | 1155 | 'folder' => dirname($original), |
1156 | 1156 | 'file' => basename($original), |
1157 | 1157 | 'w' => 100, |
@@ -1691,36 +1691,36 @@ discard block |
||
1691 | 1691 | $where = ' WHERE 1'; |
1692 | 1692 | $args = []; |
1693 | 1693 | if ($search !== '') { |
1694 | - $where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))"; |
|
1694 | + $where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))"; |
|
1695 | 1695 | $args['search_1'] = $search; |
1696 | 1696 | $args['search_2'] = $search; |
1697 | 1697 | } |
1698 | 1698 | if ($from !== '') { |
1699 | - $where .= " AND change_time >= :from"; |
|
1699 | + $where .= " AND change_time >= :from"; |
|
1700 | 1700 | $args['from'] = $from; |
1701 | 1701 | } |
1702 | 1702 | if ($to !== '') { |
1703 | - $where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day |
|
1703 | + $where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day |
|
1704 | 1704 | $args['to'] = $to; |
1705 | 1705 | } |
1706 | 1706 | if ($type !== '') { |
1707 | - $where .= ' AND status = :status'; |
|
1707 | + $where .= ' AND status = :status'; |
|
1708 | 1708 | $args['status'] = $type; |
1709 | 1709 | } |
1710 | 1710 | if ($oldged !== '') { |
1711 | - $where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')"; |
|
1711 | + $where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')"; |
|
1712 | 1712 | $args['old_ged'] = $oldged; |
1713 | 1713 | } |
1714 | 1714 | if ($newged !== '') { |
1715 | - $where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')"; |
|
1715 | + $where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')"; |
|
1716 | 1716 | $args['new_ged'] = $newged; |
1717 | 1717 | } |
1718 | 1718 | if ($xref !== '') { |
1719 | - $where .= " AND xref = :xref"; |
|
1719 | + $where .= " AND xref = :xref"; |
|
1720 | 1720 | $args['xref'] = $xref; |
1721 | 1721 | } |
1722 | 1722 | if ($username !== '') { |
1723 | - $where .= " AND user_name LIKE CONCAT('%', :user, '%')"; |
|
1723 | + $where .= " AND user_name LIKE CONCAT('%', :user, '%')"; |
|
1724 | 1724 | $args['user'] = $username; |
1725 | 1725 | } |
1726 | 1726 | if ($ged !== '') { |
@@ -68,7 +68,7 @@ |
||
68 | 68 | if ($individual !== null) { |
69 | 69 | $xrefs[] = $addxref; |
70 | 70 | if ($addfam) { |
71 | - $xrefs = array_merge($xrefs, $this->closeFamily($individual)); |
|
71 | + $xrefs = array_merge($xrefs, $this->closeFamily($individual)); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu); |
367 | 367 | |
368 | 368 | foreach ($families as $family) { |
369 | - $html .= '<span class="name1">' . I18N::translate('Family') . '</span>'; |
|
369 | + $html .= '<span class="name1">' . I18N::translate('Family') . '</span>'; |
|
370 | 370 | $spouse = $family->getSpouse($this->root); |
371 | 371 | if ($spouse) { |
372 | 372 | $html .= '<a class="name1" href="' . e(route('pedigree', [ |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | $html = ''; |
427 | 427 | if ($this->chartHasAncestors) { |
428 | 428 | if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) { |
429 | - $html .= '<div class="ancestorarrow">'; |
|
429 | + $html .= '<div class="ancestorarrow">'; |
|
430 | 430 | $rootParentId = 1; |
431 | 431 | if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) { |
432 | 432 | $rootParentId++; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $sdx = Soundex::russell($surname); |
163 | 163 | if ($sdx !== '') { |
164 | 164 | foreach (explode(':', $sdx) as $value) { |
165 | - $sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')"; |
|
165 | + $sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')"; |
|
166 | 166 | $args[] = $value; |
167 | 167 | } |
168 | 168 | } |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | $sdx = Soundex::daitchMokotoff($surname); |
173 | 173 | if ($sdx !== '') { |
174 | 174 | foreach (explode(':', $sdx) as $value) { |
175 | - $sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')"; |
|
175 | + $sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')"; |
|
176 | 176 | $args[] = $value; |
177 | 177 | } |
178 | 178 | } |
@@ -130,7 +130,7 @@ |
||
130 | 130 | ->setPreference('TIMEZONE', $time_zone) |
131 | 131 | ->setPreference('visibleonline', $visible_online); |
132 | 132 | |
133 | - $tree->setUserPreference($user,'rootid', $rootid); |
|
133 | + $tree->setUserPreference($user, 'rootid', $rootid); |
|
134 | 134 | |
135 | 135 | // Switch to the new theme now |
136 | 136 | Session::put('theme_id', $theme); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS); |
59 | 59 | $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS); |
60 | 60 | |
61 | - $generations = (int) $request->get('generations', $default_generations); |
|
61 | + $generations = (int) $request->get('generations', $default_generations); |
|
62 | 62 | |
63 | 63 | $generations = min($generations, $maximum_generations); |
64 | 64 | $generations = max($generations, self::MINIMUM_GENERATIONS); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | echo '<table cellspacing="0" cellpadding="0" border="0" style="position: relative; top: auto; float: ' . $tablealign . ';">'; |
221 | 221 | for ($i = 0; $i < $ct; $i++) { |
222 | 222 | $individual2 = $children[$i]; |
223 | - $chil = $individual2->getXref(); |
|
223 | + $chil = $individual2->getXref(); |
|
224 | 224 | echo '<tr>'; |
225 | 225 | echo '<td id="td_', e($chil), '" class="', I18N::direction(), '" style="text-align:', $otablealign, '">'; |
226 | 226 | $this->printDescendency($individual2, $generation + 1, $generations, $show_spouse, false); |
@@ -116,18 +116,18 @@ |
||
116 | 116 | ]; |
117 | 117 | |
118 | 118 | const DMY_SHORTCUTS = [ |
119 | - '11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913',], |
|
120 | - '01 FEB 2003' => ['01/02/03', '01-02-03', '01.02.03',], |
|
119 | + '11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913', ], |
|
120 | + '01 FEB 2003' => ['01/02/03', '01-02-03', '01.02.03', ], |
|
121 | 121 | ]; |
122 | 122 | |
123 | 123 | const MDY_SHORTCUTS = [ |
124 | - '11 DEC 1913' => ['12/11/1913', '12-11-1913', '12.11.1913',], |
|
125 | - '01 FEB 2003' => ['02/01/03', '02-01-03', '02.01.03',], |
|
124 | + '11 DEC 1913' => ['12/11/1913', '12-11-1913', '12.11.1913', ], |
|
125 | + '01 FEB 2003' => ['02/01/03', '02-01-03', '02.01.03', ], |
|
126 | 126 | ]; |
127 | 127 | |
128 | 128 | const YMD_SHORTCUTS = [ |
129 | - '11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913',], |
|
130 | - '01 FEB 2003' => ['03/02/01', '03-02-01', '03.02.01',], |
|
129 | + '11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913', ], |
|
130 | + '01 FEB 2003' => ['03/02/01', '03-02-01', '03.02.01', ], |
|
131 | 131 | ]; |
132 | 132 | |
133 | 133 | /** |
@@ -526,7 +526,7 @@ |
||
526 | 526 | $html = ''; |
527 | 527 | |
528 | 528 | foreach ($list as $id => $facts) { |
529 | - $tmp = GedcomRecord::getInstance($id, $tree); |
|
529 | + $tmp = GedcomRecord::getInstance($id, $tree); |
|
530 | 530 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->getFullName() . '</a> '; |
531 | 531 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
532 | 532 | } |