@@ -65,7 +65,7 @@ |
||
| 65 | 65 | return new Menu( |
| 66 | 66 | $this->getTitle(), |
| 67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
| 68 | - 'report' => $this->getName(), |
|
| 68 | + 'report' => $this->getName(), |
|
| 69 | 69 | ]), |
| 70 | 70 | 'menu-report-' . $this->getName(), |
| 71 | 71 | ['rel' => 'nofollow'] |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | return new Menu( |
| 66 | 66 | $this->getTitle(), |
| 67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
| 68 | - 'report' => $this->getName(), |
|
| 68 | + 'report' => $this->getName(), |
|
| 69 | 69 | ]), |
| 70 | 70 | 'menu-report-' . $this->getName(), |
| 71 | 71 | ['rel' => 'nofollow'] |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | return new Menu( |
| 66 | 66 | $this->getTitle(), |
| 67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
| 68 | - 'report' => $this->getName(), |
|
| 68 | + 'report' => $this->getName(), |
|
| 69 | 69 | ]), |
| 70 | 70 | 'menu-report-' . $this->getName(), |
| 71 | 71 | ['rel' => 'nofollow'] |
@@ -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 | |
@@ -345,10 +345,10 @@ |
||
| 345 | 345 | } |
| 346 | 346 | // print gedcom ages |
| 347 | 347 | foreach ([ |
| 348 | - I18N::translate('Age') => $fact_age, |
|
| 349 | - I18N::translate('Husband') => $husb_age, |
|
| 350 | - I18N::translate('Wife') => $wife_age, |
|
| 351 | - ] as $label => $age) { |
|
| 348 | + I18N::translate('Age') => $fact_age, |
|
| 349 | + I18N::translate('Husband') => $husb_age, |
|
| 350 | + I18N::translate('Wife') => $wife_age, |
|
| 351 | + ] as $label => $age) { |
|
| 352 | 352 | if ($age != '') { |
| 353 | 353 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
| 354 | 354 | } |
@@ -840,9 +840,9 @@ |
||
| 840 | 840 | } |
| 841 | 841 | |
| 842 | 842 | foreach ([ |
| 843 | - 'main' => $main_blocks, |
|
| 844 | - 'side' => $side_blocks, |
|
| 845 | - ] as $location => $updated_blocks) { |
|
| 843 | + 'main' => $main_blocks, |
|
| 844 | + 'side' => $side_blocks, |
|
| 845 | + ] as $location => $updated_blocks) { |
|
| 846 | 846 | foreach ($updated_blocks as $block_order => $block_id) { |
| 847 | 847 | if (is_numeric($block_id)) { |
| 848 | 848 | // Updated block |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | $url = $request->get('url', ''); |
| 100 | 100 | $xref = $request->get('xref', ''); |
| 101 | - $change_id = (int)$request->get('change_id'); |
|
| 101 | + $change_id = (int) $request->get('change_id'); |
|
| 102 | 102 | |
| 103 | 103 | $changes = Database::prepare( |
| 104 | 104 | "SELECT change_id, xref, old_gedcom, new_gedcom" . |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | { |
| 205 | 205 | $url = $request->get('url', ''); |
| 206 | 206 | $xref = $request->get('xref', ''); |
| 207 | - $change_id = (int)$request->get('change_id'); |
|
| 207 | + $change_id = (int) $request->get('change_id'); |
|
| 208 | 208 | |
| 209 | 209 | // Reject a change, and subsequent changes to the same record |
| 210 | 210 | Database::prepare( |
@@ -240,7 +240,7 @@ |
||
| 240 | 240 | // Link to send email to other users. |
| 241 | 241 | if ($user_id != $user->getUserId()) { |
| 242 | 242 | $datum[4] = '<a href="' . e(route('message', ['to' => $datum[2], |
| 243 | - 'url' => route('admin-users'), |
|
| 243 | + 'url' => route('admin-users'), |
|
| 244 | 244 | ])) . '">' . $datum[4] . '</a>'; |
| 245 | 245 | } |
| 246 | 246 | |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | { |
| 74 | 74 | $latest_version = $this->fetchLatestVersion(); |
| 75 | 75 | |
| 76 | - list(, , $url) = explode('|', $latest_version . '||'); |
|
| 76 | + list(,, $url) = explode('|', $latest_version . '||'); |
|
| 77 | 77 | |
| 78 | 78 | return $url; |
| 79 | 79 | } |