@@ -103,11 +103,11 @@ |
||
103 | 103 | $record = GedcomRecord::getInstance('HEAD', $tree); |
104 | 104 | $fact = $record->getFirstFact('COPR'); |
105 | 105 | if ($fact instanceof Fact) { |
106 | - $COPR = "\n1 COPR " .$fact->value(); |
|
106 | + $COPR = "\n1 COPR " . $fact->value(); |
|
107 | 107 | } |
108 | - $fact = $record->getFirstFact('LANG'); |
|
108 | + $fact = $record->getFirstFact('LANG'); |
|
109 | 109 | if ($fact instanceof Fact) { |
110 | - $LANG = "\n1 LANG " .$fact->value(); |
|
110 | + $LANG = "\n1 LANG " . $fact->value(); |
|
111 | 111 | } |
112 | 112 | // Link to actual SUBM/SUBN records, if they exist |
113 | 113 | $subn = DB::table('other') |
@@ -52,7 +52,7 @@ |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | // Did we emigrate or naturalise? |
55 | - foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) { |
|
55 | + foreach ($individual->facts(['IMMI', 'EMIG', 'NATU'], true) as $fact) { |
|
56 | 56 | if (Date::compare($fact->date(), $this->date()) <= 0) { |
57 | 57 | $place = $fact->place()->gedcomName(); |
58 | 58 | } |
@@ -519,7 +519,7 @@ |
||
519 | 519 | // ... and process the differences |
520 | 520 | $inserted = 0; |
521 | 521 | if ($diff->isNotEmpty()) { |
522 | - $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id'); |
|
522 | + $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id'); |
|
523 | 523 | |
524 | 524 | foreach ($diff as $place) { |
525 | 525 | // For Westminster, London, England, we must also create England and London, England |
@@ -342,9 +342,11 @@ |
||
342 | 342 | 'fqpn', |
343 | 343 | ]; |
344 | 344 | |
345 | - if ($serverfile !== '') { // first choice is file on server |
|
345 | + if ($serverfile !== '') { |
|
346 | +// first choice is file on server |
|
346 | 347 | $filename = WT_DATA_DIR . 'places/' . $serverfile; |
347 | - } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file |
|
348 | + } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { |
|
349 | +// 2nd choice is local file |
|
348 | 350 | $filename = $_FILES['localfile']['tmp_name']; |
349 | 351 | } |
350 | 352 |
@@ -75,10 +75,10 @@ |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
78 | - * The default position for this footer. It can be changed in the control panel. |
|
79 | - * |
|
80 | - * @return int |
|
81 | - */ |
|
78 | + * The default position for this footer. It can be changed in the control panel. |
|
79 | + * |
|
80 | + * @return int |
|
81 | + */ |
|
82 | 82 | public function defaultFooterOrder(): int |
83 | 83 | { |
84 | 84 | return 2; |
@@ -2579,7 +2579,7 @@ |
||
2579 | 2579 | { |
2580 | 2580 | /** @var ModuleBlockInterface $module */ |
2581 | 2581 | $module = Module::findByComponent('block', $this->tree, Auth::user()) |
2582 | - ->filter(function (ModuleInterface $module) use ($block): bool { |
|
2582 | + ->filter(function (ModuleInterface $module) use ($block) : bool { |
|
2583 | 2583 | return $module->name() === $block && $module->name() !== 'html'; |
2584 | 2584 | }) |
2585 | 2585 | ->first(); |
@@ -49,7 +49,7 @@ |
||
49 | 49 | $color_from = $color_from ?? $chart_color1; |
50 | 50 | $color_to = $color_to ?? $chart_color2; |
51 | 51 | |
52 | - $sizes = explode('x', $size); |
|
52 | + $sizes = explode('x', $size); |
|
53 | 53 | |
54 | 54 | if ($tot_indi === 0) { |
55 | 55 | return ''; |
@@ -153,10 +153,10 @@ |
||
153 | 153 | } |
154 | 154 | |
155 | 155 | $chart_url = 'https://chart.googleapis.com/chart?cht=bvg&chs=' . $sizes[0] . 'x' . $sizes[1] |
156 | - . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
157 | - . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
158 | - . rawurlencode($chxl) . '&chdl=' |
|
159 | - . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
156 | + . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
157 | + . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
158 | + . rawurlencode($chxl) . '&chdl=' |
|
159 | + . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
160 | 160 | |
161 | 161 | return view( |
162 | 162 | 'statistics/other/chart-google', |
@@ -135,7 +135,7 @@ |
||
135 | 135 | $decades .= '|' . I18N::number($i); |
136 | 136 | } |
137 | 137 | |
138 | - $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
138 | + $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
139 | 139 | $title = I18N::translate('Average age related to death century'); |
140 | 140 | |
141 | 141 | if (\count($rows) > 6 || mb_strlen($title) < 30) { |
@@ -479,7 +479,7 @@ |
||
479 | 479 | 'age' => $age, |
480 | 480 | ]; |
481 | 481 | |
482 | - $dist[] = $fam->family; |
|
482 | + $dist[] = $fam->family; |
|
483 | 483 | } |
484 | 484 | } elseif (!$one && $child1->canShow() && $child2->canShow()) { |
485 | 485 | $top10[] = [ |
@@ -29,7 +29,7 @@ |
||
29 | 29 | /** |
30 | 30 | * Where are our CSS, JS and other assets? |
31 | 31 | */ |
32 | - public const ASSET_DIR = 'themes/fab/css-2.0.0/'; |
|
32 | + public const ASSET_DIR = 'themes/fab/css-2.0.0/'; |
|
33 | 33 | |
34 | 34 | protected const PERSON_BOX_CLASSES = [ |
35 | 35 | 'M' => 'person_box', |