fisharebest / webtrees

app/Report/ReportParserGenerate.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1138,7 +1138,7 @@
                         $value = str_replace("\n", "<br>", $value);
                         //$value = strip_tags(Registry::markdownFactory()->autolink($value, $this->tree), ['br']);
                     }
-                    $value = strtr($value, [MarkdownFactory::BREAK => ' ']);
+                    $value = strtr($value, [MarkdownFactory::break => ' ']);
                 }
 
                 if (isset($attrs['lcfirst'])) {

Spacing +3 added lines, -3 removed lines

@@ -1021,7 +1021,7 @@ 
                 $this->current_element->addText(I18N::translate('Private'));
             } elseif ($nameselect == 'latest') {
                 $tmp = $record->getAllNames();
-                $name  = strip_tags($tmp[count($tmp) - 1]['full']);
+                $name = strip_tags($tmp[count($tmp) - 1]['full']);
                 $this->current_element->addText(trim($name));
             } elseif ($nameselect == 'combined') {
                 $tmp = $record->getAllNames();
@@ -1102,7 +1102,7 @@ 
                 $value = $this->getGedcomValue($tag, $level, $this->gedrec);
                 switch (end($tags)) {
                     case 'DATE':
-                        $tmp   = new Date($value);
+                        $tmp = new Date($value);
                         $dfmt = "%j %F %Y";
                         if (!empty($attrs['truncate'])) {
                             if ($attrs['truncate'] === "d") {
@@ -1142,7 +1142,7 @@ 
 
                 if (isset($attrs['lcfirst'])) {
                     $value = lcfirst($value);
-                    $value = str_replace(["Å","Ä","Ö"], ["å","ä","ö"], $value);
+                    $value = str_replace(["Å", "Ä", "Ö"], ["å", "ä", "ö"], $value);
                 }
 
                 if (!empty($attrs['truncate'])) {

Braces +8 added lines, -4 removed lines

@@ -1028,10 +1028,12 @@ 
                 $tmp = $record->getAllNames();
                 $name = $tmp[count($tmp) - 1]['full'];
                 $ix1 = strpos($name, '<span class="starredname">');
-                if ($ix1 !== false) {   // '«' and '»' mark text for underlining
+                if ($ix1 !== false) {
+// '«' and '»' mark text for underlining
                     $name = substr_replace($name, '«', $ix1, 26);
                     $ix1 = strpos($name, '</span>', $ix1);
-                    if ($ix1 !== false) {   // '«' and '»' mark text for underlining
+                    if ($ix1 !== false) {
+// '«' and '»' mark text for underlining
                         $name = substr_replace($name, '»', $ix1, 7);
                     }
                 }
@@ -1508,7 +1510,8 @@ 
         // Sort facts in chronological order, if possible
         $m = count($this->repeats) - 1;
         $prevd = 0;
-        for ($i = 0; $i <= $m; $i++) { // keep undated events after previous dated event
+        for ($i = 0; $i <= $m; $i++) {
+// keep undated events after previous dated event
             if ($jdarr[$i] === 0) {
                 $jdarr[$i] = $prevd;
             } else {
@@ -1762,7 +1765,8 @@ 
         } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) {
             $value = I18N::translateContext($match[1], $match[2]);
         }
-        if (isset($attrs['lcfirst'])) { // set 1st char to lower case
+        if (isset($attrs['lcfirst'])) {
+// set 1st char to lower case
             $value = lcfirst($value);
         }
 

app/Report/ReportHtmlImage.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
                 if ($this->width <= 30) {
                     $maxh = "max-height:40pt;";
                 }
-                echo '<img src="', $this->file, '" style="position:absolute;', $renderer->alignRTL, ':', $this->x, 'pt;top:', $this->y, 'pt;width:', $this->width, 'pt;',$maxh, ' alt="">\n';
+                echo '<img src="', $this->file, '" style="position:absolute;', $renderer->alignRTL, ':', $this->x, 'pt;top:', $this->y, 'pt;width:', $this->width, 'pt;', $maxh, ' alt="">\n';
         }
 
         $lastpicpage   = $renderer->pageNo();

app/Report/ReportPdfTextBox.php

Spacing +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
             $cY = $renderer->tcpdf->GetY();
         } else {
             $align_Y = true;
-            $this->top = $renderer->tcpdf->GetY();   // ReportBaseElement::CURRENT_POSITION;
+            $this->top = $renderer->tcpdf->GetY(); // ReportBaseElement::CURRENT_POSITION;
             if ($this->top_position != 0) {
                 $this->top += $this->top_position;
             }
@@ -349,7 +349,7 @@ 
         $curr_P = $renderer->tcpdf->getPage();
         // New line and some clean up
         if (!$this->newline) {
-            $renderer->tcpdf->setXY($cX + $cW, $cY);   // $curr_Y);
+            $renderer->tcpdf->setXY($cX + $cW, $cY); // $curr_Y);
             $renderer->lastCellHeight = $cH;
         } else {
             // addMarginX() also updates X

app/Report/ReportHtmlTextbox.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
                         $lastelement   = $element;
                     }
                 } elseif ($element instanceof ReportHtmlImage) {
-                    $lastelement   = $element;
+                    $lastelement = $element;
                 } elseif ($element instanceof ReportHtmlFootnote) {
                     // Check if the Footnote has been set with it’s link number
                     $renderer->checkFootnote($element);
@@ -300,7 +300,7 @@ 
         $renderer->setXy($cXT, $cYT);
         // This will be mostly used to trick the multiple images last height
         if ($this->reseth) {
-            $this->top = $first_Y;  //- $cH;
+            $this->top = $first_Y; //- $cH;
             $cH = 0;
         }
         // New line and some clean up