mambax7 / pedigree

comment_post.php

Spacing +2 added lines, -2 removed lines

@@ -17,5 +17,5 @@
  * @author         XOOPS Development Team
  */
 
-include  dirname(dirname(__DIR__)) . '/mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_post.php';
+include  dirname(dirname(__DIR__)).'/mainfile.php';
+include XOOPS_ROOT_PATH.'/include/comment_post.php';

coi.php

Spacing +39 added lines, -39 removed lines

@@ -6,13 +6,13 @@ 
 ini_set('memory_limit', '32M');
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_coi.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 //get module configuration
 /** @var XoopsModuleHandler $moduleHandler */
@@ -69,7 +69,7 @@ 
 }
 
 $empty = []; // an empty array
-$sql1  = 'SELECT id, father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id ';
+$sql1  = 'SELECT id, father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id ';
 
 // input data arrays:
 $IDs     = $empty;
@@ -216,7 +216,7 @@ 
             $j     = min($im, 6);
             $c     = $couls[$j];
             $first = 0;
-            echo '<font color=' . $c . ' size="+2"><b>*' . $i . '*</b></font>';
+            echo '<font color='.$c.' size="+2"><b>*'.$i.'*</b></font>';
         }
     }
 
@@ -242,10 +242,10 @@ 
         $ani          = set_name($ID);
         $name         = $ani[1];
         $name         = $ID;
-        $cell_content = Pedigree\Utility::showParent($name) . $nl;
+        $cell_content = Pedigree\Utility::showParent($name).$nl;
     }
     $rowspan = 1 << ($depth - $gen);
-    echo '<td rowspan=' . $rowspan . ' align="center" class="' . $class . '">' . $cell_content . "</td>$nl";
+    echo '<td rowspan='.$rowspan.' align="center" class="'.$class.'">'.$cell_content."</td>$nl";
     if ($gen < $depth) {
         $sire = 0;
         if ($ind || 0 == $gen) {
@@ -282,26 +282,26 @@ 
          . _('Sire / Dam')
          . '</th>';
     if ($depth >= 2) {
-        echo '<th>' . _('Grandparents') . '</th>' . $nl;
+        echo '<th>'._('Grandparents').'</th>'.$nl;
     }
     if ($depth >= 3) {
-        echo '<th>' . _('Great-Grandparents') . '</th>' . $nl;
+        echo '<th>'._('Great-Grandparents').'</th>'.$nl;
     }
     if ($depth >= 4) {
-        echo '<th>3xGr. P.</th>' . $nl;
+        echo '<th>3xGr. P.</th>'.$nl;
     }
     if ($depth >= 5) {
-        echo '<th>4xGr. P.</th>' . $nl;
+        echo '<th>4xGr. P.</th>'.$nl;
     }
     if ($depth >= 6) {
-        echo '<th>5xGr. P.</th>' . $nl;
+        echo '<th>5xGr. P.</th>'.$nl;
     }
     if ($depth >= 7) {
-        echo '<th>6xGr. P.</th>' . $nl;
+        echo '<th>6xGr. P.</th>'.$nl;
     }
     echo '</tr><tr>';
     output_animal(0, 0, '0'); /* output the sketch pedigree */
-    echo $nl . '</tr></table>' . $nl . '<p>' . $nl;
+    echo $nl.'</tr></table>'.$nl.'<p>'.$nl;
 
     return 0;
 }
@@ -435,7 +435,7 @@ 
         /* $list1 = join (' ', $listall) ; $list2 = join ('+', $listnew) ;
              echo "<!-- P ($nloop) $list1/$list2 -->$nl" ; */
 //        $listall = array_merge($listall, $listnew);
-        $listall[] =  $listnew;
+        $listall[] = $listnew;
     }
     //    $listall = call_user_func_array('array_merge', $listall);
     $listall = array_merge(...$listall);
@@ -487,7 +487,7 @@ 
         $listnew = array_diff(array_unique($liste), $listall);
         // $list1 = join (' ', $listall) ; $list2 = join ('+', $listnew) ; echo "M ($nloop) $list1/$list2 $nl" ;
 //        $listall = array_merge($listall, $listnew);
-        $listall[] =  $listnew;
+        $listall[] = $listnew;
     }
 //    $listall = call_user_func_array('array_merge', $listall);
     $listall = array_merge(...$listall);
@@ -688,7 +688,7 @@ 
                     ++$nbtot;
                 }
                 if ($j > $nloop - 10) {
-                    $listing .= "Loop $j: Animal #$s " . $IDs[$s] . $nl;
+                    $listing .= "Loop $j: Animal #$s ".$IDs[$s].$nl;
                 }
             }
             if (false !== ($d = $mothers[$i])) {
@@ -703,7 +703,7 @@ 
                     ++$nbtot;
                 }
                 if ($j > $nloop - 10) {
-                    $listing .= "Loop $j: Animal #$d " . $IDs[$d] . $nl;
+                    $listing .= "Loop $j: Animal #$d ".$IDs[$d].$nl;
                 }
             }
         }
@@ -741,7 +741,7 @@ 
     $ID   = (int)$ID;
     $ani  = [];
     if ($ID) {
-        $sqlQuery    = 'SELECT id, naam, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id = '$ID'";
+        $sqlQuery    = 'SELECT id, naam, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id = '$ID'";
         $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
         $ani         = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
         /*
@@ -782,7 +782,7 @@ 
         return '&nbsp;';
     }
     $e   = str_replace(' ', '+', $ems);
-    $res = '<a href="#" style="text-decoration:none;" onClick="' . "window.open('http://www.somali.asso.fr/eros/decode_ems.php?$e'," . "'', 'resizable=no,width=570,height=370')" . '"' . "><b>$ems</b></a>";
+    $res = '<a href="#" style="text-decoration:none;" onClick="'."window.open('http://www.somali.asso.fr/eros/decode_ems.php?$e',"."'', 'resizable=no,width=570,height=370')".'"'."><b>$ems</b></a>";
 
     return $res;
 }
@@ -804,7 +804,7 @@ 
     if (is_array($animal)) {
     list($ID, $name, $sex, $hd, $ems) = $animal;
     }
-    $sqlQuery    = 'SELECT SQL_CACHE COUNT(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " where father = '$ID' or mother = '$ID'";
+    $sqlQuery    = 'SELECT SQL_CACHE COUNT(id) FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." where father = '$ID' or mother = '$ID'";
     $queryResult = $GLOBALS['xoopsDB']->queryF($sqlQuery);
     $nb          = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
     $nb_children = $nb[0];
@@ -812,7 +812,7 @@ 
         $nb_children = _MA_PEDIGREE_COI_NO;
     }
     //$dogid = $animal[0];
-    $content .= '<tr><td><a href="dog.php?id=' . $ID . '">' . stripslashes($name) . '</a>';
+    $content .= '<tr><td><a href="dog.php?id='.$ID.'">'.stripslashes($name).'</a>';
     // if ($nb_enf == 0) echo ' &oslash;' ;
     if ($val) {
         $content .= $val;
@@ -823,7 +823,7 @@ 
     if (0 == $sex) {
         $geslacht = '<img src="assets/images/male.gif">';
     }
-    $content .= '</td><td>' . $geslacht . '</td><td>' . $nb_children . _MA_PEDIGREE_COI_OFF . '</td></tr>';
+    $content .= '</td><td>'.$geslacht.'</td><td>'.$nb_children._MA_PEDIGREE_COI_OFF.'</td></tr>';
 
     return $content;
 }
@@ -873,7 +873,7 @@ 
 }
 
 if (isset($a)) {
-    $sqlQuery    = 'SELECT id, father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id  = '$a'";
+    $sqlQuery    = 'SELECT id, father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id  = '$a'";
     $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
     $rowhond     = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
     $a           = $rowhond['id'];
@@ -888,7 +888,7 @@ 
 $xoopsTpl->assign('pcontent', strtr(_MA_PEDIGREE_COI_CKRI_CT, ['[animalType]' => $moduleConfig['animalType']]));
 
 if (!$s && !$d) {
-    $error = _MA_PEDIGREE_COI_SPANF1 . $a . _MA_PEDIGREE_COI_SPANF2;
+    $error = _MA_PEDIGREE_COI_SPANF1.$a._MA_PEDIGREE_COI_SPANF2;
     $xoopsTpl->assign('COIerror', $error);
 }
 
@@ -922,7 +922,7 @@ 
     $codec2 = 0;
 }
 
-$sqlQuery    = 'SELECT father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id  = '$codec1'";
+$sqlQuery    = 'SELECT father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id  = '$codec1'";
 $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
 $rowhond     = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
 $a1          = $rowhond['id'];
@@ -932,7 +932,7 @@ 
 
 // echo "sqlquery:".$sqlQuery."<br>";
 
-$sqlQuery    = 'SELECT father, mother, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id  = '$codec2'";
+$sqlQuery    = 'SELECT father, mother, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id  = '$codec2'";
 $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
 $rowhond     = $GLOBALS['xoopsDB']->fetchBoth($queryResult);
 $a2          = $rowhond['id'];
@@ -949,7 +949,7 @@ 
     $xoopsTpl->assign('COIerror', _MA_PEDIGREE_COI_SGPU);
 }
 
-$title   = strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']])
+$title = strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']])
            . ' ('
            . stripslashes(Pedigree\Utility::showParent($codec2))
            . ')'
@@ -970,10 +970,10 @@ 
 ]));
 
 $de_cujus = 0;
-$sire_ID  = Request::getInt('s', 0, 'GET');//$_GET['s'];
-$dam_ID   = Request::getInt('d', 0, 'GET');//$_GET['d'];
+$sire_ID  = Request::getInt('s', 0, 'GET'); //$_GET['s'];
+$dam_ID   = Request::getInt('d', 0, 'GET'); //$_GET['d'];
 
-$rec     = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE father = '" . $sire_ID . "' AND mother = '" . $dam_ID . "' ORDER BY naam";
+$rec = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE father = '".$sire_ID."' AND mother = '".$dam_ID."' ORDER BY naam";
 $result   = $GLOBALS['xoopsDB']->query($rec);
 $content  = '';
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -1063,14 +1063,14 @@ 
         }
     }
 }
-$w = _MA_PEDIGREE_COI_TVI . ' ' . $w;
+$w = _MA_PEDIGREE_COI_TVI.' '.$w;
 
 $nb_all = 0;
 count_all(0, 0); // count all ascendants in flat tree
 
 $nbmax  = (2 << $nb_gen) - 2;
-$asctc  = _MA_PEDIGREE_COI_ASTC . $nb_gen . _MA_PEDIGREE_COI_ASTCGEN . $nbmax . ')';
-$ascuni = _MA_PEDIGREE_COI_ASDKA . $nb_gen . _MA_PEDIGREE_COI_ASGEN;
+$asctc  = _MA_PEDIGREE_COI_ASTC.$nb_gen._MA_PEDIGREE_COI_ASTCGEN.$nbmax.')';
+$ascuni = _MA_PEDIGREE_COI_ASDKA.$nb_gen._MA_PEDIGREE_COI_ASGEN;
 $xoopsTpl->assign('ASCtitle', _MA_PEDIGREE_COI_ACTIT);
 $xoopsTpl->assign('ASCtc', $asctc);
 $xoopsTpl->assign('ASCuni', $ascuni);
@@ -1097,7 +1097,7 @@ 
 ]));
 $xoopsTpl->assign('COIcoi', _MA_PEDIGREE_COI_COI);
 $dogid = Request::getInt('dogid', 0, 'GET');
-$query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' SET coi=' . $f1 . ' WHERE id = ' . $dogid;
+$query = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' SET coi='.$f1.' WHERE id = '.$dogid;
 $GLOBALS['xoopsDB']->queryF($query);
 arsort($deltaf);
 $j = 1;
@@ -1111,7 +1111,7 @@ 
     $animal = set_name($IDs[$i]);
     $name   = $animal[1];
     if (!$name) {
-        $name = $i . ' [' . $IDs[$i] . ']';
+        $name = $i.' ['.$IDs[$i].']';
     }
     if ($v > 0.0001 && $v < 1.0) {
         $dogs[] = ['id' => $code, 'name' => stripslashes($name), 'coi' => 100 * $v];
@@ -1189,9 +1189,9 @@ 
 $xoopsTpl->assign('SSDbsd', strtr(_MA_PEDIGREE_COI_SDDbsd, ['[father]' => $moduleConfig['father'], '[mother]' => $moduleConfig['mother']]));
 $xoopsTpl->assign('SSDcor', $SSDcor);
 
-$xoopsTpl->assign('SSDS', _MA_PEDIGREE_COI_COI . _MA_PEDIGREE_FROM . strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]));
+$xoopsTpl->assign('SSDS', _MA_PEDIGREE_COI_COI._MA_PEDIGREE_FROM.strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]));
 $xoopsTpl->assign('SSDsire', $SSDsire);
-$xoopsTpl->assign('SSDM', _MA_PEDIGREE_COI_COI . _MA_PEDIGREE_FROM . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]));
+$xoopsTpl->assign('SSDM', _MA_PEDIGREE_COI_COI._MA_PEDIGREE_FROM.strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]));
 $xoopsTpl->assign('SSDdam', $SSDdam);
 
 // echo "SSDsire : ".$SSDsire."<br>";
@@ -1213,4 +1213,4 @@ 
 $xoopsTpl->assign('explain', _MA_PEDIGREE_EXPLAIN);
 
 //comments and footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

pedigree.php

Spacing +37 added lines, -37 removed lines

@@ -27,10 +27,10 @@ 
 $moduleDirName = basename(__DIR__);
 $mydirpath     = dirname(__DIR__);
 
-require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
-require_once $rootPath . '/include/cp_functions.php';
-require_once $rootPath . '/include/cp_header.php';
+require_once  dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/header.php';
+require_once $rootPath.'/include/cp_functions.php';
+require_once $rootPath.'/include/cp_header.php';
 //require_once $rootPath . '/class/xoopsformloader.php';
 
 //require_once dirname(dirname(__DIR__)) . '/mainfile.php';
@@ -41,7 +41,7 @@ 
 //require_once __DIR__ . '/header.php';
 
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 //require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/css.php");
 
 // Get all HTTP post or get parameters into global variables that are prefixed with "param_"
@@ -73,7 +73,7 @@ 
 pedigree_main();
 
 //include XOOPS_ROOT_PATH . "/footer.php";
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';
 
 //
 // Displays the "Main" tab of the module
@@ -94,29 +94,29 @@ 
     $querystring = 'SELECT ';
 
     foreach ($qarray as $key) {
-        $querystring .= $key . '.id as ' . $key . '_id, ';
-        $querystring .= $key . '.naam as ' . $key . '_naam, ';
-        $querystring .= $key . '.mother as ' . $key . '_mother, ';
-        $querystring .= $key . '.father as ' . $key . '_father, ';
-        $querystring .= $key . '.roft as ' . $key . '_roft, ';
-        $querystring .= $key . '.foto as ' . $key . '_foto, ';
+        $querystring .= $key.'.id as '.$key.'_id, ';
+        $querystring .= $key.'.naam as '.$key.'_naam, ';
+        $querystring .= $key.'.mother as '.$key.'_mother, ';
+        $querystring .= $key.'.father as '.$key.'_father, ';
+        $querystring .= $key.'.roft as '.$key.'_roft, ';
+        $querystring .= $key.'.foto as '.$key.'_foto, ';
     }
 
-    $querystring .= 'mmm.coi as mmm_coi FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' d
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' f ON d.father = f.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' m ON d.mother = m.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ff ON f.father = ff.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fff ON ff.father = fff.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ffm ON ff.mother = ffm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mf ON m.father = mf.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mff ON mf.father = mff.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mfm ON mf.mother = mfm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fm ON f.mother = fm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmf ON fm.father = fmf.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmm ON fm.mother = fmm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mm ON m.mother = mm.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mmf ON mm.father = mmf.id
-                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " mmm ON mm.mother = mmm.id
+    $querystring .= 'mmm.coi as mmm_coi FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' d
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' f ON d.father = f.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' m ON d.mother = m.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ff ON f.father = ff.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fff ON ff.father = fff.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ffm ON ff.mother = ffm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mf ON m.father = mf.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mff ON mf.father = mff.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mfm ON mf.mother = mfm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fm ON f.mother = fm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmf ON fm.father = fmf.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmm ON fm.mother = fmm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mm ON m.mother = mm.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mmf ON mm.father = mmf.id
+                 LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree')." mmm ON mm.mother = mmm.id
                  WHERE d.id={$id}";
 
     $result = $GLOBALS['xoopsDB']->query($querystring);
@@ -126,17 +126,17 @@ 
         //create array for animal (and all parents)
         foreach ($qarray as $key) {
             $d[$key] = [
-                'id'     => $row[$key . '_id'],
-                'name'   => stripslashes($row[$key . '_naam']),
-                'mother' => $row[$key . '_mother'],
-                'father' => $row[$key . '_father'],
-                'roft'   => $row[$key . '_roft'],
+                'id'     => $row[$key.'_id'],
+                'name'   => stripslashes($row[$key.'_naam']),
+                'mother' => $row[$key.'_mother'],
+                'father' => $row[$key.'_father'],
+                'roft'   => $row[$key.'_roft'],
                 'nhsb'   => ''
             ];
-            if ((3 != strlen($key) || (0 != $moduleConfig['lastimage'])) && ('' !== $row[$key . '_foto'])) {
+            if ((3 != strlen($key) || (0 != $moduleConfig['lastimage'])) && ('' !== $row[$key.'_foto'])) {
                 //show image in last row of pedigree if image exists
-                $d[$key]['photo']    = PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $row[$key . '_foto'] . '_150.jpeg';
-                $d[$key]['photoBig'] = PEDIGREE_UPLOAD_URL . '/images/' . $row[$key . '_foto'] . '.jpeg';
+                $d[$key]['photo']    = PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$row[$key.'_foto'].'_150.jpeg';
+                $d[$key]['photoBig'] = PEDIGREE_UPLOAD_URL.'/images/'.$row[$key.'_foto'].'.jpeg';
             }
 
             $d[$key]['overig'] = '';
@@ -153,7 +153,7 @@ 
                 if ($userField->isActive() && $userField->inPedigree()) {
                     $fieldType = $userField->getSetting('FieldType');
                     $fieldObj  = new $fieldType($userField, $animal);
-                    $pedidata  .= $fieldObj->showField() . '<br>';
+                    $pedidata .= $fieldObj->showField().'<br>';
                 }
                 $d[$key]['hd'] = $pedidata;
             }
@@ -163,7 +163,7 @@ 
     //add data to smarty template
     $GLOBALS['xoopsTpl']->assign([
                                      'page_title' => stripslashes($row['d_naam']),
-                                     'd'          => $d,  //assign dog
+                                     'd'          => $d, //assign dog
                                      //assign config options
                                      'male'       => "<img src='assets/images/male.gif'>",
                                      'female'     => "<img src='assets/images/female.gif'>",

updateowner.php

Spacing +18 added lines, -18 removed lines

@@ -6,21 +6,21 @@ 
 
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 xoops_loadLanguage('main', basename(dirname(__DIR__)));
 
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_update.tpl';
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 $xoopsTpl->assign('page_title', 'Pedigree database - Update details');
 
 //check for access
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 if (empty($GLOBALS['xoopsUser']) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)) {
-    redirect_header('javascript:history.go(-1)', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+    redirect_header('javascript:history.go(-1)', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
 }
 // ( $xoopsUser->isAdmin($xoopsModule->mid() ) )
 
@@ -37,7 +37,7 @@ 
 $id  = $_GET['id'];
 */
 //query (find values for this owner/breeder (and format them))
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $id;
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$id;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -46,8 +46,8 @@ 
     //name
     $naaml    = htmlentities(stripslashes($row['lastname']), ENT_QUOTES);
     $naamf    = htmlentities(stripslashes($row['firstname']), ENT_QUOTES);
-    $naam     = $naaml . ', ' . $naamf;
-    $namelink = '<a href="dog.php?id=' . $row['id'] . '">' . stripslashes($row['naam']) . '</a>';
+    $naam     = $naaml.', '.$naamf;
+    $namelink = '<a href="dog.php?id='.$row['id'].'">'.stripslashes($row['naam']).'</a>';
     //street
     $street = stripslashes($row['streetname']);
     //housenumber
@@ -68,7 +68,7 @@ 
 }
 
 //create form
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 $form = new \XoopsThemeForm($naam, 'updatedata', 'updatepage.php', 'post', true);
 //hidden value current record owner
 $form->addElement(new \XoopsFormHidden('dbuser', $dbuser));
@@ -78,7 +78,7 @@ 
 $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
 //name last
 if ('nl' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_OWN_LNAME . '</b>', 'naaml', $size = 50, $maxsize = 255, $value = $naaml));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_OWN_LNAME.'</b>', 'naaml', $size = 50, $maxsize = 255, $value = $naaml));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'lastname'));
     $form->addElement(new \XoopsFormHidden('curvalnamel', $naaml));
@@ -87,7 +87,7 @@ 
 }
 //name first
 if ('nf' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_OWN_FNAME . '</b>', 'naamf', $size = 50, $maxsize = 255, $value = $naamf));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_OWN_FNAME.'</b>', 'naamf', $size = 50, $maxsize = 255, $value = $naamf));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'firstname'));
     $form->addElement(new \XoopsFormHidden('curvalnamef', $naamf));
@@ -96,7 +96,7 @@ 
 }
 //street
 if ('st' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_OWN_STR . '</b>', 'street', $size = 50, $maxsize = 255, $value = $street));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_OWN_STR.'</b>', 'street', $size = 50, $maxsize = 255, $value = $street));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'streetname'));
     $form->addElement(new \XoopsFormHidden('curvalstreet', $street));
@@ -105,7 +105,7 @@ 
 }
 //housenumber
 if ('hn' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_OWN_HN . '</b>', 'housenumber', $size = 50, $maxsize = 255, $value = $housenumber));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_OWN_HN.'</b>', 'housenumber', $size = 50, $maxsize = 255, $value = $housenumber));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'housenumber'));
     $form->addElement(new \XoopsFormHidden('curvalhousenumber', $housenumber));
@@ -114,7 +114,7 @@ 
 }
 //postcode
 if ('pc' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_OWN_PC . '</b>', 'postcode', $size = 50, $maxsize = 255, $value = $postcode));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_OWN_PC.'</b>', 'postcode', $size = 50, $maxsize = 255, $value = $postcode));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'postcode'));
     $form->addElement(new \XoopsFormHidden('curvalpostcode', $postcode));
@@ -123,7 +123,7 @@ 
 }
 //city
 if ('ct' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_OWN_CITY . '</b>', 'city', $size = 50, $maxsize = 255, $value = $city));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_OWN_CITY.'</b>', 'city', $size = 50, $maxsize = 255, $value = $city));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'city'));
     $form->addElement(new \XoopsFormHidden('curvalcity', $city));
@@ -132,7 +132,7 @@ 
 }
 //phonenumber
 if ('pn' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_OWN_PN . '</b>', 'phonenumber', $size = 50, $maxsize = 255, $value = $phonenumber));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_OWN_PN.'</b>', 'phonenumber', $size = 50, $maxsize = 255, $value = $phonenumber));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'phonenumber'));
     $form->addElement(new \XoopsFormHidden('curvalphonenumber', $phonenumber));
@@ -141,7 +141,7 @@ 
 }
 //email
 if ('em' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_OWN_EMAIL . '</b>', 'email', $size = 50, $maxsize = 255, $value = $email));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_OWN_EMAIL.'</b>', 'email', $size = 50, $maxsize = 255, $value = $email));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'emailadres'));
     $form->addElement(new \XoopsFormHidden('curvalemail', $email));
@@ -150,7 +150,7 @@ 
 }
 //website
 if ('we' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_OWN_WEB . '</b>', 'web', $size = 50, $maxsize = 255, $value = $web));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_OWN_WEB.'</b>', 'web', $size = 50, $maxsize = 255, $value = $web));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_owner'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'website'));
     $form->addElement(new \XoopsFormHidden('curvalweb', $web));
@@ -166,4 +166,4 @@ 
 $xoopsTpl->assign('form', $form->render());
 
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

header.php

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 
 use XoopsModules\Pedigree;
 
-require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/common.php';
+require_once  dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/common.php';
 
 /** @var Pedigree\Helper $helper */
 $helper = Pedigree\Helper::getInstance();

deletepage.php

Spacing +11 added lines, -11 removed lines

@@ -6,20 +6,20 @@ 
 
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_delete.tpl';
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 //check for access
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 if (empty($GLOBALS['xoopsUser']) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)) {
-    redirect_header('javascript:history.go(-1)', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+    redirect_header('javascript:history.go(-1)', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
 }
 
 global $xoopsTpl, $xoopsDB, $xoopsUser;
@@ -28,7 +28,7 @@ 
 $dogname = Request::getString('curname', '', 'post');
 
 if (!empty($dogname)) {
-    $queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $dogid;
+    $queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$dogid;
     $result      = $GLOBALS['xoopsDB']->query($queryString);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         //check for edit rights
@@ -43,14 +43,14 @@ 
             }
         }
         if ('1' == $access) {
-            $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_trash') . ' SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ".id='" . $dogid . "'";
+            $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('pedigree_trash').' SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').".id='".$dogid."'";
             $GLOBALS['xoopsDB']->query($sql);
-            $delsql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id ='" . $row['id'] . "'";
+            $delsql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id ='".$row['id']."'";
             $GLOBALS['xoopsDB']->query($delsql);
             if ('0' == $row['roft']) {
-                $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET father = '0' where father = '" . $row['id'] . "'";
+                $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." SET father = '0' where father = '".$row['id']."'";
             } else {
-                $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET mother = '0' where mother = '" . $row['id'] . "'";
+                $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." SET mother = '0' where mother = '".$row['id']."'";
             }
             $GLOBALS['xoopsDB']->query($sql);
             $ch = 1;
@@ -61,7 +61,7 @@ 
 if ($ch) {
     redirect_header('index.php', 2, _MD_DATACHANGED);
 } else {
-    redirect_header('dog.php?id=' . $dogid, 1, 'ERROR!!');
+    redirect_header('dog.php?id='.$dogid, 1, 'ERROR!!');
 }
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

update.php

Spacing +29 added lines, -29 removed lines

@@ -6,21 +6,21 @@ 
 
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_update.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 $xoopsTpl->assign('page_title', 'Pedigree database - Update details');
 
 //check for access
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 if (empty($GLOBALS['xoopsUser']) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)) {
-    redirect_header('javascript:history.go(-1)', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+    redirect_header('javascript:history.go(-1)', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
 }
 // ( $xoopsUser->isAdmin($xoopsModule->mid() ) )
 
@@ -35,7 +35,7 @@ 
 $configHandler = xoops_getHandler('config');
 $moduleConfig  = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
 */
-$helper     = Pedigree\Helper::getInstance(false);
+$helper = Pedigree\Helper::getInstance(false);
 $moduleConfig = $helper->getConfig();
 
 $myts = \MyTextSanitizer::getInstance();
@@ -48,7 +48,7 @@ 
 */
 
 //query (find values for this dog (and format them))
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $id;
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$id;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -56,48 +56,48 @@ 
     $id = $row['id'];
     //name
     $naam     = htmlentities(stripslashes($row['naam']), ENT_QUOTES);
-    $namelink = '<a href="dog.php?id=' . $row['id'] . '">' . stripslashes($row['naam']) . '</a>';
+    $namelink = '<a href="dog.php?id='.$row['id'].'">'.stripslashes($row['naam']).'</a>';
     //owner
-    $queryeig = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $row['id_owner'];
+    $queryeig = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$row['id_owner'];
     $reseig   = $GLOBALS['xoopsDB']->query($queryeig);
     while (false !== ($roweig = $GLOBALS['xoopsDB']->fetchArray($reseig))) {
-        $eig = '<a href="owner.php?ownid=' . $roweig['id'] . '">' . $roweig['firstname'] . ' ' . $roweig['lastname'] . '</a>';
+        $eig = '<a href="owner.php?ownid='.$roweig['id'].'">'.$roweig['firstname'].' '.$roweig['lastname'].'</a>';
     }
     $curvaleig = $row['id_owner'];
     //breeder
-    $queryfok = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $row['id_breeder'];
+    $queryfok = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$row['id_breeder'];
     $resfok   = $GLOBALS['xoopsDB']->query($queryfok);
     while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-        $fok = '<a href="owner.php?ownid=' . $rowfok['id'] . '">' . $rowfok['firstname'] . ' ' . $rowfok['lastname'] . '</a>';
+        $fok = '<a href="owner.php?ownid='.$rowfok['id'].'">'.$rowfok['firstname'].' '.$rowfok['lastname'].'</a>';
     }
     $curvalfok = $row['id_breeder'];
     //gender
     if ('0' == $row['roft']) {
-        $gender = '<img src="assets/images/male.gif"> ' . _MA_PEDIGREE_FLD_MALE;
+        $gender = '<img src="assets/images/male.gif"> '._MA_PEDIGREE_FLD_MALE;
     } else {
-        $gender = '<img src="assets/images/female.gif"> ' . _MA_PEDIGREE_FLD_FEMA;
+        $gender = '<img src="assets/images/female.gif"> '._MA_PEDIGREE_FLD_FEMA;
     }
     $curvalroft = $row['roft'];
     //Sire
     if (0 != $row['father']) {
-        $querysire = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $row['father'];
+        $querysire = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$row['father'];
         $ressire   = $GLOBALS['xoopsDB']->query($querysire);
         while (false !== ($rowsire = $GLOBALS['xoopsDB']->fetchArray($ressire))) {
-            $sire = '<img src="assets/images/male.gif"><a href="dog.php?id=' . $row['father'] . '">' . stripslashes($rowsire['naam']) . '</a>';
+            $sire = '<img src="assets/images/male.gif"><a href="dog.php?id='.$row['father'].'">'.stripslashes($rowsire['naam']).'</a>';
         }
     }
     //Dam
     if (0 != $row['mother']) {
-        $querydam = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $row['mother'];
+        $querydam = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$row['mother'];
         $resdam   = $GLOBALS['xoopsDB']->query($querydam);
         while (false !== ($rowdam = $GLOBALS['xoopsDB']->fetchArray($resdam))) {
-            $dam = '<img src="assets/images/female.gif"><a href="dog.php?id=' . $row['mother'] . '">' . stripslashes($rowdam['naam']) . '</a>';
+            $dam = '<img src="assets/images/female.gif"><a href="dog.php?id='.$row['mother'].'">'.stripslashes($rowdam['naam']).'</a>';
         }
     }
     //picture
     $picture = '';
     if ('' != $row['foto']) {
-        $picture = '<img src=' . PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $row['foto'] . '_400.jpeg>';
+        $picture = '<img src='.PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$row['foto'].'_400.jpeg>';
         $foto    = $row['foto'];
     } else {
         $foto = '';
@@ -107,7 +107,7 @@ 
 }
 
 //create form
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 $form = new \XoopsThemeForm($naam, 'updatedata', 'updatepage.php', 'post', true);
 $form->setExtra("enctype='multipart/form-data'");
 //hidden value current record owner
@@ -118,7 +118,7 @@ 
 $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
 //name
 if ('nm' === $fld || 'all' === $fld) {
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_NAME . '</b>', 'naam', $size = 50, $maxsize = 255, $value = $naam));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_NAME.'</b>', 'naam', $size = 50, $maxsize = 255, $value = $naam));
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_NAME_EX));
     $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_tree'));
     $form->addElement(new \XoopsFormHidden('dbfield', 'naam'));
@@ -126,12 +126,12 @@ 
 } else {
     //owner
     if ('ow' === $fld || 'all' === $fld) {
-        $owner_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_OWNE . '</b>', $name = 'id_owner', $value = null, $size = 1, $multiple = false);
-        $queryeig     = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY `lastname`';
+        $owner_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_OWNE.'</b>', $name = 'id_owner', $value = null, $size = 1, $multiple = false);
+        $queryeig     = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY `lastname`';
         $reseig       = $GLOBALS['xoopsDB']->query($queryeig);
         $owner_select->addOption(0, $name = _MA_PEDIGREE_UNKNOWN);
         while (false !== ($roweig = $GLOBALS['xoopsDB']->fetchArray($reseig))) {
-            $owner_select->addOption($roweig['id'], $name = $roweig['lastname'] . ', ' . $roweig['firstname']);
+            $owner_select->addOption($roweig['id'], $name = $roweig['lastname'].', '.$roweig['firstname']);
         }
         $form->addElement($owner_select);
         $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_OWNE_EX));
@@ -143,12 +143,12 @@ 
 
 //breeder
 if ('br' === $fld || 'all' === $fld) {
-    $breeder_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_BREE . '</b>', $name = 'id_breeder', $value = null, $size = 1, $multiple = false);
-    $queryfok       = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY `lastname`';
+    $breeder_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_BREE.'</b>', $name = 'id_breeder', $value = null, $size = 1, $multiple = false);
+    $queryfok       = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY `lastname`';
     $resfok         = $GLOBALS['xoopsDB']->query($queryfok);
     $breeder_select->addOption(0, $name = _MA_PEDIGREE_UNKNOWN);
     while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-        $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'] . ', ' . $rowfok['firstname']);
+        $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'].', '.$rowfok['firstname']);
     }
     $form->addElement($breeder_select);
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_BREE_EX));
@@ -159,7 +159,7 @@ 
 
 //gender
 if ('sx' === $fld || 'all' === $fld) {
-    $gender_radio = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft', $value = null);
+    $gender_radio = new \XoopsFormRadio('<b>'._MA_PEDIGREE_FLD_GEND.'</b>', 'roft', $value = null);
     $gender_radio->addOptionArray(['0' => _MA_PEDIGREE_FLD_MALE, '1' => _MA_PEDIGREE_FLD_FEMA]);
     $form->addElement($gender_radio);
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_GEND_EX));
@@ -200,7 +200,7 @@ 
             $explain = $userField->getSetting('FieldExplanation');
             $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, $explain));
             $form->addElement(new \XoopsFormHidden('dbtable', 'pedigree_tree'));
-            $form->addElement(new \XoopsFormHidden('dbfield', 'user' . $iValue));
+            $form->addElement(new \XoopsFormHidden('dbfield', 'user'.$iValue));
         }
     }
 }
@@ -213,4 +213,4 @@ 
 $xoopsTpl->assign('form', $form->render());
 
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

pedigree2.php

Spacing +4 added lines, -4 removed lines

@@ -2,13 +2,13 @@ 
 // -------------------------------------------------------------------------
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 
 // Include any common code for this module.
-require_once XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
 
 // Get all HTTP post or get parameters into global variables that are prefixed with "param_"
 //import_request_variables("gp", "param_");
@@ -28,7 +28,7 @@ 
 pedigree_main($pedid);
 
 //comments and footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';
 
 //
 // Displays the "Main" tab of the module
@@ -150,7 +150,7 @@ 
     mmm.nhsb as mmm_nhsb,
     mmm.foto as mmm_foto,
     mmm.hd as mmm_hd
-    FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " d
+    FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree')." d
     LEFT JOIN xoops_pedigree f ON d.father = f.id
     LEFT JOIN xoops_pedigree m ON d.mother = m.id
     LEFT JOIN xoops_pedigree ff ON f.father = ff.id

class/trash.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 
         $title = $this->isNew() ? sprintf(_AM_PEDIGREE_PEDIGREE_TRASH_ADD) : sprintf(_AM_PEDIGREE_PEDIGREE_TRASH_EDIT);
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
         $form->setExtra('enctype="multipart/form-data"');