@@ -223,7 +223,7 @@ |
||
223 | 223 | /** @var Tree $tree */ |
224 | 224 | $tree = $request->attributes->get('tree'); |
225 | 225 | |
226 | - $xref = $request->get('xref', ''); |
|
226 | + $xref = $request->get('xref', ''); |
|
227 | 227 | |
228 | 228 | $individual = Individual::getInstance($xref, $tree); |
229 | 229 |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | $this->checkModuleIsActive($tree, 'descendancy_chart'); |
103 | 103 | |
104 | - $xref = $request->get('xref'); |
|
104 | + $xref = $request->get('xref'); |
|
105 | 105 | $individual = Individual::getInstance($xref, $tree); |
106 | 106 | |
107 | 107 | $this->checkIndividualAccess($individual); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | $descendants = $this->descendants($individual, $generations, []); |
120 | 120 | |
121 | - switch($chart_style) { |
|
121 | + switch ($chart_style) { |
|
122 | 122 | case self::CHART_STYLE_LIST: |
123 | 123 | default: |
124 | 124 | return $this->descendantsList($individual, $generations); |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | * @return Response |
316 | 316 | */ |
317 | 317 | private function descendantsFamilies(Tree $tree, array $descendants): Response { |
318 | - $families = []; |
|
318 | + $families = []; |
|
319 | 319 | foreach ($descendants as $individual) { |
320 | 320 | foreach ($individual->getChildFamilies() as $family) { |
321 | 321 | $families[$family->getXref()] = $family; |
@@ -14,7 +14,7 @@ |
||
14 | 14 | $count_media = Database::prepare( |
15 | 15 | "SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" |
16 | 16 | )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); |
17 | -$count_sources = Database::prepare( |
|
17 | +$count_sources = Database::prepare( |
|
18 | 18 | "SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" |
19 | 19 | )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); |
20 | 20 | ?> |
@@ -24,7 +24,7 @@ |
||
24 | 24 | } |
25 | 25 | $chart_url .= '|1:||' . rawurlencode(I18N::percentage($vmax / $count)); // y axis |
26 | 26 | $chart_url .= '|2:||'; |
27 | -$step = $vmax; |
|
27 | +$step = $vmax; |
|
28 | 28 | for ($d = $vmax; $d > 0; $d--) { |
29 | 29 | if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) { |
30 | 30 | $step = $d; |
@@ -43,14 +43,14 @@ |
||
43 | 43 | <?php endforeach ?> |
44 | 44 | </td> |
45 | 45 | |
46 | - <td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); }, $surns)) ?>"> |
|
46 | + <td class="text-center" data-sort="<?= array_sum(array_map(function (array $x) { return count($x); }, $surns)) ?>"> |
|
47 | 47 | <?php foreach ($surns as $indis): ?> |
48 | 48 | <?= I18N::number(count($indis)) ?> |
49 | 49 | <br> |
50 | 50 | <?php endforeach ?> |
51 | 51 | |
52 | 52 | <?php if (count($surns) > 1): ?> |
53 | - <?= I18N::number(array_sum(array_map(function(array $x) { return count($x); }, $surns))) ?> |
|
53 | + <?= I18N::number(array_sum(array_map(function (array $x) { return count($x); }, $surns))) ?> |
|
54 | 54 | <?php endif ?> |
55 | 55 | </td> |
56 | 56 | </tr> |
@@ -8,13 +8,13 @@ |
||
8 | 8 | |
9 | 9 | <?php if ($source->isPendingDeletion()): ?> |
10 | 10 | <?php if (Auth::isModerator($source->getTree())): ?> |
11 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
11 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
12 | 12 | <?php elseif (Auth::isEditor($source->getTree())): ?> |
13 | 13 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
14 | 14 | <?php endif ?> |
15 | 15 | <?php elseif ($source->isPendingAddition()): ?> |
16 | 16 | <?php if (Auth::isModerator($source->getTree())): ?> |
17 | - <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
17 | + <?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
|
18 | 18 | <?php elseif (Auth::isEditor($source->getTree())): ?> |
19 | 19 | <?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> |
20 | 20 | <?php endif ?> |
@@ -68,7 +68,7 @@ |
||
68 | 68 | */ |
69 | 69 | public function updateRecord(GedcomRecord $record): string { |
70 | 70 | $old_gedcom = $record->getGedcom(); |
71 | - $tree = $record->getTree(); |
|
71 | + $tree = $record->getTree(); |
|
72 | 72 | |
73 | 73 | $SURNAME_TRADITION = $tree->getPreference('SURNAME_TRADITION'); |
74 | 74 |
@@ -173,7 +173,7 @@ |
||
173 | 173 | /** @var Tree $tree */ |
174 | 174 | $tree = $request->attributes->get('tree'); |
175 | 175 | |
176 | - $q = $request->get('q'); |
|
176 | + $q = $request->get('q'); |
|
177 | 177 | $instance = $request->get('instance'); |
178 | 178 | $treeview = new TreeView($instance); |
179 | 179 |
@@ -39,7 +39,7 @@ |
||
39 | 39 | 'level' => 2, |
40 | 40 | 'full_citations' => $tree->getPreference('FULL_SOURCES'), |
41 | 41 | 'tree' => $tree, |
42 | - ]); } |
|
42 | + ]); } |
|
43 | 43 | if ($level1type !== 'OBJE') { |
44 | 44 | if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) { |
45 | 45 | echo view('cards/add-media-object', [ |