fisharebest / webtrees

app/Gedcom.php

Indentation +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
         '_MBON',
         '_NMR',
         '_SEPR',
-	'_SP_DEAT',  // only used internally, not exported to a gedcom file
+    '_SP_DEAT',  // only used internally, not exported to a gedcom file
     ];
 
     public const CUSTOM_INDIVIDUAL_TAGS = [

Spacing +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
         '_MBON',
         '_NMR',
         '_SEPR',
-	'_SP_DEAT',  // only used internally, not exported to a gedcom file
+	'_SP_DEAT', // only used internally, not exported to a gedcom file
     ];
 
     public const CUSTOM_INDIVIDUAL_TAGS = [

app/Report/ReportHtmlText.php

Braces +3 added lines, -2 removed lines

@@ -98,8 +98,9 @@
     public function getHeight($renderer): float
     {
         $txt2 = $this->text;
-        if (substr($txt2, -1) == "\n")
-            $txt2 = substr($txt2, 0, -1);
+        if (substr($txt2, -1) == "\n") {
+                    $txt2 = substr($txt2, 0, -1);
+        }
         $ct = substr_count($txt2, "\n");
         if ($ct > 0) {
             $ct += 1;

app/Report/ReportParserGenerate.php

Indentation +3 added lines, -3 removed lines

@@ -1154,7 +1154,7 @@ 
                 if (!empty($attrs['truncate'])) {
                     $value = strip_tags($value);
             if ( (int) $attrs['truncate'] > 0 )
-              $value = Str::limit($value, (int) $attrs['truncate'], I18N::translate('…'));
+                $value = Str::limit($value, (int) $attrs['truncate'], I18N::translate('…'));
                 }
                 $this->current_element->addText($value);
             }
@@ -1703,7 +1703,7 @@ 
                 $value = "0";
         }
         if ( isset($attrs['trim']) ) {
-          $value = str_replace($attrs['trim'], '', $value);
+            $value = str_replace($attrs['trim'], '', $value);
         }
         if (preg_match("/\\$(\w+)/", $name, $match)) {
             $name = $this->vars["'" . $match[1] . "'"]['id'];
@@ -3030,7 +3030,7 @@ 
                     $child->generation = $list[$id]->generation ?? 1;
                     if ( $child->xref() != $person->xref() )
                         $this->mfrelation[$child->xref()] = $this->mfrelation[$id] . "x";
-                   }
+                    }
                 }
             }
         }

Spacing +37 added lines, -37 removed lines

@@ -828,21 +828,21 @@ 
         // position of box absolute or relative, and possibly top and height
         if (isset($attrs['pos'])) {
             $pos = $attrs['pos'];
-            if (substr($pos,0,3) == 'abs') {
+            if (substr($pos, 0, 3) == 'abs') {
                 //-- check absolute or relative position
                 $top += -222000;
             }
-            if (substr($pos,0,3) == 'rel') {
+            if (substr($pos, 0, 3) == 'rel') {
                 //-- check absolute or relative position
                 $top = -100000;
             }
-            if (substr($pos,3,3) == '_fh') {
+            if (substr($pos, 3, 3) == '_fh') {
                 $top = -100012;
             }
-            if (substr($pos,3,3) == '_f2') {
+            if (substr($pos, 3, 3) == '_f2') {
                 $top = -100018;
             }
-            if (substr($pos,6,5) == '_html') {
+            if (substr($pos, 6, 5) == '_html') {
                 $top = -90012;
             }
         }
@@ -1016,11 +1016,11 @@ 
             }
         }
         $nameselect = "";
-        if ( isset($attrs['select']) ) {
+        if (isset($attrs['select'])) {
             $nameselect = $attrs['select'];
         }
         $famrel = false;
-        if ( isset($attrs['fam_relation']) ) {
+        if (isset($attrs['fam_relation'])) {
             $famrel = true;
         }
         if (!empty($id)) {
@@ -1030,28 +1030,28 @@ 
             }
             if (!$record->canShowName()) {
                 $this->current_element->addText(I18N::translate('Private'));
-            } else if ( $nameselect == 'latest' ) {
+            } else if ($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));
-            } else if ( $nameselect == 'combined' ) {
+            } else if ($nameselect == 'combined') {
                 $tmp = $record->getAllNames();
-                $name = $tmp[count($tmp)-1]['full'];
-                if ($ix1 = strpos($name,'<span class="starredname">')) {   // '«' and '»' mark text for underlining
+                $name = $tmp[count($tmp) - 1]['full'];
+                if ($ix1 = strpos($name, '<span class="starredname">')) {   // '«' and '»' mark text for underlining
                     $name = substr_replace($name, '«', $ix1, 26);
-                    $ix1 = strpos($name,'</span>',$ix1);
+                    $ix1 = strpos($name, '</span>', $ix1);
                     $name = substr_replace($name, '»', $ix1, 7);
                 }
                 $addname = strip_tags((string) $tmp[0]['surn']);
-                if ( !empty($addname) && !($addname==='@N.N.') && !str_contains($name,$addname) ) {
-                    $name .= " ".I18N::translate('b.')." ".$addname;
+                if (!empty($addname) && !($addname === '@N.N.') && !str_contains($name, $addname)) {
+                    $name .= " " . I18N::translate('b.') . " " . $addname;
                 }
                 $this->current_element->addText(trim($name));
             } else {
                 $name = $record->fullName();
                 $name = strip_tags($name);
                 if (!empty($attrs['truncate'])) {
-                    if ( (int) $attrs['truncate'] > 0 )
+                    if ((int) $attrs['truncate'] > 0)
                     $name = Str::limit($name, (int) $attrs['truncate'], I18N::translate('…'));
                 } else {
                     $addname = (string) $record->alternateName();
@@ -1063,8 +1063,8 @@ 
                 $this->current_element->addText(trim($name));
             }
         }
-        if ( $famrel && ($this->mfrelation[$record->xref()] != "") ) {
-            $this->current_element->addText(" (".(string) $this->mfrelation[$record->xref()].")");
+        if ($famrel && ($this->mfrelation[$record->xref()] != "")) {
+            $this->current_element->addText(" (" . (string) $this->mfrelation[$record->xref()] . ")");
         }
     }
 
@@ -1112,11 +1112,11 @@ 
                 $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" ) $dfmt = "%j %M %Y";
-                if ( $attrs['truncate'] === "Y" ) $dfmt = "%Y";
+                if ($attrs['truncate'] === "d") $dfmt = "%j %M %Y";
+                if ($attrs['truncate'] === "Y") $dfmt = "%Y";
             }
                         $value = strip_tags($tmp->display(null, $dfmt));
                         break;
@@ -1148,12 +1148,12 @@ 
 
         if (isset($attrs['lcfirst'])) {
             $value = lcfirst($value);
-            $value = str_replace(["Å","Ä","Ö"], ["å","ä","ö"], $value);
+            $value = str_replace(["Å", "Ä", "Ö"], ["å", "ä", "ö"], $value);
         }
 
                 if (!empty($attrs['truncate'])) {
                     $value = strip_tags($value);
-            if ( (int) $attrs['truncate'] > 0 )
+            if ((int) $attrs['truncate'] > 0)
               $value = Str::limit($value, (int) $attrs['truncate'], I18N::translate('…'));
                 }
                 $this->current_element->addText($value);
@@ -1385,7 +1385,7 @@ 
         }
         if (isset($attrs['cut'])) {
         $cut = (int) $attrs['cut'];
-        $var = $cut >0 ? substr($var, 0, $cut) : substr($var, $cut);
+        $var = $cut > 0 ? substr($var, 0, $cut) : substr($var, $cut);
         if ($cut == 0) $var = "";
         }
         if (isset($attrs['lcfirst'])) {
@@ -1497,7 +1497,7 @@ 
         // Resort 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
@@ -1522,7 +1522,7 @@ 
 
         // Remove spouse deaths that are too late: after new marriage or own death
         $currfam = "";
-        for ($i = 0; $i <= count($this->repeats) - 1; $i ++) {
+        for ($i = 0; $i <= count($this->repeats) - 1; $i++) {
             if (preg_match('/[1234] FAMS @(.+)@/', $this->repeats[$i], $match))
                 $currfam = $match[1];
             if (preg_match('/_SP_DEAT.*\n2 DATE (.*)\n.*_O_FAM (.+)\n/', $this->repeats[$i], $match)) {
@@ -1574,8 +1574,8 @@ 
             $count = count($this->repeats);
             $i = 0;
             while ($i < $count) {
-                if (! isset($this->repeats[$i])) {
-                    $i ++;
+                if (!isset($this->repeats[$i])) {
+                    $i++;
                     continue; // this fact has been removed above, occured too late
                 }
                 $this->gedrec = $this->repeats[$i];
@@ -1691,7 +1691,7 @@ 
                         $nnn = 0;
                     error_log("\n---- setvar start  " . date("Y-m-d H:i:s") . " RPG " . __LINE__ . "  " . $name . "  -----\n", 3, "my-errors.log");
                     foreach ($this->vars as $key => $val) {
-                        if ($nnn -- < 0)
+                        if ($nnn-- < 0)
                             error_log($key . "='" . $val['id'] . "'\n", 3, "my-errors.log");
                     }
                 }
@@ -1702,7 +1702,7 @@ 
             else
                 $value = "0";
         }
-        if ( isset($attrs['trim']) ) {
+        if (isset($attrs['trim'])) {
           $value = str_replace($attrs['trim'], '', $value);
         }
         if (preg_match("/\\$(\w+)/", $name, $match)) {
@@ -2889,7 +2889,7 @@ 
         static $focusperson = true;
         static $dupl = 1;
         $sx = $person->sex();
-        $rl="x"; // unknown
+        $rl = "x"; // unknown
         if ($sx == "M")
             $rl = "s"; // son
         if ($sx == "F")
@@ -2903,7 +2903,7 @@ 
                 $list[$pid] = $person;
             }
         else if (!$focusperson) {
-            $newpid = "D_".$dupl."_".$pid;
+            $newpid = "D_" . $dupl . "_" . $pid;
             $list[$newpid] = $person;
         }
         if (!isset($list[$newpid]->generation)) {
@@ -2939,14 +2939,14 @@ 
                     $this->mfrelation[$wife->xref()] = $this->mfrelation[$person->xref()] . "x";
                     if ($wife->canShow())
                         $list[$wife->xref()] = $wife;
-                    if (! isset($wife->generation))
+                    if (!isset($wife->generation))
                         $wife->generation = $person->generation;
                     $nam = $wife->getAllNames()[0]['fullNN'];
                 } else {
                     $this->mfrelation[$husband->xref()] = $this->mfrelation[$person->xref()] . "x";
                     if ($husband->canShow())
                         $list[$husband->xref()] = $husband;
-                    if (! isset($husband->generation))
+                    if (!isset($husband->generation))
                         $husband->generation = $person->generation;
                     $nam = $husband->getAllNames()[0]['fullNN'];
                 }
@@ -2957,7 +2957,7 @@ 
                 if ($child) {
 
                     $sx = $child->sex();
-                    $rl="x"; // unknown
+                    $rl = "x"; // unknown
                     if ($sx == "M")
                         $rl = "s"; // son
                     if ($sx == "F")
@@ -3000,7 +3000,7 @@ 
             if (str_starts_with($id, 'empty')) {
                 continue; // id can be something like “empty7”
             }
-            if (! isset($this->mfrelation[$id]))
+            if (!isset($this->mfrelation[$id]))
                 $this->mfrelation[$id] = "";
             $person = Registry::individualFactory()->make($id, $this->tree);
             foreach ($person->childFamilies() as $family) {
@@ -3028,7 +3028,7 @@ 
                     foreach ($family->children() as $child) {
                     $list[$child->xref()] = $child;
                     $child->generation = $list[$id]->generation ?? 1;
-                    if ( $child->xref() != $person->xref() )
+                    if ($child->xref() != $person->xref())
                         $this->mfrelation[$child->xref()] = $this->mfrelation[$id] . "x";
                    }
                 }

Braces +140 added lines, -91 removed lines

@@ -1037,7 +1037,8 @@ 
             } else if ( $nameselect == 'combined' ) {
                 $tmp = $record->getAllNames();
                 $name = $tmp[count($tmp)-1]['full'];
-                if ($ix1 = strpos($name,'<span class="starredname">')) {   // '«' and '»' mark text for underlining
+                if ($ix1 = strpos($name,'<span class="starredname">')) {
+// '«' and '»' mark text for underlining
                     $name = substr_replace($name, '«', $ix1, 26);
                     $ix1 = strpos($name,'</span>',$ix1);
                     $name = substr_replace($name, '»', $ix1, 7);
@@ -1051,8 +1052,9 @@ 
                 $name = $record->fullName();
                 $name = strip_tags($name);
                 if (!empty($attrs['truncate'])) {
-                    if ( (int) $attrs['truncate'] > 0 )
-                    $name = Str::limit($name, (int) $attrs['truncate'], I18N::translate('…'));
+                    if ( (int) $attrs['truncate'] > 0 ) {
+                                        $name = Str::limit($name, (int) $attrs['truncate'], I18N::translate('…'));
+                    }
                 } else {
                     $addname = (string) $record->alternateName();
                     $addname = strip_tags($addname);
@@ -1115,8 +1117,12 @@ 
                         $tmp   = new Date($value);
             $dfmt = "%j %F %Y";
             if (!empty($attrs['truncate'])) {
-                if ( $attrs['truncate'] === "d" ) $dfmt = "%j %M %Y";
-                if ( $attrs['truncate'] === "Y" ) $dfmt = "%Y";
+                if ( $attrs['truncate'] === "d" ) {
+                    $dfmt = "%j %M %Y";
+                }
+                if ( $attrs['truncate'] === "Y" ) {
+                    $dfmt = "%Y";
+                }
             }
                         $value = strip_tags($tmp->display(null, $dfmt));
                         break;
@@ -1153,8 +1159,9 @@ 
 
                 if (!empty($attrs['truncate'])) {
                     $value = strip_tags($value);
-            if ( (int) $attrs['truncate'] > 0 )
-              $value = Str::limit($value, (int) $attrs['truncate'], I18N::translate('…'));
+            if ( (int) $attrs['truncate'] > 0 ) {
+                          $value = Str::limit($value, (int) $attrs['truncate'], I18N::translate('…'));
+            }
                 }
                 $this->current_element->addText($value);
             }
@@ -1386,7 +1393,9 @@ 
         if (isset($attrs['cut'])) {
         $cut = (int) $attrs['cut'];
         $var = $cut >0 ? substr($var, 0, $cut) : substr($var, $cut);
-        if ($cut == 0) $var = "";
+        if ($cut == 0) {
+            $var = "";
+        }
         }
         if (isset($attrs['lcfirst'])) {
         $var = lcfirst($var);
@@ -1453,36 +1462,43 @@ 
                 $famid = $match[1];
                 $fam = Registry::familyFactory()->make($match[1], $this->tree);
                 $dt = $this->getGedcomValue("MARR:DATE", 0, $fam->gedcom());
-                if ($dt == "")
-                    $dt = $this->getGedcomValue("ENGA:DATE", 0, $fam->gedcom());
-                if ($dt == "" && $this->getGedcomValue("EVEN:TYPE", 0, $fam->gedcom()) == "Sambo")
-                    $dt = $this->getGedcomValue("EVEN:DATE", 0, $fam->gedcom());
+                if ($dt == "") {
+                                    $dt = $this->getGedcomValue("ENGA:DATE", 0, $fam->gedcom());
+                }
+                if ($dt == "" && $this->getGedcomValue("EVEN:TYPE", 0, $fam->gedcom()) == "Sambo") {
+                                    $dt = $this->getGedcomValue("EVEN:DATE", 0, $fam->gedcom());
+                }
                 $date = new Date($dt);
                 $jd = $date->julianDay();
                 $jdarr[$key] = $jd;
                 // Divorce
                 $dt = $this->getGedcomValue("DIV:DATE", 0, $fam->gedcom());
-                if ($dt != "")
-                    $this->repeats[] = "1 DIV\n2 DATE " . $dt . "\n";
+                if ($dt != "") {
+                                    $this->repeats[] = "1 DIV\n2 DATE " . $dt . "\n";
+                }
                 // Separation // Doesn't work!! getGedComValue only reports the first event!! I.e. no match here
                 if ($this->getGedcomValue("EVEN:TYPE", 0, $fam->gedcom()) == "Separation") {
                     $dt = $this->getGedcomValue("EVEN:DATE", 0, $fam->gedcom());
-                    if ($dt != "")
-                        $this->repeats[] = "1 EVEN\n2 TYPE Separation\n2 DATE " . $dt . "\n";
+                    if ($dt != "") {
+                                            $this->repeats[] = "1 EVEN\n2 TYPE Separation\n2 DATE " . $dt . "\n";
+                    }
                 }
                 // death of husband / wife
                 $husb = $fam->husband();
                 $wife = $fam->wife();
-                if ($this->getGedcomValue("SEX", 0, $this->gedrec) == "M")
-                    $spouse = $wife;
-                else
-                    $spouse = $husb;
-                if ($spouse)
-                    $dt = $this->getGedcomValue("DEAT:DATE", 0, $spouse->gedcom());
-                else
-                    $dt = "";
-                if ($dt != "")
-                    $this->repeats[] = "1 _SP_DEAT\n2 DATE " . $dt . "\n2 _O_FAM " . $famid . "\n";
+                if ($this->getGedcomValue("SEX", 0, $this->gedrec) == "M") {
+                                    $spouse = $wife;
+                } else {
+                                    $spouse = $husb;
+                }
+                if ($spouse) {
+                                    $dt = $this->getGedcomValue("DEAT:DATE", 0, $spouse->gedcom());
+                } else {
+                                    $dt = "";
+                }
+                if ($dt != "") {
+                                    $this->repeats[] = "1 _SP_DEAT\n2 DATE " . $dt . "\n2 _O_FAM " . $famid . "\n";
+                }
             }
         }
         // Find the dates for the facts that are found
@@ -1497,11 +1513,13 @@ 
         // Resort 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
-            if ($jdarr[$i] === 0)
-                $jdarr[$i] = $prevd;
-            else
-                $prevd = $jdarr[$i];
+        for ($i = 0; $i <= $m; $i ++) {
+// keep undated events after previous dated event
+            if ($jdarr[$i] === 0) {
+                            $jdarr[$i] = $prevd;
+            } else {
+                            $prevd = $jdarr[$i];
+            }
         }
 
         while ($m > 1) {
@@ -1523,11 +1541,14 @@ 
         // Remove spouse deaths that are too late: after new marriage or own death
         $currfam = "";
         for ($i = 0; $i <= count($this->repeats) - 1; $i ++) {
-            if (preg_match('/[1234] FAMS @(.+)@/', $this->repeats[$i], $match))
-                $currfam = $match[1];
+            if (preg_match('/[1234] FAMS @(.+)@/', $this->repeats[$i], $match)) {
+                            $currfam = $match[1];
+            }
             if (preg_match('/_SP_DEAT.*\n2 DATE (.*)\n.*_O_FAM (.+)\n/', $this->repeats[$i], $match)) {
-                if ($currfam != $match[2] || $i == count($this->repeats) - 1)
-                    $this->repeats[$i] = "1 _XXX\n"; // ignore fact
+                if ($currfam != $match[2] || $i == count($this->repeats) - 1) {
+                                    $this->repeats[$i] = "1 _XXX\n";
+                }
+                // ignore fact
             }
         }
     }
@@ -1648,8 +1669,11 @@ 
 
         $name  = $attrs['name'];
         $value = $attrs['value'];
-        if (isset($attrs['dumpvar'])) $dumpvar = $attrs['dumpvar'];
-        else $dumpvar = "";
+        if (isset($attrs['dumpvar'])) {
+            $dumpvar = $attrs['dumpvar'];
+        } else {
+            $dumpvar = "";
+        }
         $match = [];
         // Current GEDCOM record strings
         if ($value === '@ID') {
@@ -1661,17 +1685,19 @@ 
         } elseif ($value === '@desc') {
             $value = $this->desc;
         } elseif ($value === '@format') {
-            if (isset($_GET["format"]))
-                $value = $_GET["format"];
-            else
-                $value = "";
+            if (isset($_GET["format"])) {
+                            $value = $_GET["format"];
+            } else {
+                            $value = "";
+            }
         } elseif ($value === '@generation') {
             $value = (string) $this->generation;
         } elseif ($value === '@relation') {
-            if (isset($this->mfrelation[$this->xref()]))
-                $value = (string) $this->mfrelation[$this->xref()];
-            else
-                $value = "";
+            if (isset($this->mfrelation[$this->xref()])) {
+                            $value = (string) $this->mfrelation[$this->xref()];
+            } else {
+                            $value = "";
+            }
         } elseif (preg_match("/@(\w+)/", $value, $match)) {
             $gmatch = [];
             if (preg_match("/\d $match[1] (.+)/", $this->gedrec, $gmatch)) {
@@ -1680,27 +1706,30 @@ 
         } elseif (preg_match("/@\\$(\w+)/", $value, $match)) {
             if ($match[1] == "dump" && $this->vars['dval']['id'] > 0) {
                 // if ($this->vars[ 'dval' ]['id'] == 1001)
-                if ($dumpvar == "gedrec")
-                    error_log("\n---- setvar start  " . date("Y-m-d H:i:s") . " RPG " . __LINE__ . "  " . $name . "  gedcom=\n" . $this->gedrec . "\n", 3, "my-errors.log");
-                else if ($dumpvar != "")
-                    error_log("var: " . $dumpvar . " = " . $this->vars[$dumpvar]['id'] . "\n", 3, "my-errors.log");
-                else {
-                    if (isset($this->vars['dval']['id']))
-                        $nnn = $this->vars['dval']['id'];
-                    else
-                        $nnn = 0;
+                if ($dumpvar == "gedrec") {
+                                    error_log("\n---- setvar start  " . date("Y-m-d H:i:s") . " RPG " . __LINE__ . "  " . $name . "  gedcom=\n" . $this->gedrec . "\n", 3, "my-errors.log");
+                } else if ($dumpvar != "") {
+                                    error_log("var: " . $dumpvar . " = " . $this->vars[$dumpvar]['id'] . "\n", 3, "my-errors.log");
+                } else {
+                    if (isset($this->vars['dval']['id'])) {
+                                            $nnn = $this->vars['dval']['id'];
+                    } else {
+                                            $nnn = 0;
+                    }
                     error_log("\n---- setvar start  " . date("Y-m-d H:i:s") . " RPG " . __LINE__ . "  " . $name . "  -----\n", 3, "my-errors.log");
                     foreach ($this->vars as $key => $val) {
-                        if ($nnn -- < 0)
-                            error_log($key . "='" . $val['id'] . "'\n", 3, "my-errors.log");
+                        if ($nnn -- < 0) {
+                                                    error_log($key . "='" . $val['id'] . "'\n", 3, "my-errors.log");
+                        }
                     }
                 }
             }
             $value = $this->vars[$match[1]]['id'];
-            if (isset($this->vars[$value]['id']))
-                $value = '$' . $this->vars[$match[1]]['id'];
-            else
-                $value = "0";
+            if (isset($this->vars[$value]['id'])) {
+                            $value = '$' . $this->vars[$match[1]]['id'];
+            } else {
+                            $value = "0";
+            }
         }
         if ( isset($attrs['trim']) ) {
           $value = str_replace($attrs['trim'], '', $value);
@@ -1722,7 +1751,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);
         }
 
@@ -2711,10 +2741,13 @@ 
                 $genCounter = 1;
                 while (count($newarray) < count($this->list)) {
                     foreach ($this->list as $key => $value) {
-                        if ($value->generation < 0)
-                            $this->generation = -$value->generation; // indication of husband or wife
-                        else
-                            $this->generation = $value->generation;
+                        if ($value->generation < 0) {
+                                                    $this->generation = -$value->generation;
+                        }
+                        // indication of husband or wife
+                        else {
+                                                    $this->generation = $value->generation;
+                        }
                         if ($this->generation == $genCounter) {
                             $newarray[$key] = (object) ['generation' => $this->generation];
                         }
@@ -2890,19 +2923,23 @@ 
         static $dupl = 1;
         $sx = $person->sex();
         $rl="x"; // unknown
-        if ($sx == "M")
-            $rl = "s"; // son
-        if ($sx == "F")
-            $rl = "d"; // daughter
-        if ($focusperson)
-            $this->mfrelation[$pid] = "";
+        if ($sx == "M") {
+                    $rl = "s";
+        }
+        // son
+        if ($sx == "F") {
+                    $rl = "d";
+        }
+        // daughter
+        if ($focusperson) {
+                    $this->mfrelation[$pid] = "";
+        }
         $nam = $person->getAllNames()[0]['fullNN'];
 
         $newpid = $pid;
         if (!isset($list[$pid])) {
                 $list[$pid] = $person;
-            }
-        else if (!$focusperson) {
+            } else if (!$focusperson) {
             $newpid = "D_".$dupl."_".$pid;
             $list[$newpid] = $person;
         }
@@ -2937,17 +2974,21 @@ 
             if ($husband && $wife) {
                 if ($husband->xref() == $person->xref()) {
                     $this->mfrelation[$wife->xref()] = $this->mfrelation[$person->xref()] . "x";
-                    if ($wife->canShow())
-                        $list[$wife->xref()] = $wife;
-                    if (! isset($wife->generation))
-                        $wife->generation = $person->generation;
+                    if ($wife->canShow()) {
+                                            $list[$wife->xref()] = $wife;
+                    }
+                    if (! isset($wife->generation)) {
+                                            $wife->generation = $person->generation;
+                    }
                     $nam = $wife->getAllNames()[0]['fullNN'];
                 } else {
                     $this->mfrelation[$husband->xref()] = $this->mfrelation[$person->xref()] . "x";
-                    if ($husband->canShow())
-                        $list[$husband->xref()] = $husband;
-                    if (! isset($husband->generation))
-                        $husband->generation = $person->generation;
+                    if ($husband->canShow()) {
+                                            $list[$husband->xref()] = $husband;
+                    }
+                    if (! isset($husband->generation)) {
+                                            $husband->generation = $person->generation;
+                    }
                     $nam = $husband->getAllNames()[0]['fullNN'];
                 }
             }
@@ -2958,10 +2999,14 @@ 
 
                     $sx = $child->sex();
                     $rl="x"; // unknown
-                    if ($sx == "M")
-                        $rl = "s"; // son
-                    if ($sx == "F")
-                        $rl = "d"; // daughter
+                    if ($sx == "M") {
+                                            $rl = "s";
+                    }
+                    // son
+                    if ($sx == "F") {
+                                            $rl = "d";
+                    }
+                    // daughter
                     $rl = $this->mfrelation[$person->xref()] . $rl;
                     $this->mfrelation[$child->xref()] = $rl;
                     if (isset($list[$pid]->generation)) {
@@ -2973,8 +3018,10 @@ 
             }
             if ($generations == -1 || $list[$pid]->generation < $generations) {
                 foreach ($children as $child) {
-                    if ($child->canShow())
-                        $this->addDescendancy($list, $child->xref(), $parents, $generations); // recurse on the childs family
+                    if ($child->canShow()) {
+                                            $this->addDescendancy($list, $child->xref(), $parents, $generations);
+                    }
+                    // recurse on the childs family
                 }
             }
         }
@@ -3000,8 +3047,9 @@ 
             if (str_starts_with($id, 'empty')) {
                 continue; // id can be something like “empty7”
             }
-            if (! isset($this->mfrelation[$id]))
-                $this->mfrelation[$id] = "";
+            if (! isset($this->mfrelation[$id])) {
+                            $this->mfrelation[$id] = "";
+            }
             $person = Registry::individualFactory()->make($id, $this->tree);
             foreach ($person->childFamilies() as $family) {
                 $husband = $family->husband();
@@ -3028,8 +3076,9 @@ 
                     foreach ($family->children() as $child) {
                     $list[$child->xref()] = $child;
                     $child->generation = $list[$id]->generation ?? 1;
-                    if ( $child->xref() != $person->xref() )
-                        $this->mfrelation[$child->xref()] = $this->mfrelation[$id] . "x";
+                    if ( $child->xref() != $person->xref() ) {
+                                            $this->mfrelation[$child->xref()] = $this->mfrelation[$id] . "x";
+                    }
                    }
                 }
             }

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

@@ -1143,7 +1143,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'])) {

app/Report/ReportHtmlTextbox.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,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);
@@ -140,9 +140,9 @@ 
         if ($this->top < -110000) // pos='abs'
             $this->top += 222000; 
         if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html
-            $this->top += 90000;  //= ReportBaseElement::CURRENT_POSITION;
+            $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION;
             if ($this->top < -9000) $this->top += 10000; 
-            $topstr = "top:".$this->top."pt;";
+            $topstr = "top:" . $this->top . "pt;";
             $align_Y = true;
         }
         if ($this->top === ReportBaseElement::CURRENT_POSITION) {

Braces +26 added lines, -16 removed lines

@@ -137,11 +137,16 @@ 
         // If current position (top)
         $align_Y = false;
         $topstr = "";
-        if ($this->top < -110000) // pos='abs'
-            $this->top += 222000; 
-        if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html
+        if ($this->top < -110000) {
+            // pos='abs'
+            $this->top += 222000;
+        }
+        if ($this->top < -10000) {
+// <= -100000: both pdf and html; -100000 -- -90000: only html
             $this->top += 90000;  //= ReportBaseElement::CURRENT_POSITION;
-            if ($this->top < -9000) $this->top += 10000; 
+            if ($this->top < -9000) {
+                $this->top += 10000;
+            }
             $topstr = "top:".$this->top."pt;";
             $align_Y = true;
         }
@@ -239,10 +244,11 @@ 
         $renderer->addMaxY($this->top + $cH);
 
         // Start to print HTML
-        if (!$align_Y)
-            echo '<div style="position:absolute;top:', $this->top, 'pt;';
-        else
-            echo '<div style="position:relative;top:', $this->top, 'pt;';
+        if (!$align_Y) {
+                    echo '<div style="position:absolute;top:', $this->top, 'pt;';
+        } else {
+                    echo '<div style="position:relative;top:', $this->top, 'pt;';
+        }
             //echo '<div style="position:relative;';
         // LTR (left) or RTL (right)
         echo $renderer->alignRTL, ':', $cX, 'pt;';
@@ -258,15 +264,19 @@ 
         // Border setup
         if ($this->border) {
             echo ' border:solid black 1pt;';
-            if (!$align_Y)
-                echo 'width:', $this->width - 1 - $cP * 2, 'pt;height:', $cH - 1, 'pt;';
-            else
-                echo 'width:', $this->width - 1 - $cP * 2, 'pt;height:auto;'; // height:',$this->height,'pt;'; //,$topstr;
+            if (!$align_Y) {
+                            echo 'width:', $this->width - 1 - $cP * 2, 'pt;height:', $cH - 1, 'pt;';
+            } else {
+                            echo 'width:', $this->width - 1 - $cP * 2, 'pt;height:auto;';
+            }
+            // height:',$this->height,'pt;'; //,$topstr;
         } else {
-            if (!$align_Y)
-                echo 'width:', $this->width - $cP * 2, 'pt;height:', $cH, 'pt;';
-            else
-                echo 'width:', $this->width - $cP * 2, 'pt;height:auto;'; //height:',$this->height,'pt;'; //,$topstr;
+            if (!$align_Y) {
+                            echo 'width:', $this->width - $cP * 2, 'pt;height:', $cH, 'pt;';
+            } else {
+                            echo 'width:', $this->width - $cP * 2, 'pt;height:auto;';
+            }
+            //height:',$this->height,'pt;'; //,$topstr;
         }
         echo '">';
 

app/Report/ReportPdfTextBox.php

Indentation +1 added lines, -1 removed lines

@@ -327,7 +327,7 @@
                 $element->render($renderer);
                 // If tcpdf has added a new page the left margin must be restored
                 if ($cPT != $renderer->tcpdf->getPage())
-                	$renderer->tcpdf->setLeftMargin($cMT['left']);
+                    $renderer->tcpdf->setLeftMargin($cMT['left']);
             } elseif ($element === 'footnotetexts') {
                 $renderer->footnotes();
             } elseif ($element === 'addpage') {

Spacing +3 added lines, -3 removed lines

@@ -147,7 +147,7 @@ 
         if ($this->top === ReportBaseElement::CURRENT_POSITION) {
             $cY = $renderer->tcpdf->GetY();
             //-- check for space after the last picture
-            if ($align_Y && ($cY < $lastBoxYfinal) )
+            if ($align_Y && ($cY < $lastBoxYfinal))
                 $cY = $lastBoxYfinal;
         } else {
             $cY = $this->top;
@@ -351,7 +351,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
@@ -361,7 +361,7 @@ 
                 $renderer->tcpdf->setY($min_Y);
             } else {
                 // 15 is good enough, should be a more general value ($cH is too large!)
-                $renderer->tcpdf->setY($curr_Y + ($cH>15?15:$cH));
+                $renderer->tcpdf->setY($curr_Y + ($cH > 15 ? 15 : $cH));
             }
             $renderer->lastCellHeight = 0;
         }

Braces +16 added lines, -9 removed lines

@@ -96,7 +96,9 @@ 
                 if (!empty($lastelement)) {
                     if ($element instanceof ReportBaseImage) {
                         $imgH = $element->getHeight();
-                    } else $imgH = 0;
+                    } else {
+                        $imgH = 0;
+                    }
                     $cX = $renderer->tcpdf->GetX();
                     $newelements[] = $lastelement;
                     $lastelement   = [];
@@ -137,18 +139,22 @@ 
         // If current position (top)
         $align_Y = false;
         $curr_P = $renderer->tcpdf->getPage();
-        if ($this->top < -95000) { // 90000: only html; 100000: both pdf and html
+        if ($this->top < -95000) {
+// 90000: only html; 100000: both pdf and html
             $align_Y = true;
         }
-        if ($this->top < -200000)   // pos="abs"
+        if ($this->top < -200000) {
+            // pos="abs"
             $this->top += 222000;
-        else
-            $this->top = ReportBaseElement::CURRENT_POSITION;
+        } else {
+                    $this->top = ReportBaseElement::CURRENT_POSITION;
+        }
         if ($this->top === ReportBaseElement::CURRENT_POSITION) {
             $cY = $renderer->tcpdf->GetY();
             //-- check for space after the last picture
-            if ($align_Y && ($cY < $lastBoxYfinal) )
-                $cY = $lastBoxYfinal;
+            if ($align_Y && ($cY < $lastBoxYfinal) ) {
+                            $cY = $lastBoxYfinal;
+            }
         } else {
             $cY = $this->top;
             $renderer->tcpdf->setY($cY);
@@ -326,8 +332,9 @@ 
                 $cMT = $renderer->tcpdf->getMargins();
                 $element->render($renderer);
                 // If tcpdf has added a new page the left margin must be restored
-                if ($cPT != $renderer->tcpdf->getPage())
-                	$renderer->tcpdf->setLeftMargin($cMT['left']);
+                if ($cPT != $renderer->tcpdf->getPage()) {
+                                	$renderer->tcpdf->setLeftMargin($cMT['left']);
+                }
             } elseif ($element === 'footnotetexts') {
                 $renderer->footnotes();
             } elseif ($element === 'addpage') {

app/Report/HtmlRenderer.php

Spacing +2 added lines, -2 removed lines

@@ -202,8 +202,8 @@
             echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
             echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">';
         } else {
-            echo '<div id="bottommargin" style="position: relative; top: '.$this->Y.'pt; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
-            echo '<div id="footerdiv" style="position: relative; top: '.$this->Y.'pt; width: ', $this->noMarginWidth, 'pt;height:auto;">';
+            echo '<div id="bottommargin" style="position: relative; top: ' . $this->Y . 'pt; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
+            echo '<div id="footerdiv" style="position: relative; top: ' . $this->Y . 'pt; width: ', $this->noMarginWidth, 'pt;height:auto;">';
         }
         $this->Y    = 0;
         $this->X    = 0;

Braces +2 added lines, -1 removed lines

@@ -198,7 +198,8 @@
         //-- footer
         echo '</div>';
         //echo '<script>document.getElementById("bodydiv").style.height="', $this->maxY, 'pt";</script>';
-        if ($this->Y < 200) { //heuristic guess!
+        if ($this->Y < 200) {
+//heuristic guess!
             echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
             echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">';
         } else {