@@ -198,7 +198,8 @@ |
||
198 | 198 | //-- footer |
199 | 199 | echo '</div>'; |
200 | 200 | //echo '<script>document.getElementById("bodydiv").style.height="', $this->maxY, 'pt";</script>'; |
201 | - if ($this->Y < 200) { //heuristic guess! |
|
201 | + if ($this->Y < 200) { |
|
202 | +//heuristic guess! |
|
202 | 203 | echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>'; |
203 | 204 | echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">'; |
204 | 205 | } else { |
@@ -346,7 +346,7 @@ |
||
346 | 346 | '_MBON', |
347 | 347 | '_NMR', |
348 | 348 | '_SEPR', |
349 | - '_SP_DEAT', // only used internally, not exported to a gedcom file |
|
349 | + '_SP_DEAT', // only used internally, not exported to a gedcom file |
|
350 | 350 | ]; |
351 | 351 | |
352 | 352 | public const CUSTOM_INDIVIDUAL_TAGS = [ |
@@ -1138,7 +1138,7 @@ |
||
1138 | 1138 | $value = str_replace("\n", "<br>", $value); |
1139 | 1139 | //$value = strip_tags(Registry::markdownFactory()->autolink($value, $this->tree), ['br']); |
1140 | 1140 | } |
1141 | - $value = strtr($value, [MarkdownFactory::BREAK => ' ']); |
|
1141 | + $value = strtr($value, [MarkdownFactory::break => ' ']); |
|
1142 | 1142 | } |
1143 | 1143 | |
1144 | 1144 | if (isset($attrs['lcfirst'])) { |
@@ -1028,10 +1028,12 @@ discard block |
||
1028 | 1028 | $tmp = $record->getAllNames(); |
1029 | 1029 | $name = $tmp[count($tmp) - 1]['full']; |
1030 | 1030 | $ix1 = strpos($name, '<span class="starredname">'); |
1031 | - if ($ix1 !== false) { // '«' and '»' mark text for underlining |
|
1031 | + if ($ix1 !== false) { |
|
1032 | +// '«' and '»' mark text for underlining |
|
1032 | 1033 | $name = substr_replace($name, '«', $ix1, 26); |
1033 | 1034 | $ix1 = strpos($name, '</span>', $ix1); |
1034 | - if ($ix1 !== false) { // '«' and '»' mark text for underlining |
|
1035 | + if ($ix1 !== false) { |
|
1036 | +// '«' and '»' mark text for underlining |
|
1035 | 1037 | $name = substr_replace($name, '»', $ix1, 7); |
1036 | 1038 | } |
1037 | 1039 | } |
@@ -1508,7 +1510,8 @@ discard block |
||
1508 | 1510 | // Sort facts in chronological order, if possible |
1509 | 1511 | $m = count($this->repeats) - 1; |
1510 | 1512 | $prevd = 0; |
1511 | - for ($i = 0; $i <= $m; $i++) { // keep undated events after previous dated event |
|
1513 | + for ($i = 0; $i <= $m; $i++) { |
|
1514 | +// keep undated events after previous dated event |
|
1512 | 1515 | if ($jdarr[$i] === 0) { |
1513 | 1516 | $jdarr[$i] = $prevd; |
1514 | 1517 | } else { |
@@ -1762,7 +1765,8 @@ discard block |
||
1762 | 1765 | } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) { |
1763 | 1766 | $value = I18N::translateContext($match[1], $match[2]); |
1764 | 1767 | } |
1765 | - if (isset($attrs['lcfirst'])) { // set 1st char to lower case |
|
1768 | + if (isset($attrs['lcfirst'])) { |
|
1769 | +// set 1st char to lower case |
|
1766 | 1770 | $value = lcfirst($value); |
1767 | 1771 | } |
1768 | 1772 |
@@ -1022,7 +1022,7 @@ discard block |
||
1022 | 1022 | $this->current_element->addText(I18N::translate('Private')); |
1023 | 1023 | } elseif ($nameselect == 'latest') { |
1024 | 1024 | $tmp = $record->getAllNames(); |
1025 | - $name = strip_tags($tmp[count($tmp) - 1]['full']); |
|
1025 | + $name = strip_tags($tmp[count($tmp) - 1]['full']); |
|
1026 | 1026 | $this->current_element->addText(trim($name)); |
1027 | 1027 | } elseif ($nameselect == 'combined') { |
1028 | 1028 | $tmp = $record->getAllNames(); |
@@ -1106,7 +1106,7 @@ discard block |
||
1106 | 1106 | $value = $this->getGedcomValue($tag, $level, $this->gedrec); |
1107 | 1107 | switch (end($tags)) { |
1108 | 1108 | case 'DATE': |
1109 | - $tmp = new Date($value); |
|
1109 | + $tmp = new Date($value); |
|
1110 | 1110 | $dfmt = "%j %F %Y"; |
1111 | 1111 | if (!empty($attrs['truncate'])) { |
1112 | 1112 | if ($attrs['truncate'] === "d") { |
@@ -1146,7 +1146,7 @@ discard block |
||
1146 | 1146 | |
1147 | 1147 | if (isset($attrs['lcfirst'])) { |
1148 | 1148 | $value = lcfirst($value); |
1149 | - $value = str_replace(["Å","Ä","Ö"], ["å","ä","ö"], $value); |
|
1149 | + $value = str_replace(["Å", "Ä", "Ö"], ["å", "ä", "ö"], $value); |
|
1150 | 1150 | } |
1151 | 1151 | |
1152 | 1152 | if (!empty($attrs['truncate'])) { |
@@ -1252,7 +1252,7 @@ discard block |
||
1252 | 1252 | //-- read the xml from the file |
1253 | 1253 | $lines = file($this->report); |
1254 | 1254 | if (empty($lines) { |
1255 | - error_log(__FILE__.":".__LINE__." impossible error!? \n"); |
|
1255 | + error_log(__FILE__ . ":" . __LINE__ . " impossible error!? \n"); |
|
1256 | 1256 | } |
1257 | 1257 | $lineoffset = 0; |
1258 | 1258 | foreach ($this->repeats_stack as $rep) { |
@@ -1575,7 +1575,7 @@ discard block |
||
1575 | 1575 | //-- read the xml from the file |
1576 | 1576 | $lines = file($this->report); |
1577 | 1577 | if (empty($lines) { |
1578 | - error_log(__FILE__.":".__LINE__." impossible error!? \n"); |
|
1578 | + error_log(__FILE__ . ":" . __LINE__ . " impossible error!? \n"); |
|
1579 | 1579 | } |
1580 | 1580 | while ($lineoffset + $this->repeat_bytes > 0 && !str_contains($lines[$lineoffset + $this->repeat_bytes], '<Facts ')) { |
1581 | 1581 | $lineoffset--; |
@@ -2570,7 +2570,7 @@ discard block |
||
2570 | 2570 | //-- read the xml from the file |
2571 | 2571 | $lines = file($this->report); |
2572 | 2572 | if (empty($lines) { |
2573 | - error_log(__FILE__.":".__LINE__." impossible error!? \n"); |
|
2573 | + error_log(__FILE__ . ":" . __LINE__ . " impossible error!? \n"); |
|
2574 | 2574 | } |
2575 | 2575 | while ((!str_contains($lines[$lineoffset + $this->repeat_bytes], '<List')) && (($lineoffset + $this->repeat_bytes) > 0)) { |
2576 | 2576 | $lineoffset--; |
@@ -2806,7 +2806,7 @@ discard block |
||
2806 | 2806 | //-- read the xml from the file |
2807 | 2807 | $lines = file($this->report); |
2808 | 2808 | if (empty($lines) { |
2809 | - error_log(__FILE__.":".__LINE__." impossible error!? \n"); |
|
2809 | + error_log(__FILE__ . ":" . __LINE__ . " impossible error!? \n"); |
|
2810 | 2810 | } |
2811 | 2811 | while (!str_contains($lines[$lineoffset + $this->repeat_bytes], '<Relatives') && $lineoffset + $this->repeat_bytes > 0) { |
2812 | 2812 | $lineoffset--; |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $lastelement = $element; |
70 | 70 | } |
71 | 71 | } elseif ($element instanceof ReportHtmlImage) { |
72 | - $lastelement = $element; |
|
72 | + $lastelement = $element; |
|
73 | 73 | } elseif ($element instanceof ReportHtmlFootnote) { |
74 | 74 | // Check if the Footnote has been set with it’s link number |
75 | 75 | $renderer->checkFootnote($element); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $this->top += 222000; |
142 | 142 | } |
143 | 143 | if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html |
144 | - $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION; |
|
144 | + $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION; |
|
145 | 145 | if ($this->top < -9000) { |
146 | 146 | $this->top += 10000; |
147 | 147 | } |
@@ -137,10 +137,12 @@ |
||
137 | 137 | // If current position (top) |
138 | 138 | $align_Y = false; |
139 | 139 | $topstr = ""; |
140 | - if ($this->top < -110000) { // pos='abs' |
|
140 | + if ($this->top < -110000) { |
|
141 | +// pos='abs' |
|
141 | 142 | $this->top += 222000; |
142 | 143 | } |
143 | - if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html |
|
144 | + if ($this->top < -10000) { |
|
145 | +// <= -100000: both pdf and html; -100000 -- -90000: only html |
|
144 | 146 | $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION; |
145 | 147 | if ($this->top < -9000) { |
146 | 148 | $this->top += 10000; |
@@ -356,7 +356,7 @@ |
||
356 | 356 | $curr_P = $renderer->tcpdf->getPage(); |
357 | 357 | // New line and some clean up |
358 | 358 | if (!$this->newline) { |
359 | - $renderer->tcpdf->setXY($cX + $cW, $cY); // $curr_Y); |
|
359 | + $renderer->tcpdf->setXY($cX + $cW, $cY); // $curr_Y); |
|
360 | 360 | $renderer->lastCellHeight = $cH; |
361 | 361 | } else { |
362 | 362 | // addMarginX() also updates X |
@@ -139,10 +139,12 @@ |
||
139 | 139 | // If current position (top) |
140 | 140 | $align_Y = false; |
141 | 141 | $curr_P = $renderer->tcpdf->getPage(); |
142 | - if ($this->top < -95000) { // 90000: only html; 100000: both pdf and html |
|
142 | + if ($this->top < -95000) { |
|
143 | +// 90000: only html; 100000: both pdf and html |
|
143 | 144 | $align_Y = true; |
144 | 145 | } |
145 | - if ($this->top < -200000) { // pos="abs" |
|
146 | + if ($this->top < -200000) { |
|
147 | +// pos="abs" |
|
146 | 148 | $this->top += 222000; |
147 | 149 | } else { |
148 | 150 | $this->top = ReportBaseElement::CURRENT_POSITION; |