@@ -16,7 +16,6 @@ |
||
| 16 | 16 | namespace Fisharebest\Webtrees\Report; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | -use Fisharebest\Webtrees\Date; |
|
| 20 | 19 | use Fisharebest\Webtrees\I18N; |
| 21 | 20 | |
| 22 | 21 | /** |
@@ -66,11 +66,11 @@ |
||
| 66 | 66 | */ |
| 67 | 67 | protected function varStartHandler($attrs) { |
| 68 | 68 | if (preg_match('/^I18N::number\((.+)\)$/', $attrs['var'], $match)) { |
| 69 | - $this->text .= I18N::number($match[1]); |
|
| 69 | + $this->text .= I18N::number($match[1]); |
|
| 70 | 70 | } elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $attrs['var'], $match)) { |
| 71 | - $this->text .= I18N::translate($match[1]); |
|
| 71 | + $this->text .= I18N::translate($match[1]); |
|
| 72 | 72 | } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $attrs['var'], $match)) { |
| 73 | - $this->text .= I18N::translateContext($match[1], $match[2]); |
|
| 73 | + $this->text .= I18N::translateContext($match[1], $match[2]); |
|
| 74 | 74 | } else { |
| 75 | 75 | $this->text .= $attrs['var']; |
| 76 | 76 | } |
@@ -473,7 +473,7 @@ |
||
| 473 | 473 | '<p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '<br>' . I18N::translate('You may enter a URL, beginning with “http://”.') . '</p>' |
| 474 | 474 | ); |
| 475 | 475 | } |
| 476 | - $folder = ''; |
|
| 476 | + $folder = ''; |
|
| 477 | 477 | } else { |
| 478 | 478 | if ($isExternal) { |
| 479 | 479 | $fileName = substr($gedfile, 5); |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | // Base color parameters |
| 42 | 42 | const RANGE = 120; // degrees |
| 43 | 43 | const SATURATION = 100; // percent |
| 44 | - const LIGHTNESS = 30; // percent |
|
| 44 | + const LIGHTNESS = 30; // percent |
|
| 45 | 45 | const ALPHA = 0.25; |
| 46 | 46 | const CHART_TOP = 10; // pixels |
| 47 | 47 | const BAR_SPACING = 22; // pixels |
| 48 | 48 | const YEAR_SPAN = 10; // Number of years per scale section |
| 49 | - const PIXELS_PER_YEAR = 7; // Number of pixels to shift per year |
|
| 49 | + const PIXELS_PER_YEAR = 7; // Number of pixels to shift per year |
|
| 50 | 50 | const SESSION_DATA = 'lifespan_data'; |
| 51 | 51 | |
| 52 | 52 | /** @var string|null Chart parameter */ |
@@ -457,8 +457,8 @@ discard block |
||
| 457 | 457 | } |
| 458 | 458 | echo |
| 459 | 459 | '</div>' . // class="popup" |
| 460 | - '</div>' . // class="itr" |
|
| 461 | - '</div>'; // class=$popupclass |
|
| 460 | + '</div>' . // class="itr" |
|
| 461 | + '</div>'; // class=$popupclass |
|
| 462 | 462 | |
| 463 | 463 | $maxY = max($maxY, $Y); |
| 464 | 464 | } |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | switch ($this->orientation) { |
| 153 | 153 | case self::PORTRAIT: |
| 154 | 154 | $xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8); |
| 155 | - if(!$i && $this->root->getSpouseFamilies()) { |
|
| 155 | + if (!$i && $this->root->getSpouseFamilies()) { |
|
| 156 | 156 | $xoffset -= self::ARROW_SIZE; |
| 157 | 157 | } |
| 158 | 158 | // -- compact the tree |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | case self::OLDEST_AT_TOP: |
| 208 | 208 | //swap x & y offsets as chart is rotated |
| 209 | 209 | $xoffset = $yoffset; |
| 210 | - $yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4)); |
|
| 210 | + $yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4)); |
|
| 211 | 211 | break; |
| 212 | 212 | case self::OLDEST_AT_BOTTOM: |
| 213 | 213 | //swap x & y offsets as chart is rotated |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | return $item['y']; |
| 246 | 246 | }, $this->nodes)); |
| 247 | 247 | |
| 248 | - $this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width + $addoffset['x']; |
|
| 248 | + $this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width + $addoffset['x']; |
|
| 249 | 249 | $this->chartsize['y'] = $max_yoffset + $byspacing + $this->getBoxDimensions()->height + $addoffset['y']; |
| 250 | 250 | } |
| 251 | 251 | |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | $menu = new Menu(I18N::translate('Edit'), '#', 'menu-repo'); |
| 51 | 51 | |
| 52 | 52 | if (Auth::isEditor($this->record->getTree())) { |
| 53 | - $fact = $this->record->getFirstFact('NAME'); |
|
| 53 | + $fact = $this->record->getFirstFact('NAME'); |
|
| 54 | 54 | if ($fact) { |
| 55 | 55 | // Edit existing name |
| 56 | 56 | $menu->addSubmenu(new Menu(I18N::translate('Edit repository'), '#', 'menu-repo-edit', array( |
@@ -85,8 +85,7 @@ |
||
| 85 | 85 | // Create the underlying PDO object |
| 86 | 86 | self::$pdo = new PDO( |
| 87 | 87 | (substr($DBHOST, 0, 1) === '/' ? |
| 88 | - "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : |
|
| 89 | - "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
| 88 | + "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
| 90 | 89 | ), |
| 91 | 90 | $DBUSER, $DBPASS, |
| 92 | 91 | array( |
@@ -425,10 +425,10 @@ discard block |
||
| 425 | 425 | * @return string |
| 426 | 426 | */ |
| 427 | 427 | public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) { |
| 428 | - $headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>'; |
|
| 428 | + $headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>'; |
|
| 429 | 429 | |
| 430 | 430 | foreach ($family->getSpouses() as $spouse) { |
| 431 | - $menu = new Menu(Functions::getCloseRelationshipName($head, $spouse)); |
|
| 431 | + $menu = new Menu(Functions::getCloseRelationshipName($head, $spouse)); |
|
| 432 | 432 | foreach ($spouse->getChildFamilies() as $grandparents) { |
| 433 | 433 | foreach ($grandparents->getSpouses() as $grandparent) { |
| 434 | 434 | $submenu = new Menu( |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | foreach ($family->getChildren() as $child) { |
| 466 | - $menu = new Menu(Functions::getCloseRelationshipName($head, $child)); |
|
| 466 | + $menu = new Menu(Functions::getCloseRelationshipName($head, $child)); |
|
| 467 | 467 | foreach ($child->getSpouseFamilies() as $spouse_family) { |
| 468 | 468 | foreach ($spouse_family->getSpouses() as $spouse_family_spouse) { |
| 469 | 469 | if ($spouse_family_spouse != $child) { |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | if ($level == 1) { |
| 409 | 409 | $label = I18N::translate('Country'); |
| 410 | 410 | } else { |
| 411 | - $label = I18N::translate('Level') . ' ' . $level; |
|
| 411 | + $label = I18N::translate('Level') . ' ' . $level; |
|
| 412 | 412 | } |
| 413 | 413 | ?> |
| 414 | 414 | <div class="input-group"> |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | if ($level == 1) { |
| 425 | 425 | $label = I18N::translate('Country'); |
| 426 | 426 | } else { |
| 427 | - $label = I18N::translate('Level') . ' ' . $level; |
|
| 427 | + $label = I18N::translate('Level') . ' ' . $level; |
|
| 428 | 428 | } |
| 429 | 429 | ?> |
| 430 | 430 | <div class="input-group"> |
@@ -3014,7 +3014,7 @@ discard block |
||
| 3014 | 3014 | } |
| 3015 | 3015 | '); |
| 3016 | 3016 | |
| 3017 | - $levelm = $this->setLevelMap($level, $parent); |
|
| 3017 | + $levelm = $this->setLevelMap($level, $parent); |
|
| 3018 | 3018 | if (isset($levelo[0])) { |
| 3019 | 3019 | $levelo[0] = 0; |
| 3020 | 3020 | } |
@@ -4170,7 +4170,7 @@ discard block |
||
| 4170 | 4170 | } else { |
| 4171 | 4171 | $placelist[$j]['long'] = null; |
| 4172 | 4172 | } |
| 4173 | - $j = $j + 1; |
|
| 4173 | + $j = $j + 1; |
|
| 4174 | 4174 | } |
| 4175 | 4175 | $i = $i + 1; |
| 4176 | 4176 | $placerec = Functions::getSubRecord(2, '2 PLAC', $gedrec, $i); |
@@ -4366,7 +4366,7 @@ discard block |
||
| 4366 | 4366 | $j = 0; |
| 4367 | 4367 | $maxLevel = 0; |
| 4368 | 4368 | foreach ($lines as $p => $placerec) { |
| 4369 | - $fieldrec = explode(';', $placerec); |
|
| 4369 | + $fieldrec = explode(';', $placerec); |
|
| 4370 | 4370 | if ($fieldrec[0] > $maxLevel) { |
| 4371 | 4371 | $maxLevel = $fieldrec[0]; |
| 4372 | 4372 | } |
@@ -30,11 +30,11 @@ |
||
| 30 | 30 | use Fisharebest\Webtrees\GedcomTag; |
| 31 | 31 | use Fisharebest\Webtrees\I18N; |
| 32 | 32 | use Fisharebest\Webtrees\Individual; |
| 33 | +use Fisharebest\Webtrees\Menu; |
|
| 33 | 34 | use Fisharebest\Webtrees\Module; |
| 34 | 35 | use Fisharebest\Webtrees\Stats; |
| 35 | 36 | use Fisharebest\Webtrees\Theme; |
| 36 | 37 | use Fisharebest\Webtrees\Tree; |
| 37 | -use Fisharebest\Webtrees\Menu; |
|
| 38 | 38 | use PDO; |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -954,7 +954,7 @@ discard block |
||
| 954 | 954 | } |
| 955 | 955 | } |
| 956 | 956 | $tmp = explode(':', $tag); |
| 957 | - if (in_array(end($tmp), array('NOTE', 'TEXT'))) { |
|
| 957 | + if (in_array(end($tmp), array('NOTE', 'TEXT'))) { |
|
| 958 | 958 | $value = Filter::formatText($value, $WT_TREE); // We'll strip HTML in addText() |
| 959 | 959 | } |
| 960 | 960 | $this->current_element->addText($value); |
@@ -2734,7 +2734,7 @@ discard block |
||
| 2734 | 2734 | $tags = explode(':', $tag); |
| 2735 | 2735 | $origlevel = $level; |
| 2736 | 2736 | if ($level == 0) { |
| 2737 | - $level = $gedrec{0} + 1; |
|
| 2737 | + $level = $gedrec{0} +1; |
|
| 2738 | 2738 | } |
| 2739 | 2739 | |
| 2740 | 2740 | $subrec = $gedrec; |