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'])) {

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);
         }
 

Spacing +4 added lines, -4 removed lines

@@ -864,7 +864,7 @@ 
             }
         }
 
-        error_log("\nRPG:867 [abs_position,top_position,top]=".var_export([$abs_position,$top_position,$top],true)."\n",3,"rpg.log");
+        error_log("\nRPG:867 [abs_position,top_position,top]=" . var_export([$abs_position, $top_position, $top], true) . "\n", 3, "rpg.log");
         // boolean After this box is finished rendering, should the next section of text start immediately after the this box or should it start on a new line under this box. 0 = no new line, 1 = force new line. Default is 0
 
         $newline = false;
@@ -1039,7 +1039,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();
@@ -1123,7 +1123,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") {
@@ -1163,7 +1163,7 @@ 
 
                 if (isset($attrs['lcfirst'])) {
                     $value = lcfirst($value);
-                    $value = str_replace(["Å","Ä","Ö"], ["å","ä","ö"], $value);
+                    $value = str_replace(["Å", "Ä", "Ö"], ["å", "ä", "ö"], $value);
                 }
 
                 if (!empty($attrs['truncate'])) {

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/ReportHtmlText.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
     {
         $ct = substr_count($this->text, "\n");
         if (substr($this->text, -1) == "\n") {
-            $ct -=1;
+            $ct -= 1;
         }
         if ($ct > 0) {
             $ct += 1;

app/Report/ReportPdfTextBox.php

Spacing +9 added lines, -9 removed lines

@@ -130,16 +130,16 @@ 
         }
 
         $cE = count($this->elements);
-        if ($cE>0)
-            error_log("\npdfTB start: [cE,element[1]]=".
-                var_export([$cE,$this->elements[0]],true)."\n",3,"pdf_tb.log");
+        if ($cE > 0)
+            error_log("\npdfTB start: [cE,element[1]]=" .
+                var_export([$cE, $this->elements[0]], true) . "\n", 3, "pdf_tb.log");
 
         // If current position (top)
         $align_Y = false;
         $curr_P = $renderer->tcpdf->getPage();
         //$first_Y = $renderer->tcpdf->GetY();
-        error_log("\npdfTB1: [top,curr_P,abs_position,top_position,GetY()]=".
-            var_export([$this->top,$curr_P,$this->abs_position,$this->top_position,$renderer->tcpdf->GetY()],true)."\n",3,"pdf_tb.log");
+        error_log("\npdfTB1: [top,curr_P,abs_position,top_position,GetY()]=" .
+            var_export([$this->top, $curr_P, $this->abs_position, $this->top_position, $renderer->tcpdf->GetY()], true) . "\n", 3, "pdf_tb.log");
         if ($this->abs_position) {
             $this->top_position = 0;
             $align_Y = true;
@@ -151,15 +151,15 @@ 
             $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;
             }
             $cY = $renderer->tcpdf->GetY();
         }
         $start_Y = $renderer->tcpdf->GetY();
-        error_log("\npdfTB2: [top,curr_P,top_position,start_Y]=".
-            var_export([$this->top,$curr_P,$this->top_position,$start_Y],true)."\n",3,"pdf_tb.log");
+        error_log("\npdfTB2: [top,curr_P,top_position,start_Y]=" .
+            var_export([$this->top, $curr_P, $this->top_position, $start_Y], true) . "\n", 3, "pdf_tb.log");
 
         // Check the width if set to page wide OR set by xml to larger then page width (margin)
         if ($this->width === 0.0 || $this->width > $renderer->getRemainingWidthPDF()) {
@@ -358,7 +358,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

Braces +3 added lines, -2 removed lines

@@ -130,9 +130,10 @@
         }
 
         $cE = count($this->elements);
-        if ($cE>0)
-            error_log("\npdfTB start: [cE,element[1]]=".
+        if ($cE>0) {
+                    error_log("\npdfTB start: [cE,element[1]]=".
                 var_export([$cE,$this->elements[0]],true)."\n",3,"pdf_tb.log");
+        }
 
         // If current position (top)
         $align_Y = false;

app/Report/ReportHtmlTextbox.php

Indentation +1 added lines, -1 removed lines

@@ -310,7 +310,7 @@
         }
         error_log("\nhtml end1: [top,top_position,cYT,getY(),first_Y,newline]=".
             var_export([$this->top,$this->top_position,$cYT,$renderer->getY(),$first_Y,$this->newline],true)."\n",3,"html_tb.log");
-         // New line and some clean up
+            // New line and some clean up
         if (!$this->newline) {
             $renderer->setXy($cX + $this->width, $this->top);
             $renderer->lastCellHeight = $cH;

Spacing +9 added lines, -9 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);
@@ -121,9 +121,9 @@ 
         $this->elements = $newelements;
         unset($footnote_element, $lastelement, $newelements);
 
-        if ($cE>0)
-            error_log("\nhtmlTB start: [cE,element[1]]=".
-                var_export([$cE,$this->elements[0]],true)."\n",3,"html_tb.log");
+        if ($cE > 0)
+            error_log("\nhtmlTB start: [cE,element[1]]=" .
+                var_export([$cE, $this->elements[0]], true) . "\n", 3, "html_tb.log");
 
 
         $cP = 0; // Class Padding
@@ -305,11 +305,11 @@ 
         $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;
         }
-        error_log("\nhtml end1: [top,top_position,cYT,getY(),first_Y,newline]=".
-            var_export([$this->top,$this->top_position,$cYT,$renderer->getY(),$first_Y,$this->newline],true)."\n",3,"html_tb.log");
+        error_log("\nhtml end1: [top,top_position,cYT,getY(),first_Y,newline]=" .
+            var_export([$this->top, $this->top_position, $cYT, $renderer->getY(), $first_Y, $this->newline], true) . "\n", 3, "html_tb.log");
          // New line and some clean up
         if (!$this->newline) {
             $renderer->setXy($cX + $this->width, $this->top);
@@ -319,8 +319,8 @@ 
             $renderer->setXy(0, $first_Y + $cH + $cP * 2);
             $renderer->lastCellHeight = 0;
         }
-        error_log("html end2: [top,reseth,cYT,cY,first_Y,newline]=".
-            var_export([$this->top,$this->reseth,$cYT,$renderer->getY(),$first_Y,$this->newline],true)."\n",3,"html_tb.log");
+        error_log("html end2: [top,reseth,cYT,cY,first_Y,newline]=" .
+            var_export([$this->top, $this->reseth, $cYT, $renderer->getY(), $first_Y, $this->newline], true) . "\n", 3, "html_tb.log");
         // This will make images in textboxes to ignore images in previous textboxes
         // Without this trick the $lastpicbottom in the previos textbox will be used in ReportHtmlImage
         $renderer->pageN++;

Braces +3 added lines, -2 removed lines

@@ -121,9 +121,10 @@
         $this->elements = $newelements;
         unset($footnote_element, $lastelement, $newelements);
 
-        if ($cE>0)
-            error_log("\nhtmlTB start: [cE,element[1]]=".
+        if ($cE>0) {
+                    error_log("\nhtmlTB start: [cE,element[1]]=".
                 var_export([$cE,$this->elements[0]],true)."\n",3,"html_tb.log");
+        }
 
 
         $cP = 0; // Class Padding

app/Report/ReportBaseTextbox.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
         $this->reseth    = $reseth;
         $this->abs_position = $abs_position;
         $this->top_position = $top_position;
-        error_log("\ncreateTB base(top,w,h,nl,reseth): ".var_export([$top,$width,$height,$newline,$reseth],true)."\n\n",3,"pdf.log");
+        error_log("\ncreateTB base(top,w,h,nl,reseth): " . var_export([$top, $width, $height, $newline, $reseth], true) . "\n\n", 3, "pdf.log");
     }
 
     /**