@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $note = false; |
| 61 | 61 | |
| 62 | 62 | if ($showmap) { |
| 63 | - $note = true; |
|
| 63 | + $note = true; |
|
| 64 | 64 | $content .= view('place-map', [ |
| 65 | 65 | 'module' => self::MAP_MODULE, |
| 66 | 66 | 'ref' => $fqpn, |
@@ -72,13 +72,13 @@ discard block |
||
| 72 | 72 | switch ($action) { |
| 73 | 73 | case 'list': |
| 74 | 74 | $nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')]; |
| 75 | - $content .= view('place-list', $this->getList($tree)); |
|
| 75 | + $content .= view('place-list', $this->getList($tree)); |
|
| 76 | 76 | break; |
| 77 | 77 | case 'hierarchy': |
| 78 | 78 | case 'hierarchy-e': |
| 79 | 79 | $nextaction = ['list' => I18N::translate('Show all places in a list')]; |
| 80 | 80 | $data = $this->getHierarchy($tree, $place, $parent); |
| 81 | - $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data); |
|
| 81 | + $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data); |
|
| 82 | 82 | if (null === $data || $action === 'hierarchy-e') { |
| 83 | 83 | $content .= view('place-events', $this->getEvents($tree, $place)); |
| 84 | 84 | } |
@@ -157,7 +157,7 @@ |
||
| 157 | 157 | */ |
| 158 | 158 | public function getCount(Tree $tree, $page, $parameter): int |
| 159 | 159 | { |
| 160 | - return (int)Database::prepare( |
|
| 160 | + return (int) Database::prepare( |
|
| 161 | 161 | "SELECT page_count FROM `##hit_counter` WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter" |
| 162 | 162 | )->execute([ |
| 163 | 163 | 'tree_id' => $tree->getTreeId(), |
@@ -9,14 +9,14 @@ |
||
| 9 | 9 | </a> |
| 10 | 10 | <?php endif ?> |
| 11 | 11 | |
| 12 | -<?php if($value): ?> |
|
| 12 | +<?php if ($value): ?> |
|
| 13 | 13 | <span> |
| 14 | 14 | <?= $value ?> |
| 15 | 15 | </span> |
| 16 | 16 | <?php endif ?> |
| 17 | 17 | |
| 18 | 18 | <div> |
| 19 | - <?php if($addtag): ?> |
|
| 19 | + <?php if ($addtag): ?> |
|
| 20 | 20 | <?= GedcomTag::getLabel('BIRT') ?>: |
| 21 | 21 | <?php endif ?> |
| 22 | 22 | <?= $date ?> |
@@ -9,14 +9,14 @@ |
||
| 9 | 9 | </a> |
| 10 | 10 | <?php endif ?> |
| 11 | 11 | |
| 12 | -<?php if($value): ?> |
|
| 12 | +<?php if ($value): ?> |
|
| 13 | 13 | <span> |
| 14 | 14 | <?= $value ?> |
| 15 | 15 | </span> |
| 16 | 16 | <?php endif ?> |
| 17 | 17 | |
| 18 | 18 | <div> |
| 19 | - <?php if($addtag): ?> |
|
| 19 | + <?php if ($addtag): ?> |
|
| 20 | 20 | <?= GedcomTag::getLabel('BIRT') ?>: |
| 21 | 21 | <?php endif ?> |
| 22 | 22 | <?= $date ?> |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | </div> |
| 24 | 24 | <select id="serverfile" name="serverfile" class="form-control"> |
| 25 | 25 | <option selected value=""></option> |
| 26 | - <?php foreach($files as $file): ?> |
|
| 26 | + <?php foreach ($files as $file): ?> |
|
| 27 | 27 | <option value="<?= e($file) ?>"> |
| 28 | 28 | <?= e($file) ?> |
| 29 | 29 | </option> |
@@ -32,12 +32,10 @@ |
||
| 32 | 32 | </a> |
| 33 | 33 | </th> |
| 34 | 34 | <td> |
| 35 | - <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : |
|
| 36 | - strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
| 35 | + <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
| 37 | 36 | </td> |
| 38 | 37 | <td> |
| 39 | - <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : |
|
| 40 | - strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
| 38 | + <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
| 41 | 39 | </td> |
| 42 | 40 | <td> |
| 43 | 41 | <?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?> |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | 'type' => 'radio', |
| 101 | 101 | 'name' => $name, |
| 102 | 102 | 'value' => $value, |
| 103 | - 'checked' => (string)$value === (string)$selected, |
|
| 103 | + 'checked' => (string) $value === (string) $selected, |
|
| 104 | 104 | ] + $attributes); |
| 105 | 105 | |
| 106 | 106 | $html .= |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | foreach ($options as $value => $option) { |
| 130 | 130 | $option_attributes = self::attributes([ |
| 131 | 131 | 'value' => $value, |
| 132 | - 'selected' => (string)$value === (string)$selected, |
|
| 132 | + 'selected' => (string) $value === (string) $selected, |
|
| 133 | 133 | ]); |
| 134 | 134 | |
| 135 | 135 | $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>'; |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | foreach ($options as $value => $option) { |
| 162 | 162 | $option_attributes = self::attributes([ |
| 163 | 163 | 'value' => $value, |
| 164 | - 'selected' => in_array((string)$value, $selected), |
|
| 164 | + 'selected' => in_array((string) $value, $selected), |
|
| 165 | 165 | ]); |
| 166 | 166 | |
| 167 | 167 | $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>'; |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | </div> |
| 29 | 29 | <div id="card-tree-content-<?= $managed_tree->getTreeId() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->getTreeId() ?>"> |
| 30 | 30 | <div class="card-body"> |
| 31 | - <?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1" )->execute([$managed_tree->getTreeId()])->fetchOne() ?> |
|
| 31 | + <?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1")->execute([$managed_tree->getTreeId()])->fetchOne() ?> |
|
| 32 | 32 | <?php if ($importing): ?> |
| 33 | 33 | <div id="import<?= $managed_tree->getTreeId() ?>" class="col-xs-12"> |
| 34 | 34 | <div class="progress"> |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | if ($openParIndex !== false) { |
| 293 | 293 | // Opening parentheses always inherit the following directionality |
| 294 | 294 | self::$waitingText .= $currentLetter; |
| 295 | - $workingText = substr($workingText, $currentLen); |
|
| 295 | + $workingText = substr($workingText, $currentLen); |
|
| 296 | 296 | while (true) { |
| 297 | 297 | if ($workingText === '') { |
| 298 | 298 | break; |
@@ -300,13 +300,13 @@ discard block |
||
| 300 | 300 | if (substr($workingText, 0, 1) === ' ') { |
| 301 | 301 | // Spaces following this left parenthesis inherit the following directionality too |
| 302 | 302 | self::$waitingText .= ' '; |
| 303 | - $workingText = substr($workingText, 1); |
|
| 303 | + $workingText = substr($workingText, 1); |
|
| 304 | 304 | continue; |
| 305 | 305 | } |
| 306 | 306 | if (substr($workingText, 0, 6) === ' ') { |
| 307 | 307 | // Spaces following this left parenthesis inherit the following directionality too |
| 308 | 308 | self::$waitingText .= ' '; |
| 309 | - $workingText = substr($workingText, 6); |
|
| 309 | + $workingText = substr($workingText, 6); |
|
| 310 | 310 | continue; |
| 311 | 311 | } |
| 312 | 312 | break; |
@@ -323,9 +323,9 @@ discard block |
||
| 323 | 323 | // Exceptions to this rule will be handled later during final clean-up. |
| 324 | 324 | // |
| 325 | 325 | self::$waitingText .= $currentLetter; |
| 326 | - $workingText = substr($workingText, $currentLen); |
|
| 326 | + $workingText = substr($workingText, $currentLen); |
|
| 327 | 327 | if (self::$currentState != '') { |
| 328 | - $result .= self::$waitingText; |
|
| 328 | + $result .= self::$waitingText; |
|
| 329 | 329 | self::$waitingText = ''; |
| 330 | 330 | } |
| 331 | 331 | break 2; // double break because we're waiting for more information |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | } |
| 457 | 457 | if (substr($result . "\n", 0, self::LENGTH_START) != self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) != self::START_RTL) { |
| 458 | 458 | $leadingText .= substr($result, 0, 1); |
| 459 | - $result = substr($result, 1); |
|
| 459 | + $result = substr($result, 1); |
|
| 460 | 460 | continue; |
| 461 | 461 | } |
| 462 | 462 | $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START); |
@@ -591,11 +591,11 @@ discard block |
||
| 591 | 591 | public static function breakCurrentSpan(&$result) |
| 592 | 592 | { |
| 593 | 593 | // Interrupt the current span, insert that <br>, and then continue the current span |
| 594 | - $result .= self::$waitingText; |
|
| 594 | + $result .= self::$waitingText; |
|
| 595 | 595 | self::$waitingText = ''; |
| 596 | 596 | |
| 597 | 597 | $breakString = '<' . self::$currentState . 'br>'; |
| 598 | - $result .= $breakString; |
|
| 598 | + $result .= $breakString; |
|
| 599 | 599 | } |
| 600 | 600 | |
| 601 | 601 | /** |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | break; |
| 649 | 649 | } // No more numeric strings |
| 650 | 650 | |
| 651 | - $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string |
|
| 651 | + $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string |
|
| 652 | 652 | $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string |
| 653 | 653 | $textSpan = substr($textSpan, $posPDF + 3); |
| 654 | 654 | $posColon = strpos($numericString, ':'); |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | while ($string) { |
| 1141 | 1141 | if (mb_strlen($string) <= $width) { |
| 1142 | 1142 | // Do not wrap any text that is less than the output area. |
| 1143 | - $out .= $string; |
|
| 1143 | + $out .= $string; |
|
| 1144 | 1144 | $string = ''; |
| 1145 | 1145 | } else { |
| 1146 | 1146 | $sub1 = mb_substr($string, 0, $width + 1); |
@@ -1154,7 +1154,7 @@ discard block |
||
| 1154 | 1154 | if ($spacepos === false) { |
| 1155 | 1155 | // No space on line? |
| 1156 | 1156 | if ($cut) { |
| 1157 | - $out .= $sub . $sep; |
|
| 1157 | + $out .= $sub . $sep; |
|
| 1158 | 1158 | $string = mb_substr($string, mb_strlen($sub)); |
| 1159 | 1159 | } else { |
| 1160 | 1160 | $spacepos = strpos($string, ' '); |
@@ -1168,7 +1168,7 @@ discard block |
||
| 1168 | 1168 | } |
| 1169 | 1169 | } else { |
| 1170 | 1170 | // Split at space; |
| 1171 | - $out .= substr($string, 0, $spacepos) . $sep; |
|
| 1171 | + $out .= substr($string, 0, $spacepos) . $sep; |
|
| 1172 | 1172 | $string = substr($string, $spacepos + 1); |
| 1173 | 1173 | } |
| 1174 | 1174 | } |