mambax7 / pedigree

owner.php

Spacing +9 added lines, -9 removed lines

@@ -5,16 +5,16 @@ 
 use XoopsModules\Pedigree;
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //xoops_loadLanguage('main', basename(dirname(__DIR__)));
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 
-require_once __DIR__ . '/header.php';
+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';
 
 // Get all HTTP post or get parameters into global variables that are prefixed with "param_"
 //import_request_variables("gp", "param_");
@@ -26,15 +26,15 @@ 
 include $GLOBALS['xoops']->path('/header.php');
 
 $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
-$GLOBALS['xoTheme']->addScript('browse.php?modules/' . $moduleDirName . '/assets/js/jquery.magnific-popup.min.js');
-$GLOBALS['xoTheme']->addStylesheet('browse.php?modules/' . $moduleDirName . '/assets/css/style.css');
+$GLOBALS['xoTheme']->addScript('browse.php?modules/'.$moduleDirName.'/assets/js/jquery.magnific-popup.min.js');
+$GLOBALS['xoTheme']->addStylesheet('browse.php?modules/'.$moduleDirName.'/assets/css/style.css');
 
-$GLOBALS['xoTheme']->addStylesheet(PEDIGREE_URL . '/assets/css/magnific-popup.css');
+$GLOBALS['xoTheme']->addStylesheet(PEDIGREE_URL.'/assets/css/magnific-popup.css');
 
 if (isset($GLOBALS['xoTheme'])) {
     $GLOBALS['xoTheme']->addScript('include/color-picker.js');
 } else {
-    echo '<script type="text/javascript" src="' . XOOPS_URL . '/include/color-picker.js"></script>';
+    echo '<script type="text/javascript" src="'.XOOPS_URL.'/include/color-picker.js"></script>';
 }
 
 //@todo move language string to language file
@@ -56,7 +56,7 @@ 
 $ownid = Request::getInt('ownid', 0, 'GET');
 
 //query
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $ownid;
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$ownid;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -64,7 +64,7 @@ 
     $id = $row['id'];
 
     //name
-    $naam = stripslashes($row['firstname']) . ' ' . stripslashes($row['lastname']);
+    $naam = stripslashes($row['firstname']).' '.stripslashes($row['lastname']);
 
     //lastname
     $naaml = stripslashes($row['lastname']);

virtual.php

Indentation +40 added lines, -40 removed lines

@@ -64,15 +64,15 @@ 
     $perPage = $helper->getConfig('perpage');
     //count total number of dogs
     $numDog = 'SELECT COUNT(d.id) FROM '
-              . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-              . ' d LEFT JOIN '
-              . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-              . ' m ON m.id = d.mother LEFT JOIN '
-              . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-              //            . " f ON f.id = d.father WHERE d.roft = '0' and d.mother != '0' and d.father != '0' and m.mother != '0' and m.father != '0' and f.mother != '0' and f.father != '0' and d.naam LIKE '" . $l . "%'";
-              . " f ON f.id = d.father WHERE d.roft = '0' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
-              . $GLOBALS['xoopsDB']->escape($l)
-              . "%'";
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' d LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' m ON m.id = d.mother LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                //            . " f ON f.id = d.father WHERE d.roft = '0' and d.mother != '0' and d.father != '0' and m.mother != '0' and m.father != '0' and f.mother != '0' and f.father != '0' and d.naam LIKE '" . $l . "%'";
+                . " f ON f.id = d.father WHERE d.roft = '0' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
+                . $GLOBALS['xoopsDB']->escape($l)
+                . "%'";
     $numRes = $GLOBALS['xoopsDB']->query($numDog);
     //total number of dogs the query will find
     list($numResults) = $GLOBALS['xoopsDB']->fetchRow($numRes);
@@ -122,17 +122,17 @@ 
 
     //query
     $queryString = 'SELECT d.*, d.id AS d_id, d.naam AS d_naam FROM '
-                   . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-                   . ' d LEFT JOIN '
-                   . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-                   . ' m ON m.id = d.mother LEFT JOIN '
-                   . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-                   . " f ON f.id = d.father WHERE d.roft = '0' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
-                   . $l
-                   . "%' ORDER BY d.naam LIMIT "
-                   . $st
-                   . ', '
-                   . $perPage;
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                    . ' d LEFT JOIN '
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                    . ' m ON m.id = d.mother LEFT JOIN '
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                    . " f ON f.id = d.father WHERE d.roft = '0' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
+                    . $l
+                    . "%' ORDER BY d.naam LIMIT "
+                    . $st
+                    . ', '
+                    . $perPage;
     $result      = $GLOBALS['xoopsDB']->query($queryString);
 
     $animal = new Pedigree\Animal();
@@ -283,15 +283,15 @@ 
     $perPage = $helper->getConfig('perpage');
     //count total number of dogs
     $numDog = 'SELECT COUNT(d.id) FROM '
-              . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-              . ' d LEFT JOIN '
-              . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-              . ' m ON m.id = d.mother LEFT JOIN '
-              . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-              //  . " f ON f.id = d.father WHERE d.roft = '1' and d.mother != '0' and d.father != '0' and m.mother != '0' and m.father != '0' and f.mother != '0' and f.father != '0' and d.naam LIKE '" . $l . "%'";
-              . " f ON f.id = d.father WHERE d.roft = '1' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
-              . $GLOBALS['xoopsDB']->escape($l)
-              . "%'";
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' d LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' m ON m.id = d.mother LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                //  . " f ON f.id = d.father WHERE d.roft = '1' and d.mother != '0' and d.father != '0' and m.mother != '0' and m.father != '0' and f.mother != '0' and f.father != '0' and d.naam LIKE '" . $l . "%'";
+                . " f ON f.id = d.father WHERE d.roft = '1' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
+                . $GLOBALS['xoopsDB']->escape($l)
+                . "%'";
 
     $numRes = $GLOBALS['xoopsDB']->query($numDog);
     //total number of dogs the query will find
@@ -362,17 +362,17 @@ 
 
     //query
     $queryString = 'SELECT d.*, d.id AS d_id, d.naam AS d_naam FROM '
-                   . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-                   . ' d LEFT JOIN '
-                   . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-                   . ' m ON m.id = d.mother LEFT JOIN '
-                   . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-                   . " f ON f.id = d.father WHERE d.roft = '1' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
-                   . $l
-                   . "%' ORDER BY d.naam LIMIT "
-                   . $st
-                   . ', '
-                   . $perPage;
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                    . ' d LEFT JOIN '
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                    . ' m ON m.id = d.mother LEFT JOIN '
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                    . " f ON f.id = d.father WHERE d.roft = '1' AND d.mother != '0' AND d.father != '0' AND m.mother != '0' AND m.father != '0' AND f.mother != '0' AND f.father != '0' AND d.naam LIKE '"
+                    . $l
+                    . "%' ORDER BY d.naam LIMIT "
+                    . $st
+                    . ', '
+                    . $perPage;
     $result      = $GLOBALS['xoopsDB']->query($queryString);
 
     $animal = new Pedigree\Animal();

Spacing +63 added lines, -63 removed lines

@@ -5,14 +5,14 @@ 
 use XoopsModules\Pedigree;
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //$moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 xoops_load('Pedigree\Animal', $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_virtual.tpl';
 include $GLOBALS['xoops']->path('/header.php');
@@ -44,7 +44,7 @@ 
     $module        = $moduleHandler->getByDirname($moduleDirName);
     $configHandler = xoops_getHandler('config');
     $moduleConfig  = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
-    $helper      = Pedigree\Helper::getInstance();
+    $helper = Pedigree\Helper::getInstance();
 
     //    if (isset($_GET['st'])) {
     //        $st = $_GET['st'];
@@ -87,9 +87,9 @@ 
     $pages = '';
     for ($i = 65; $i <= 90; ++$i) {
         if ($l == chr($i)) {
-            $pages .= '<b><a href="virtual.php?r=1&st=0&l=' . chr($i) . '">' . chr($i) . '</a></b>&nbsp;';
+            $pages .= '<b><a href="virtual.php?r=1&st=0&l='.chr($i).'">'.chr($i).'</a></b>&nbsp;';
         } else {
-            $pages .= '<a href="virtual.php?r=1&st=0&l=' . chr($i) . '">' . chr($i) . '</a>&nbsp;';
+            $pages .= '<a href="virtual.php?r=1&st=0&l='.chr($i).'">'.chr($i).'</a>&nbsp;';
         }
     }
     $pages .= '-&nbsp;';
@@ -98,7 +98,7 @@ 
     $pages .= '<br>';
     //create previous button
     if (($numPages > 1) && ($currentPage > 1)) {
-        $pages .= '<a href="virtual.php?r=1&&l=' . $l . 'st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp';
+        $pages .= '<a href="virtual.php?r=1&&l='.$l.'st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp';
         }
     //create numbers
     $xLimit = $numPages + 1;
@@ -108,15 +108,15 @@ 
             $pages .= '<br>';
         }
         if ($x != $currentPage) {
-            $pages .= '<a href="virtual.php?r=1&l=' . $l . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="virtual.php?r=1&l='.$l.'&st='.($perPage * ($x - 1)).'">'.$x.'</a>&nbsp;&nbsp;';
         } else {
-            $pages .= $x . '&nbsp;&nbsp';
+            $pages .= $x.'&nbsp;&nbsp';
         }
     }
     //create next button
     if ($numPages > 1) {
         if ($currentPage < $numPages) {
-            $pages .= '<a href="virtual.php?r=1&l=' . $l . '&st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="virtual.php?r=1&l='.$l.'&st='.($st + $perPage).'">'._MA_PEDIGREE_NEXT.'</a>&nbsp;&nbsp';
         }
     }
 
@@ -133,7 +133,7 @@ 
                    . $st
                    . ', '
                    . $perPage;
-    $result      = $GLOBALS['xoopsDB']->query($queryString);
+    $result = $GLOBALS['xoopsDB']->query($queryString);
 
     $animal = new Pedigree\Animal();
     //test to find out how many user fields there are...
@@ -165,11 +165,11 @@ 
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         //create picture information
         if ('' != $row['foto']) {
-            $camera = ' <img src="' . PEDIGREE_UPLOAD_URL . '/images/dog-icon25.png">';
+            $camera = ' <img src="'.PEDIGREE_UPLOAD_URL.'/images/dog-icon25.png">';
         } else {
             $camera = '';
         }
-        $name = stripslashes($row['d_naam']) . $camera;
+        $name = stripslashes($row['d_naam']).$camera;
         //empty array
         unset($columnvalue);
         //fill array
@@ -178,7 +178,7 @@ 
             //echo $x."columnnumber";
             if (is_array($columns[$i]['lookupval'])) {
                 foreach ($columns[$i]['lookupval'] as $key => $keyValue) {
-                    if ($keyValue['id'] == $row['user' . $x]) {
+                    if ($keyValue['id'] == $row['user'.$x]) {
                         //echo "key:".$row['user5']."<br>";
                         $value = $keyValue['value'];
                     }
@@ -186,10 +186,10 @@ 
                 //debug information
                 ///echo $columns[$i]['columnname']."is an array !";
             } //format value - cant use object because of query count
-            elseif (0 === strncmp($row['user' . $x], 'http://', 7)) {
-                $value = '<a href="' . $row['user' . $x] . '">' . $row['user' . $x] . '</a>';
+            elseif (0 === strncmp($row['user'.$x], 'http://', 7)) {
+                $value = '<a href="'.$row['user'.$x].'">'.$row['user'.$x].'</a>';
             } else {
-                $value = $row['user' . $x];
+                $value = $row['user'.$x];
             }
             $columnvalue[] = ['value' => $value];
             unset($value);
@@ -198,7 +198,7 @@ 
             'id'          => $row['d_id'],
             'name'        => $name,
             'gender'      => '<img src="assets/images/male.gif">',
-            'link'        => '<a href="virtual.php?f=dam&selsire=' . $row['d_id'] . '">' . $name . '</a>',
+            'link'        => '<a href="virtual.php?f=dam&selsire='.$row['d_id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => isset($columnvalue) ? $columnvalue : 0
@@ -222,7 +222,7 @@ 
         '[father]'   => $helper->getConfig('father'),
         '[children]' => $helper->getConfig('children')
     ]));
-    $xoopsTpl->assign('nextaction', '<b>' . strtr(_MA_PEDIGREE_VIRT_SIRE, ['[father]' => $helper->getConfig('father')]) . '</b>');
+    $xoopsTpl->assign('nextaction', '<b>'.strtr(_MA_PEDIGREE_VIRT_SIRE, ['[father]' => $helper->getConfig('father')]).'</b>');
     //    break;
 
     //mb =========== FATHER LETTERS =============================
@@ -304,41 +304,41 @@ 
     //find current page
     $currentPage = floor($st / $perPage) + 1;
     //create the alphabet
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=a">A</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=b">B</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=c">C</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=d">D</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=e">E</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=f">F</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=g">G</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=h">H</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=i">I</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=j">J</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=k">K</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=l">L</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=m">M</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=n">N</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=o">O</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=p">P</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=q">Q</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=r">R</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=s">S</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=t">T</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=u">U</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=v">V</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=w">W</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=x">X</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=y">Y</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=z">Z</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=a">A</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=b">B</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=c">C</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=d">D</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=e">E</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=f">F</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=g">G</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=h">H</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=i">I</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=j">J</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=k">K</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=l">L</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=m">M</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=n">N</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=o">O</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=p">P</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=q">Q</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=r">R</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=s">S</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=t">T</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=u">U</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=v">V</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=w">W</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=x">X</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=y">Y</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=z">Z</a>&nbsp;';
     $pages .= '-&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=Ã…">Ã…</a>&nbsp;';
-    $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&st=0&l=Ö">Ö</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=Ã…">Ã…</a>&nbsp;';
+    $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&st=0&l=Ö">Ö</a>&nbsp;';
     //create linebreak
     $pages .= '<br>';
     //create previous button
     if ($numPages > 1) {
         if ($currentPage > 1) {
-            $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&l=' . $l . '&st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&l='.$l.'&st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp';
         }
     }
     //create numbers
@@ -348,15 +348,15 @@ 
             $pages .= '<br>';
         }
         if ($x != $currentPage) {
-            $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&l=' . $l . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&l='.$l.'&st='.($perPage * ($x - 1)).'">'.$x.'</a>&nbsp;&nbsp;';
         } else {
-            $pages .= $x . '&nbsp;&nbsp';
+            $pages .= $x.'&nbsp;&nbsp';
         }
     }
     //create next button
     if ($numPages > 1) {
         if ($currentPage < $numPages) {
-            $pages .= '<a href="virtual.php?f=dam&selsire=' . $selsire . '&l=' . $l . '&st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="virtual.php?f=dam&selsire='.$selsire.'&l='.$l.'&st='.($st + $perPage).'">'._MA_PEDIGREE_NEXT.'</a>&nbsp;&nbsp';
         }
     }
 
@@ -373,7 +373,7 @@ 
                    . $st
                    . ', '
                    . $perPage;
-    $result      = $GLOBALS['xoopsDB']->query($queryString);
+    $result = $GLOBALS['xoopsDB']->query($queryString);
 
     $animal = new Pedigree\Animal();
     //test to find out how many user fields there are...
@@ -405,11 +405,11 @@ 
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         //create picture information
         if ('' != $row['foto']) {
-            $camera = ' <img src="' . PEDIGREE_UPLOAD_URL . '/images/dog-icon25.png">';
+            $camera = ' <img src="'.PEDIGREE_UPLOAD_URL.'/images/dog-icon25.png">';
         } else {
             $camera = '';
         }
-        $name = stripslashes($row['d_naam']) . $camera;
+        $name = stripslashes($row['d_naam']).$camera;
         //empty array
         unset($columnvalue);
         //fill array
@@ -418,7 +418,7 @@ 
             //echo $x."columnnumber";
             if (is_array($columns[$i]['lookupval'])) {
                 foreach ($columns[$i]['lookupval'] as $key => $keyValue) {
-                    if ($keyValue['id'] == $row['user' . $x]) {
+                    if ($keyValue['id'] == $row['user'.$x]) {
                         //echo "key:".$row['user5']."<br>";
                         $value = $keyValue['value'];
                     }
@@ -426,10 +426,10 @@ 
                 //debug information
                 ///echo $columns[$i]['columnname']."is an array !";
             } //format value - cant use object because of query count
-            elseif (0 === strncmp($row['user' . $x], 'http://', 7)) {
-                $value = '<a href="' . $row['user' . $x] . '">' . $row['user' . $x] . '</a>';
+            elseif (0 === strncmp($row['user'.$x], 'http://', 7)) {
+                $value = '<a href="'.$row['user'.$x].'">'.$row['user'.$x].'</a>';
             } else {
-                $value = $row['user' . $x];
+                $value = $row['user'.$x];
             }
             $columnvalue[] = ['value' => $value];
             unset($value);
@@ -438,7 +438,7 @@ 
             'id'          => $row['d_id'],
             'name'        => $name,
             'gender'      => '<img src="assets/images/female.gif">',
-            'link'        => '<a href="virtual.php?f=check&selsire=' . $selsire . '&seldam=' . $row['d_id'] . '">' . $name . '</a>',
+            'link'        => '<a href="virtual.php?f=check&selsire='.$selsire.'&seldam='.$row['d_id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => isset($columnvalue) ? $columnvalue : 0
@@ -460,10 +460,10 @@ 
         '[father]'   => $helper->getConfig('father'),
         '[children]' => $helper->getConfig('children')
     ]));
-    $xoopsTpl->assign('nextaction', '<b>' . strtr(_MA_PEDIGREE_VIRT_DAM, ['[mother]' => $helper->getConfig('mother')]) . '</b>');
+    $xoopsTpl->assign('nextaction', '<b>'.strtr(_MA_PEDIGREE_VIRT_DAM, ['[mother]' => $helper->getConfig('mother')]).'</b>');
 
     //find father
-    $query  = 'SELECT id, naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $selsire;
+    $query  = 'SELECT id, naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$selsire;
     $result = $GLOBALS['xoopsDB']->query($query);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $vsire = stripslashes($row['naam']);
@@ -520,7 +520,7 @@ 
         '[children]' => $helper->getConfig('children')
     ]));
     //find father
-    $query  = 'SELECT id, naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $selsire;
+    $query  = 'SELECT id, naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$selsire;
     $result = $GLOBALS['xoopsDB']->query($query);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $vsire = stripslashes($row['naam']);
@@ -528,7 +528,7 @@ 
     $xoopsTpl->assign('virtualsiretitle', strtr(_MA_PEDIGREE_VIRTUALSTIT, ['[father]' => $helper->getConfig('father')]));
     $xoopsTpl->assign('virtualsire', $vsire);
     //find mother
-    $query  = 'SELECT id, naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $seldam;
+    $query  = 'SELECT id, naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$seldam;
     $result = $GLOBALS['xoopsDB']->query($query);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $vdam = stripslashes($row['naam']);
@@ -536,7 +536,7 @@ 
     $xoopsTpl->assign('virtualdamtitle', strtr(_MA_PEDIGREE_VIRTUALDTIT, ['[mother]' => $helper->getConfig('mother')]));
     $xoopsTpl->assign('virtualdam', $vdam);
 
-    $xoopsTpl->assign('form', '<a href="coi.php?s=' . $selsire . '&d=' . $seldam . '&dogid=&detail=1">' . _MA_PEDIGREE_VIRTUALBUT . '</a>');
+    $xoopsTpl->assign('form', '<a href="coi.php?s='.$selsire.'&d='.$seldam.'&dogid=&detail=1">'._MA_PEDIGREE_VIRTUALBUT.'</a>');
 }
 
 //footer

deletebreeder.php

Spacing +12 added lines, -12 removed lines

@@ -5,15 +5,15 @@ 
 use XoopsModules\Pedigree;
 
 //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';
 
 //get module configuration
 /** @var XoopsModuleHandler $moduleHandler */
@@ -25,7 +25,7 @@ 
 //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;
@@ -34,21 +34,21 @@ 
 
 $id = Request::getInt('id', 0, 'GET');
 //query (find values for this dog (and format them))
-$queryString = 'SELECT lastname, firstname, user FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $id;
+$queryString = 'SELECT lastname, firstname, user FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$id;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
     //ID
     $id = $row['id'];
     //name
-    $naam     = htmlentities(stripslashes($row['lastname']) . ', ' . stripslashes($row['firstname']), ENT_QUOTES);
-    $namelink = '<a href="owner.php?ownid=' . $row['id'] . '">' . stripslashes($row['lastname']) . ', ' . stripslashes($row['firstname']) . '</a>';
+    $naam     = htmlentities(stripslashes($row['lastname']).', '.stripslashes($row['firstname']), ENT_QUOTES);
+    $namelink = '<a href="owner.php?ownid='.$row['id'].'">'.stripslashes($row['lastname']).', '.stripslashes($row['firstname']).'</a>';
     //user who entered the info
     $dbuser = $row['user'];
 }
 
 //create form
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 $form = new \XoopsThemeForm($naam, 'deletedata', 'deletebreederpage.php', 'post', true);
 //hidden value current record owner
 $form->addElement(new \XoopsFormHidden('dbuser', $dbuser));
@@ -56,18 +56,18 @@ 
 $form->addElement(new \XoopsFormHidden('dogid', $_GET['id']));
 $form->addElement(new \XoopsFormHidden('curname', $naam));
 $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
-$form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_DELE_SURE, _MA_PEDIGREE_DELE_CONF_OWN . '<b>' . $naam . '</b>?'));
+$form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_DELE_SURE, _MA_PEDIGREE_DELE_CONF_OWN.'<b>'.$naam.'</b>?'));
 $breeder = Pedigree\Utility::breederof($_GET['id'], 1);
 if ('' != $breeder) {
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_DELE_WARN, strtr(_MA_PEDIGREE_DELE_WARN_BREEDER, ['[animalTypes]' => $moduleConfig['animalTypes']]) . '<br><br>' . $breeder));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_DELE_WARN, strtr(_MA_PEDIGREE_DELE_WARN_BREEDER, ['[animalTypes]' => $moduleConfig['animalTypes']]).'<br><br>'.$breeder));
 }
 $owner = Pedigree\Utility::breederof($_GET['id'], 0);
 if ('' != $owner) {
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_DELE_WARN, strtr(_MA_PEDIGREE_DELE_WARN_OWNER, ['[animalTypes]' => $moduleConfig['animalTypes']]) . '<br><br>' . $owner));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_DELE_WARN, strtr(_MA_PEDIGREE_DELE_WARN_OWNER, ['[animalTypes]' => $moduleConfig['animalTypes']]).'<br><br>'.$owner));
 }
 $form->addElement(new \XoopsFormButton('', 'button_id', _DELETE, 'submit'));
 //add data (form) to smarty template
 $xoopsTpl->assign('form', $form->render());
 
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

add_litter.php

Indentation +29 added lines, -29 removed lines

@@ -77,9 +77,9 @@ 
         //gender
         $gender_radio[$count] = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft' . $count, $value = '0');
         $gender_radio[$count]->addOptionArray([
-                                                  '0' => strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]),
-                                                  '1' => strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']])
-                                              ]);
+                                                    '0' => strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]),
+                                                    '1' => strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']])
+                                                ]);
         $searchform->addElement($gender_radio[$count]);
         //add userfields
         for ($i = 0, $iMax = count($fields); $i < $iMax; ++$i) {
@@ -219,18 +219,18 @@ 
         //insert into pedigree_temp
         //      $query = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . " VALUES ('" . $random . "','" . Pedigree\Utility::unHtmlEntities($name) . "','0','" . $id_breeder . "','" . $userid . "','" . $roft . "','','','', ''";
         $query = 'INSERT INTO '
-                 . $GLOBALS['xoopsDB']->prefix('pedigree_temp')
-                 . " VALUES ('"
-                 . Request::getInt($random)
-                 . "','"
-                 . Request::getInt(Pedigree\Utility::unHtmlEntities($name))
-                 . "','0','"
-                 . Request::getInt($id_breeder)
-                 . "','"
-                 . Request::getInt($userid)
-                 . "','"
-                 . Request::getInt($roft)
-                 . "','','','', ''";
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_temp')
+                    . " VALUES ('"
+                    . Request::getInt($random)
+                    . "','"
+                    . Request::getInt(Pedigree\Utility::unHtmlEntities($name))
+                    . "','0','"
+                    . Request::getInt($id_breeder)
+                    . "','"
+                    . Request::getInt($userid)
+                    . "','"
+                    . Request::getInt($roft)
+                    . "','','','', ''";
         foreach ($fields as $i => $iValue) {
             $userField   = new Pedigree\Field($fields[$i], $animal->getConfig());
             $fieldType   = $userField->getSetting('FieldType');
@@ -614,20 +614,20 @@ 
             for ($c = 1, $cMax = count($names); $c < $cMax; ++$c) {
                 //              $query = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " VALUES ('','" . addslashes($names[$c]) . "','0','" . $row['id_breeder'] . "','" . $row['user'] . "','" . $genders[$c] . "','" . $_GET['seldam'] . "','" . $row['father'] . "','',''";
                 $query = 'INSERT INTO '
-                         . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-                         . " VALUES ('','"
-                         . $GLOBALS['xoopsDB']->escape($names[$c])
-                         . "','0','"
-                         . $GLOBALS['xoopsDB']->escape($row['id_breeder'])
-                         . "','"
-                         . $GLOBALS['xoopsDB']->escape($row['user'])
-                         . "','"
-                         . $GLOBALS['xoopsDB']->escape($genders[$c])
-                         . "','"
-                         . $GLOBALS['xoopsDB']->escape($seldam)
-                         . "','"
-                         . $GLOBALS['xoopsDB']->escape($row['father'])
-                         . "','',''";
+                            . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                            . " VALUES ('','"
+                            . $GLOBALS['xoopsDB']->escape($names[$c])
+                            . "','0','"
+                            . $GLOBALS['xoopsDB']->escape($row['id_breeder'])
+                            . "','"
+                            . $GLOBALS['xoopsDB']->escape($row['user'])
+                            . "','"
+                            . $GLOBALS['xoopsDB']->escape($genders[$c])
+                            . "','"
+                            . $GLOBALS['xoopsDB']->escape($seldam)
+                            . "','"
+                            . $GLOBALS['xoopsDB']->escape($row['father'])
+                            . "','',''";
                 //create animal object
                 $animal = new Pedigree\Animal();
                 //test to find out how many user fields there are..

Spacing +66 added lines, -66 removed lines

@@ -5,20 +5,20 @@ 
 use XoopsModules\Pedigree;
 
 //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/' . $xoopsModule->dirname() . '/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/common.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_addlitter.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 $xoopsTpl->assign('page_title', 'Pedigree database - add a litter');
 
 //check for access
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 if (empty($xoopsUser)) {
-    redirect_header('index.php', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+    redirect_header('index.php', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
 }
 
 //get module configuration
@@ -55,7 +55,7 @@ 
     $moduleConfig  = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
 
     //create xoopsform
-    include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $searchform = new \XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_LITTER, ['[litter]' => $moduleConfig['litter']]), 'searchform', 'add_litter.php?f=sire', 'post', true);
     $searchform->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
     //create random value
@@ -66,16 +66,16 @@ 
     //create animal object
     $animal = new Pedigree\Animal();
     //test to find out how many user fields there are...
-    $fields  = $animal->getNumOfFields();
+    $fields = $animal->getNumOfFields();
 
     //create form contents
     for ($count = 1; $count < 11; ++$count) {
         //name
-        $searchform->addElement(new \XoopsFormLabel($count . '.', strtr(_MA_PEDIGREE_KITT_NAME . $count . '.', ['[animalType]' => $moduleConfig['animalType']])));
-        $textbox[$count] = new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_NAME . '</b>', 'name' . $count, $size = 50, $maxsize = 50, '');
+        $searchform->addElement(new \XoopsFormLabel($count.'.', strtr(_MA_PEDIGREE_KITT_NAME.$count.'.', ['[animalType]' => $moduleConfig['animalType']])));
+        $textbox[$count] = new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_NAME.'</b>', 'name'.$count, $size = 50, $maxsize = 50, '');
         $searchform->addElement($textbox[$count]);
         //gender
-        $gender_radio[$count] = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft' . $count, $value = '0');
+        $gender_radio[$count] = new \XoopsFormRadio('<b>'._MA_PEDIGREE_FLD_GEND.'</b>', 'roft'.$count, $value = '0');
         $gender_radio[$count]->addOptionArray([
                                                   '0' => strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]),
                                                   '1' => strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']])
@@ -95,7 +95,7 @@ 
         $searchform->addElement(new \XoopsFormLabel('&nbsp;', ''));
     }
 
-    $searchform->addElement(new \XoopsFormLabel(_MA_PEDIGREE_ADD_DATA, _MA_PEDIGREE_DATA_INFO . $moduleConfig['litter'] . '.</h2>'));
+    $searchform->addElement(new \XoopsFormLabel(_MA_PEDIGREE_ADD_DATA, _MA_PEDIGREE_DATA_INFO.$moduleConfig['litter'].'.</h2>'));
     //add userfields that are not shown in the litter
     for ($i = 0, $iMax = count($fields); $i < $iMax; ++$i) {
         $userField   = new Pedigree\Field($fields[$i], $animal->getConfig());
@@ -112,11 +112,11 @@ 
     if ('1' == $moduleConfig['ownerbreeder']) {
         //breeder
         $breeder  = new \XoopsFormSelect(_MA_PEDIGREE_FLD_BREE, 'id_breeder', $value = '', $size = 1, $multiple = false);
-        $queryfok = 'SELECT id, firstname, lastname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY `lastname`';
+        $queryfok = 'SELECT id, firstname, lastname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY `lastname`';
         $resfok   = $GLOBALS['xoopsDB']->query($queryfok);
         $breeder->addOption(0, $name = 'Unknown');
         while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-            $breeder->addOption($rowfok['id'], $name = $rowfok['lastname'] . ', ' . $rowfok['firstname']);
+            $breeder->addOption($rowfok['id'], $name = $rowfok['lastname'].', '.$rowfok['firstname']);
         }
         $searchform->addElement($breeder);
     }
@@ -143,7 +143,7 @@ 
     //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);
     }
     //    $userid = $_POST['userid'];
     //    if (empty($random)) {
@@ -165,12 +165,12 @@ 
     $name       = '';
     $roft       = '';
     for ($count = 1; $count < 11; ++$count) {
-        $namelitter = 'name' . $count;
-        $roftlitter = 'roft' . $count;
+        $namelitter = 'name'.$count;
+        $roftlitter = 'roft'.$count;
         //check for an empty name
             if ('' !== $_POST[$namelitter]) {
-                $name .= ':' . Request::getString('namelitter', '', 'POST');
-                $roft .= ':' . Request::getString('roftlitter', '', 'POST');
+                $name .= ':'.Request::getString('namelitter', '', 'POST');
+                $roft .= ':'.Request::getString('roftlitter', '', 'POST');
         } else {
                 if (1 == $count) {
                 redirect_header('add_litter.php', 3, _MA_PEDIGREE_ADD_NAMEPLZ);
@@ -196,18 +196,18 @@ 
             //emtpy string to house the different values for this userfield
             $withinfield = '';
             for ($count = 1; $count < 11; ++$count) {
-                if ('' !== $_POST['name' . $count]) {
-                    if (isset($_POST[$count . 'user' . $iValue])) {
+                if ('' !== $_POST['name'.$count]) {
+                    if (isset($_POST[$count.'user'.$iValue])) {
                         //debug option
                         //echo $count.'user'.$fields[$i]."=".$_POST[$count.'user'.$fields[$i]]."<br>";
-                        $withinfield .= ':' . $_POST[$count . 'user' . $iValue];
+                        $withinfield .= ':'.$_POST[$count.'user'.$iValue];
                     } else {
                         if ($userField->isActive() && $userField->generalLitter() && !$userField->isLocked()) {
                             //use $_POST value if this is a general litter field
-                            $withinfield .= ':' . $_POST['-user' . $iValue];
+                            $withinfield .= ':'.$_POST['-user'.$iValue];
                         } else {
                             //create $withinfield for fields not added to the litter
-                            $withinfield .= ':' . $defvalue;
+                            $withinfield .= ':'.$defvalue;
                         }
                     }
                 }
@@ -236,13 +236,13 @@ 
             $fieldType   = $userField->getSetting('FieldType');
             $fieldObject = new $fieldType($userField, $animal);
             //do we only need to create a query for active fields ?
-            $query .= ",'" . $user{$fields[$i]} . "'";
+            $query .= ",'".$user{$fields[$i]}."'";
         }
         $query .= ')';
         //debug options
         //echo $query."<br>"; die();
         $GLOBALS['xoopsDB']->query($query);
-        redirect_header('add_litter.php?f=sire&random=' . $random . '&st=' . $st . '&r=1&l=a', 1, strtr(_MA_PEDIGREE_ADD_SIREPLZ, ['[father]' => $moduleConfig['father']]));
+        redirect_header('add_litter.php?f=sire&random='.$random.'&st='.$st.'&r=1&l=a', 1, strtr(_MA_PEDIGREE_ADD_SIREPLZ, ['[father]' => $moduleConfig['father']]));
     }
     //find letter on which to start else set to 'a'
         $l = Request::getWord('l', 'a', 'GET');
@@ -252,7 +252,7 @@ 
     //create list of males dog to select from
     $perPage = $moduleConfig['perpage'];
     //count total number of dogs
-    $numDog = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft='0' AND naam LIKE '" . $l . "%'";
+    $numDog = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE roft='0' AND naam LIKE '".$l."%'";
     $numRes = $GLOBALS['xoopsDB']->query($numDog);
     //total number of dogs the query will find
     $numResults = $GLOBALS['xoopsDB']->getRowsNum($numRes);
@@ -267,20 +267,20 @@ 
     $pages = '';
     for ($i = 65; $i <= 90; ++$i) {
         if ($l == chr($i)) {
-            $pages .= '<b><a href="add_litter.php?f=sire&r=1&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a></b>&nbsp;';
+            $pages .= '<b><a href="add_litter.php?f=sire&r=1&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a></b>&nbsp;';
         } else {
-            $pages .= '<a href="add_litter.php?f=sire&r=1&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a>&nbsp;';
+            $pages .= '<a href="add_litter.php?f=sire&r=1&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a>&nbsp;';
         }
     }
     $pages .= '-&nbsp;';
-    $pages .= '<a href="add_litter.php?f=sire&r=1&random=' . $random . '&l=Ã…">Ã…</a>&nbsp;';
-    $pages .= '<a href="add_litter.php?f=sire&r=1&random=' . $random . '&l=Ö">Ö</a>&nbsp;';
+    $pages .= '<a href="add_litter.php?f=sire&r=1&random='.$random.'&l=Ã…">Ã…</a>&nbsp;';
+    $pages .= '<a href="add_litter.php?f=sire&r=1&random='.$random.'&l=Ö">Ö</a>&nbsp;';
     //create linebreak
     $pages .= '<br>';
     //create previous button
     if ($numPages > 1) {
         if ($currentPage > 1) {
-            $pages .= '<a href="add_litter.php?f=sire&r=1&l=' . $l . '&random=' . $random . '&st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="add_litter.php?f=sire&r=1&l='.$l.'&random='.$random.'&st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp';
         }
     }
     //create numbers
@@ -290,19 +290,19 @@ 
             $pages .= '<br>';
         }
         if ($x != $currentPage) {
-            $pages .= '<a href="add_litter.php?f=sire&r=1&l=' . $l . '&random=' . $random . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="add_litter.php?f=sire&r=1&l='.$l.'&random='.$random.'&st='.($perPage * ($x - 1)).'">'.$x.'</a>&nbsp;&nbsp;';
         } else {
-            $pages .= $x . '&nbsp;&nbsp';
+            $pages .= $x.'&nbsp;&nbsp';
         }
     }
     //create next button
     if ($numPages > 1) {
         if ($currentPage < $numPages) {
-            $pages .= '<a href="add_litter.php?f=sire&r=1&l=' . $l . '&random=' . $random . '&st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="add_litter.php?f=sire&r=1&l='.$l.'&random='.$random.'&st='.($st + $perPage).'">'._MA_PEDIGREE_NEXT.'</a>&nbsp;&nbsp';
         }
     }
     //query
-    $queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft = '0' AND naam LIKE '" . $l . "%' ORDER BY naam LIMIT " . $st . ', ' . $perPage;
+    $queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE roft = '0' AND naam LIKE '".$l."%' ORDER BY naam LIMIT ".$st.', '.$perPage;
     $result      = $GLOBALS['xoopsDB']->query($queryString);
 
     $animal = new Pedigree\Animal();
@@ -339,7 +339,7 @@ 
         'id'          => '0',
         'name'        => '',
         'gender'      => '',
-        'link'        => '<a href="add_litter.php?f=dam&random=' . $random . '&selsire=0">' . strtr(_MA_PEDIGREE_ADD_SIREUNKNOWN, ['[father]' => $moduleConfig['father']]) . '</a>',
+        'link'        => '<a href="add_litter.php?f=dam&random='.$random.'&selsire=0">'.strtr(_MA_PEDIGREE_ADD_SIREUNKNOWN, ['[father]' => $moduleConfig['father']]).'</a>',
         'colour'      => '',
         'number'      => '',
         'usercolumns' => $empty
@@ -352,7 +352,7 @@ 
         } else {
             $camera = '';
         }
-        $name = stripslashes($row['naam']) . $camera;
+        $name = stripslashes($row['naam']).$camera;
         //empty array
         unset($columnvalue);
         //fill array
@@ -360,17 +360,17 @@ 
             $x = $columns[$i]['columnnumber'];
             if (is_array($columns[$i]['lookupval'])) {
                 foreach ($columns[$i]['lookupval'] as $key => $keyValue) {
-                    if ($key == $row['user' . $x]) {
+                    if ($key == $row['user'.$x]) {
                         $value = $keyValue['value'];
                     }
                 }
                 //debug information
                 ///echo $columns[$i]['columnname']."is an array !";
             } //format value - cant use object because of query count
-            elseif (0 === strncmp($row['user' . $x], 'http://', 7)) {
-                $value = '<a href="' . $row['user' . $x] . '">' . $row['user' . $x] . '</a>';
+            elseif (0 === strncmp($row['user'.$x], 'http://', 7)) {
+                $value = '<a href="'.$row['user'.$x].'">'.$row['user'.$x].'</a>';
             } else {
-                $value = $row['user' . $x];
+                $value = $row['user'.$x];
             }
             $columnvalue[] = ['value' => $value];
         }
@@ -378,7 +378,7 @@ 
             'id'          => $row['id'],
             'name'        => $name,
             'gender'      => '<img src="assets/images/male.gif">',
-            'link'        => '<a href="add_litter.php?f=dam&random=' . $random . '&selsire=' . $row['id'] . '">' . $name . '</a>',
+            'link'        => '<a href="add_litter.php?f=dam&random='.$random.'&selsire='.$row['id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => $columnvalue
@@ -424,9 +424,9 @@ 
     if (!isset($_GET['r'])) {
         //insert into pedigree_temp
         //      $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . ' SET father =' . $_GET['selsire'] . ' WHERE id=' . $random;
-        $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . ' SET father =' . Request::getInt('selsire', 0, 'GET') . ' WHERE id=' . $random;
+        $query = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_temp').' SET father ='.Request::getInt('selsire', 0, 'GET').' WHERE id='.$random;
         $GLOBALS['xoopsDB']->queryF($query);
-        redirect_header('add_litter.php?f=dam&random=' . $random . '&st=' . $st . '&r=1', 1, strtr(_MA_PEDIGREE_ADD_SIREOK, ['[mother]' => $moduleConfig['mother']]));
+        redirect_header('add_litter.php?f=dam&random='.$random.'&st='.$st.'&r=1', 1, strtr(_MA_PEDIGREE_ADD_SIREOK, ['[mother]' => $moduleConfig['mother']]));
     }
     //find letter on which to start else set to 'a'
     //    if (isset($_GET['l'])) {
@@ -442,7 +442,7 @@ 
     $perPage = (int)$moduleConfig['perpage'];
     //count total number of dogs
     //  $numDog = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft='1' and naam LIKE '" . $l . "%'";
-    $numDog = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft='1' AND naam LIKE '" . $GLOBALS['xoopsDB']->escape($l) . "%'";
+    $numDog = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE roft='1' AND naam LIKE '".$GLOBALS['xoopsDB']->escape($l)."%'";
     $numRes = $GLOBALS['xoopsDB']->query($numDog);
     //total number of dogs the query will find
     $numResults = $GLOBALS['xoopsDB']->getRowsNum($numRes);
@@ -457,20 +457,20 @@ 
     $pages = '';
     for ($i = 65; $i <= 90; ++$i) {
         if ($l == chr($i)) {
-            $pages .= '<b><a href="add_litter.php?f=dam&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a></b>&nbsp;';
+            $pages .= '<b><a href="add_litter.php?f=dam&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a></b>&nbsp;';
         } else {
-            $pages .= '<a href="add_litter.php?f=dam&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a>&nbsp;';
+            $pages .= '<a href="add_litter.php?f=dam&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a>&nbsp;';
         }
     }
     $pages .= '-&nbsp;';
-    $pages .= '<a href="add_litter.php?f=dam&r=1&random=' . $random . '&l=Ã…">Ã…</a>&nbsp;';
-    $pages .= '<a href="add_litter.php?f=dam&r=1&random=' . $random . '&l=Ö">Ö</a>&nbsp;';
+    $pages .= '<a href="add_litter.php?f=dam&r=1&random='.$random.'&l=Ã…">Ã…</a>&nbsp;';
+    $pages .= '<a href="add_litter.php?f=dam&r=1&random='.$random.'&l=Ö">Ö</a>&nbsp;';
     //create linebreak
     $pages .= '<br>';
     //create previous button
     if ($numPages > 1) {
         if ($currentPage > 1) {
-            $pages .= '<a href="add_litter.php?f=dam&r=1&l=' . $l . '&random=' . $random . '&st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="add_litter.php?f=dam&r=1&l='.$l.'&random='.$random.'&st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp';
         }
     }
     //create numbers
@@ -480,19 +480,19 @@ 
             $pages .= '<br>';
         }
         if ($x != $currentPage) {
-            $pages .= '<a href="add_litter.php?f=dam&r=1&l=' . $l . '&random=' . $random . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="add_litter.php?f=dam&r=1&l='.$l.'&random='.$random.'&st='.($perPage * ($x - 1)).'">'.$x.'</a>&nbsp;&nbsp;';
         } else {
-            $pages .= $x . '&nbsp;&nbsp';
+            $pages .= $x.'&nbsp;&nbsp';
         }
     }
     //create next button
     if ($numPages > 1) {
         if ($currentPage < $numPages) {
-            $pages .= '<a href="add_litter.php?f=dam&r=1&l=' . $l . '&random=' . $random . '&st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="add_litter.php?f=dam&r=1&l='.$l.'&random='.$random.'&st='.($st + $perPage).'">'._MA_PEDIGREE_NEXT.'</a>&nbsp;&nbsp';
         }
     }
     //query
-    $queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft = '1' AND naam LIKE '" . $l . "%' ORDER BY naam LIMIT " . $st . ', ' . $perPage;
+    $queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE roft = '1' AND naam LIKE '".$l."%' ORDER BY naam LIMIT ".$st.', '.$perPage;
     $result      = $GLOBALS['xoopsDB']->query($queryString);
 
     $animal = new Pedigree\Animal();
@@ -529,7 +529,7 @@ 
         'id'          => '0',
         'name'        => '',
         'gender'      => '',
-        'link'        => '<a href="add_litter.php?f=check&random=' . $random . '&seldam=0">' . strtr(_MA_PEDIGREE_ADD_DAMUNKNOWN, ['[mother]' => $moduleConfig['mother']]) . '</a>',
+        'link'        => '<a href="add_litter.php?f=check&random='.$random.'&seldam=0">'.strtr(_MA_PEDIGREE_ADD_DAMUNKNOWN, ['[mother]' => $moduleConfig['mother']]).'</a>',
         'colour'      => '',
         'number'      => '',
         'usercolumns' => $empty
@@ -542,7 +542,7 @@ 
         } else {
             $camera = '';
         }
-        $name = stripslashes($row['naam']) . $camera;
+        $name = stripslashes($row['naam']).$camera;
         //empty array
         unset($columnvalue);
         //fill array
@@ -550,17 +550,17 @@ 
             $x = $columns[$i]['columnnumber'];
             if (is_array($columns[$i]['lookupval'])) {
                 foreach ($columns[$i]['lookupval'] as $key => $keyValue) {
-                    if ($key == $row['user' . $x]) {
+                    if ($key == $row['user'.$x]) {
                         $value = $keyValue['value'];
                     }
                 }
                 //debug information
                 ///echo $columns[$i]['columnname']."is an array !";
             } //format value - cant use object because of query count
-            elseif (0 === strncmp($row['user' . $x], 'http://', 7)) {
-                $value = '<a href="' . $row['user' . $x] . '">' . $row['user' . $x] . '</a>';
+            elseif (0 === strncmp($row['user'.$x], 'http://', 7)) {
+                $value = '<a href="'.$row['user'.$x].'">'.$row['user'.$x].'</a>';
             } else {
-                $value = $row['user' . $x];
+                $value = $row['user'.$x];
             }
             $columnvalue[] = ['value' => $value];
         }
@@ -568,7 +568,7 @@ 
             'id'          => $row['id'],
             'name'        => $name,
             'gender'      => '<img src="assets/images/female.gif">',
-            'link'        => '<a href="add_litter.php?f=check&random=' . $random . '&seldam=' . $row['id'] . '">' . $name . '</a>',
+            'link'        => '<a href="add_litter.php?f=check&random='.$random.'&seldam='.$row['id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => $columnvalue
@@ -603,7 +603,7 @@ 
         $random = $_GET['random'];
     }
     //query
-    $queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . ' WHERE id = ' . $random;
+    $queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_temp').' WHERE id = '.$random;
     $result      = $GLOBALS['xoopsDB']->query($queryString);
     $seldam      = Request::getInt('seldam', 0, 'GET');
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -635,19 +635,19 @@ 
                 sort($fields);
                 $usersql = '';
                 foreach ($fields as $i => $iValue) {
-                    $userfields{$fields[$i]} = explode(':', $row['user' . $iValue]);
-                    $query .= ",'" . $userfields{$fields[$i]}
-                        [$c] . "'";
+                    $userfields{$fields[$i]} = explode(':', $row['user'.$iValue]);
+                    $query .= ",'".$userfields{$fields[$i]}
+                        [$c]."'";
                 }
                 //insert into pedigree
                 $query .= ');';
                 $GLOBALS['xoopsDB']->queryF($query);
             }
         }
-        $sqlQuery = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . " WHERE id='" . $random . "'";
+        $sqlQuery = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_temp')." WHERE id='".$random."'";
     }
     redirect_header('latest.php', 1, strtr(_MA_PEDIGREE_ADD_LIT_OK, ['[animalTypes]' => $moduleConfig['animalTypes']]));
 }
 
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

breeder.php

Spacing +18 added lines, -18 removed lines

@@ -4,7 +4,7 @@ 
 use XoopsModules\Pedigree;
 
 //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.
@@ -16,9 +16,9 @@ 
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_breeder.tpl';
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/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';
 $xoopsTpl->assign('page_title', 'Pedigree database - View owner/breeder');
 
 // Breadcrumb
@@ -43,7 +43,7 @@ 
 } else {
     $l = 'a';
 }
-$w = $l . '%';
+$w = $l.'%';
 if (1 == $l) {
     $l = 'LIKE';
 }
@@ -73,7 +73,7 @@ 
 }
 
 //count total number of owners
-$numowner = 'SELECT count(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE ' . $f . " LIKE '" . $w . "'";
+$numowner = 'SELECT count(id) FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE '.$f." LIKE '".$w."'";
 $numRes   = $GLOBALS['xoopsDB']->query($numowner);
 //total number of owners the query will find
 list($numResults) = $GLOBALS['xoopsDB']->fetchRow($numRes);
@@ -119,7 +119,7 @@ 
 //create previous button
 if ($numPages > 1) {
     if ($currentPage > 1) {
-        $pages .= '<a href="breeder.php?f=' . $f . '&o=' . $o . '&d=' . $d . '&l=' . $l . '&st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp;';
+        $pages .= '<a href="breeder.php?f='.$f.'&o='.$o.'&d='.$d.'&l='.$l.'&st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp;';
 }
 
 //create numbers
@@ -129,9 +129,9 @@ 
             $pages .= '<br>';
     }
         if ($x != $currentPage) {
-            $pages .= '<a href="breeder.php?f=' . $f . '&o=' . $o . '&d=' . $d . '&l=' . $l . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="breeder.php?f='.$f.'&o='.$o.'&d='.$d.'&l='.$l.'&st='.($perPage * ($x - 1)).'">'.$x.'</a>&nbsp;&nbsp;';
     } else {
-        $pages .= $x . '&nbsp;&nbsp';
+        $pages .= $x.'&nbsp;&nbsp';
     }
 }
 }
@@ -139,12 +139,12 @@ 
 //create next button
 if ($numPages > 1) {
     if ($currentPage < $numPages) {
-        $pages .= '<a href="breeder.php?f=' . $f . '&o=' . $o . '&d=' . $d . '&l=' . $l . '&st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp;';
+        $pages .= '<a href="breeder.php?f='.$f.'&o='.$o.'&d='.$d.'&l='.$l.'&st='.($st + $perPage).'">'._MA_PEDIGREE_NEXT.'</a>&nbsp;&nbsp;';
     }
 }
 
 //query
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE ' . $f . " LIKE '" . $w . "' ORDER BY " . $o . ' ' . $d . ' LIMIT ' . $st . ', ' . $perPage;
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE '.$f." LIKE '".$w."' ORDER BY ".$o.' '.$d.' LIMIT '.$st.', '.$perPage;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -153,13 +153,13 @@ 
     if (!empty($xoopsUser)) {
         if (true === $modadmin || $row['user'] == $xoopsUser->getVar('uid')) {
             //$access = "<a href=\"dog.php?id=".$row['id']."\"><img src=\"assets/images/edit.png\" alt="._EDIT."></a>";
-            $access .= '<a href="deletebreeder.php?id=' . $row['id'] . "\"><img src='" . $pathIcon16 . "/delete.png' alt=" . _DELETE . '></a>';
+            $access .= '<a href="deletebreeder.php?id='.$row['id']."\"><img src='".$pathIcon16."/delete.png' alt="._DELETE.'></a>';
         } else {
             $access = '';
         }
     }
     //make names
-    $name = $access . '<a href="owner.php?ownid=' . $row['id'] . '">' . stripslashes($row['lastname']) . ', ' . stripslashes($row['firstname']) . '</a>';
+    $name = $access.'<a href="owner.php?ownid='.$row['id'].'">'.stripslashes($row['lastname']).', '.stripslashes($row['firstname']).'</a>';
     //create array for owners
     $dogs[] = [
         'id'   => $row['id'],
@@ -175,11 +175,11 @@ 
 }
 //assign links
 if ('ASC' === $d) {
-    $nl = '<a href="breeder.php?f=' . $f . '&o=lastname&d=DESC">' . _MA_PEDIGREE_OWN_NAME . '</a>';
-    $cl = '<a href="breeder.php?f=' . $f . '&o=city&d=DESC">' . _MA_PEDIGREE_OWN_CITY . '</a>';
+    $nl = '<a href="breeder.php?f='.$f.'&o=lastname&d=DESC">'._MA_PEDIGREE_OWN_NAME.'</a>';
+    $cl = '<a href="breeder.php?f='.$f.'&o=city&d=DESC">'._MA_PEDIGREE_OWN_CITY.'</a>';
 } else {
-    $nl = '<a href="breeder.php?f=' . $f . '&o=lastname&d=ASC">' . _MA_PEDIGREE_OWN_NAME . '</a>';
-    $cl = '<a href="breeder.php?f=' . $f . '&o=city&d=ASC">' . _MA_PEDIGREE_OWN_CITY . '</a>';
+    $nl = '<a href="breeder.php?f='.$f.'&o=lastname&d=ASC">'._MA_PEDIGREE_OWN_NAME.'</a>';
+    $cl = '<a href="breeder.php?f='.$f.'&o=city&d=ASC">'._MA_PEDIGREE_OWN_CITY.'</a>';
 }
 $xoopsTpl->assign('namelink', $nl);
 $xoopsTpl->assign('colourlink', $cl);
@@ -192,7 +192,7 @@ 
 }
 //create string
 $matches     = _MA_PEDIGREE_MATCHESB;
-$nummatchstr = $numResults . $matches . ($st + 1) . '-' . $lastshown . ' (' . $numPages . ' pages)';
+$nummatchstr = $numResults.$matches.($st + 1).'-'.$lastshown.' ('.$numPages.' pages)';
 $xoopsTpl->assign('nummatch', $nummatchstr);
 $xoopsTpl->assign('pages', $pages);
 
@@ -214,4 +214,4 @@ 
 $xoopsTpl->assign('pageTitle', _MA_PEDIGREE_BREEDER_PAGETITLE);
 
 //comments and footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

mpedigree.php

Spacing +34 added lines, -34 removed lines

@@ -5,7 +5,7 @@ 
 use XoopsModules\Pedigree;
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /** @var Pedigree\Helper $helper */
 $helper = Pedigree\Helper::getInstance();
@@ -14,7 +14,7 @@ 
 $helper->loadLanguage('main');
 
 // 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_mpedigree.tpl';
 
@@ -96,37 +96,37 @@ 
 mfmm.naam as mfmm_naam,
 mmmm.id as mmmm_id,
 mmmm.naam as mmmm_naam
-    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
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ffff ON fff.father = ffff.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ffmf ON ffm.father = ffmf.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmff ON fmf.father = fmff.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmmf ON fmm.father = fmmf.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mmff ON mmf.father = mmff.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mfff ON mff.father = mfff.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mfmf ON mfm.father = mfmf.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mmmf ON mmm.father = mmmf.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fffm ON fff.mother = fffm.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ffmm ON ffm.mother = ffmm.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmfm ON fmf.mother = fmfm.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fmmm ON fmm.mother = fmmm.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mmfm ON mmf.mother = mmfm.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mffm ON mff.mother = mffm.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mfmm ON mfm.mother = mfmm.id
-LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mmmm ON mmm.mother = mmmm.id
+    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
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ffff ON fff.father = ffff.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ffmf ON ffm.father = ffmf.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmff ON fmf.father = fmff.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmmf ON fmm.father = fmmf.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mmff ON mmf.father = mmff.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mfff ON mff.father = mfff.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mfmf ON mfm.father = mfmf.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mmmf ON mmm.father = mmmf.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fffm ON fff.mother = fffm.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ffmm ON ffm.mother = ffmm.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmfm ON fmf.mother = fmfm.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fmmm ON fmm.mother = fmmm.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mmfm ON mmf.mother = mmfm.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mffm ON mff.mother = mffm.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mfmm ON mfm.mother = mfmm.id
+LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mmmm ON mmm.mother = mmmm.id
 WHERE d.id=' . $pedId;
 
 $result = $GLOBALS['xoopsDB']->query($queryString);
@@ -298,7 +298,7 @@ 
 }
 
 //add data to smarty template
-$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $d['d']['name'] . ' -- mega pedigree');
+$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $d['d']['name'].' -- mega pedigree');
 //assign dog(s)
 $GLOBALS['xoopsTpl']->assign('d', $d);
 $GLOBALS['xoopsTpl']->assign('male', '<img src="assets/images/male.gif">');

include/ZervWizard.php

Spacing +9 added lines, -9 removed lines

@@ -70,17 +70,17 @@ 
             return;
         }
 
-        $containerKey = $this->_containerPrefix . $name;
+        $containerKey = $this->_containerPrefix.$name;
         if (!array_key_exists($containerKey, $container)) {
             $container[$containerKey] = [];
         }
 
-        $this->container =& $container[$containerKey];
+        $this->container = & $container[$containerKey];
 
         if (!array_key_exists('_errors', $this->container)) {
             $this->container['_errors'] = [];
         }
-        $this->_errors =& $this->container['_errors'];
+        $this->_errors = & $this->container['_errors'];
     }
 
     /**
@@ -118,7 +118,7 @@ 
             $this->_errors = [];
 
             // processing callback must exist and validate to proceed
-            $callback = 'process' . $action;
+            $callback = 'process'.$action;
             $complete = method_exists($this, $callback) && $this->$callback($form);
 
             $this->container[$this->_step_status_key][$action] = $complete;
@@ -145,7 +145,7 @@ 
                     $this->_errors = [];
 
                     // processing callback must exist and validate to proceed
-                    $callback = 'process' . $action;
+                    $callback = 'process'.$action;
                     $complete = method_exists($this, $callback) && $this->$callback($form);
 
                     $this->container[$this->_step_status_key][$action] = $complete;
@@ -174,7 +174,7 @@ 
         }
 
         // setup any required data for this step
-        $callback = 'prepare' . $this->getStepName();
+        $callback = 'prepare'.$this->getStepName();
         if (method_exists($this, $callback)) {
             $this->$callback();
         }
@@ -194,8 +194,8 @@ 
     {
         if ($this->coalesce($this->options['redirectAfterPost'], false)) {
             $redir = $_SERVER['REQUEST_URI'];
-            $redir = preg_replace('/\?' . preg_quote($_SERVER['QUERY_STRING'], '/') . '$/', '', $redir);
-            header('Location: ' . $redir);
+            $redir = preg_replace('/\?'.preg_quote($_SERVER['QUERY_STRING'], '/').'$/', '', $redir);
+            header('Location: '.$redir);
             exit;
         }
     }
@@ -448,7 +448,7 @@ 
     public function addStep($stepname, $title)
     {
         if (array_key_exists($stepname, $this->_steps)) {
-            $this->addError('step', 'Step with name ' . $stepname . ' already exists');
+            $this->addError('step', 'Step with name '.$stepname.' already exists');
 
             return;
         }

include/class_field.php

Spacing +60 added lines, -60 removed lines

@@ -20,7 +20,7 @@ 
      */
     public function __construct($message)
     {
-        echo '<span style="color: red;"><h3>' . $message . '</h3></span>';
+        echo '<span style="color: red;"><h3>'.$message.'</h3></span>';
     }
 }
 
@@ -37,9 +37,9 @@ 
     {
         global $xoopsDB;
         if (0 == $animalnumber) {
-            $SQL = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id = '1'";
+            $SQL = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id = '1'";
         } else {
-            $SQL = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id = ' . $animalnumber;
+            $SQL = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id = '.$animalnumber;
         }
         $result    = $GLOBALS['xoopsDB']->query($SQL);
         $row       = $GLOBALS['xoopsDB']->fetchRow($result);
@@ -56,7 +56,7 @@ 
     public function getNumOfFields()
     {
         global $xoopsDB;
-        $SQL    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . ' ORDER BY `order`';
+        $SQL    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_fields').' ORDER BY `order`';
         $fields = [];
         $result = $GLOBALS['xoopsDB']->query($SQL);
         $count  = 0;
@@ -267,7 +267,7 @@ 
     {
         $ret = [];
         global $xoopsDB;
-        $SQL    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $fieldnumber) . " ORDER BY 'order'";
+        $SQL    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$fieldnumber)." ORDER BY 'order'";
         $result = $GLOBALS['xoopsDB']->query($SQL);
         while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
             $ret[] = ['id' => $row['id'], 'value' => $row['value']];
@@ -292,7 +292,7 @@ 
      */
     public function showField()
     {
-        return $this->fieldname . ' : ' . $this->value;
+        return $this->fieldname.' : '.$this->value;
     }
 
     /**
@@ -329,11 +329,11 @@ 
         $this->fieldnumber = $parentObject->getId();
 
         $this->fieldname    = $parentObject->fieldname;
-        $this->value        = $animalObject->{'user' . $this->fieldnumber};
+        $this->value        = $animalObject->{'user'.$this->fieldnumber};
         $this->defaultvalue = $parentObject->defaultvalue;
         $this->lookuptable  = $parentObject->lookuptable;
         if ('0' == $this->lookuptable) {
-            new SystemMessage('A lookuptable must be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('A lookuptable must be specified for userfield'.$this->fieldnumber);
         }
     }
 
@@ -342,10 +342,10 @@ 
      */
     public function editField()
     {
-        $radio          = new \XoopsFormRadio('<b>' . $this->fieldname . '</b>', 'user' . $this->fieldnumber, $value = $this->value);
+        $radio          = new \XoopsFormRadio('<b>'.$this->fieldname.'</b>', 'user'.$this->fieldnumber, $value = $this->value);
         $lookupcontents = Field::lookupField($this->fieldnumber);
         for ($i = 0, $iMax = count($lookupcontents); $i < $iMax; ++$i) {
-            $radio->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'] . '<br>'));
+            $radio->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'].'<br>'));
         }
 
         return $radio;
@@ -358,10 +358,10 @@ 
      */
     public function newField($name = '')
     {
-        $radio          = new \XoopsFormRadio('<b>' . $this->fieldname . '</b>', $name . 'user' . $this->fieldnumber, $value = $this->defaultvalue);
+        $radio          = new \XoopsFormRadio('<b>'.$this->fieldname.'</b>', $name.'user'.$this->fieldnumber, $value = $this->defaultvalue);
         $lookupcontents = Field::lookupField($this->fieldnumber);
         for ($i = 0, $iMax = count($lookupcontents); $i < $iMax; ++$i) {
-            $radio->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'] . '<br>'));
+            $radio->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'].'<br>'));
         }
 
         return $radio;
@@ -397,7 +397,7 @@ 
             }
         }
 
-        return $this->fieldname . ' : ' . $choosenvalue;
+        return $this->fieldname.' : '.$choosenvalue;
     }
 
     /**
@@ -424,7 +424,7 @@ 
         $select         = '<select size="1" name="query" style="width: 140px;">';
         $lookupcontents = Field::lookupField($this->fieldnumber);
         for ($i = 0, $iMax = count($lookupcontents); $i < $iMax; ++$i) {
-            $select .= '<option value="' . $lookupcontents[$i]['id'] . '">' . $lookupcontents[$i]['value'] . '</option>';
+            $select .= '<option value="'.$lookupcontents[$i]['id'].'">'.$lookupcontents[$i]['value'].'</option>';
         }
         $select .= '</select>';
 
@@ -445,11 +445,11 @@ 
     {
         $this->fieldnumber  = $parentObject->getId();
         $this->fieldname    = $parentObject->fieldname;
-        $this->value        = $animalObject->{'user' . $this->fieldnumber};
+        $this->value        = $animalObject->{'user'.$this->fieldnumber};
         $this->defaultvalue = $parentObject->defaultvalue;
         $this->lookuptable  = $parentObject->lookuptable;
         if ('0' == $this->lookuptable) {
-            new SystemMessage('A lookuptable must be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('A lookuptable must be specified for userfield'.$this->fieldnumber);
         }
     }
 
@@ -458,10 +458,10 @@ 
      */
     public function editField()
     {
-        $select         = new \XoopsFormSelect('<b>' . $this->fieldname . '</b>', 'user' . $this->fieldnumber, $value = $this->value, $size = 1, $multiple = false);
+        $select         = new \XoopsFormSelect('<b>'.$this->fieldname.'</b>', 'user'.$this->fieldnumber, $value = $this->value, $size = 1, $multiple = false);
         $lookupcontents = Field::lookupField($this->fieldnumber);
         for ($i = 0, $iMax = count($lookupcontents); $i < $iMax; ++$i) {
-            $select->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'] . '<br>'));
+            $select->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'].'<br>'));
         }
 
         return $select;
@@ -474,10 +474,10 @@ 
      */
     public function newField($name = '')
     {
-        $select         = new \XoopsFormSelect('<b>' . $this->fieldname . '</b>', $name . 'user' . $this->fieldnumber, $value = $this->defaultvalue, $size = 1, $multiple = false);
+        $select         = new \XoopsFormSelect('<b>'.$this->fieldname.'</b>', $name.'user'.$this->fieldnumber, $value = $this->defaultvalue, $size = 1, $multiple = false);
         $lookupcontents = Field::lookupField($this->fieldnumber);
         for ($i = 0, $iMax = count($lookupcontents); $i < $iMax; ++$i) {
-            $select->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'] . '<br>'));
+            $select->addOption($lookupcontents[$i]['id'], $name = ($lookupcontents[$i]['value'].'<br>'));
         }
 
         return $select;
@@ -513,7 +513,7 @@ 
             }
         }
 
-        return $this->fieldname . ' : ' . $choosenvalue;
+        return $this->fieldname.' : '.$choosenvalue;
     }
 
     /**
@@ -540,7 +540,7 @@ 
         $select         = '<select size="1" name="query" style="width: 140px;">';
         $lookupcontents = Field::lookupField($this->fieldnumber);
         for ($i = 0, $iMax = count($lookupcontents); $i < $iMax; ++$i) {
-            $select .= '<option value="' . $lookupcontents[$i]['id'] . '">' . $lookupcontents[$i]['value'] . '</option>';
+            $select .= '<option value="'.$lookupcontents[$i]['id'].'">'.$lookupcontents[$i]['value'].'</option>';
         }
         $select .= '</select>';
 
@@ -561,17 +561,17 @@ 
     {
         $this->fieldnumber  = $parentObject->getId();
         $this->fieldname    = $parentObject->fieldname;
-        $this->value        = $animalObject->{'user' . $this->fieldnumber};
+        $this->value        = $animalObject->{'user'.$this->fieldnumber};
         $this->defaultvalue = $parentObject->defaultvalue;
         $this->lookuptable  = $parentObject->lookuptable;
         if ('1' == $this->lookuptable) {
-            new SystemMessage('No lookuptable may be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('No lookuptable may be specified for userfield'.$this->fieldnumber);
         }
         if ('1' == $parentObject->ViewInAdvanced) {
-            new SystemMessage('userfield' . $this->fieldnumber . ' cannot be shown in advanced info');
+            new SystemMessage('userfield'.$this->fieldnumber.' cannot be shown in advanced info');
         }
         if ('1' == $parentObject->ViewInPie) {
-            new SystemMessage('A Pie-chart cannot be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('A Pie-chart cannot be specified for userfield'.$this->fieldnumber);
         }
     }
 
@@ -580,7 +580,7 @@ 
      */
     public function editField()
     {
-        $textbox = new \XoopsFormText('<b>' . $this->fieldname . '</b>', 'user' . $this->fieldnumber, $size = 50, $maxsize = 50, $value = $this->value);
+        $textbox = new \XoopsFormText('<b>'.$this->fieldname.'</b>', 'user'.$this->fieldnumber, $size = 50, $maxsize = 50, $value = $this->value);
 
         return $textbox;
     }
@@ -592,7 +592,7 @@ 
      */
     public function newField($name = '')
     {
-        $textbox = new \XoopsFormText('<b>' . $this->fieldname . '</b>', $name . 'user' . $this->fieldnumber, $size = 50, $maxsize = 50, $value = $this->defaultvalue);
+        $textbox = new \XoopsFormText('<b>'.$this->fieldname.'</b>', $name.'user'.$this->fieldnumber, $size = 50, $maxsize = 50, $value = $this->defaultvalue);
 
         return $textbox;
     }
@@ -619,16 +619,16 @@ 
     {
         $this->fieldnumber  = $parentObject->getId();
         $this->fieldname    = $parentObject->fieldname;
-        $this->value        = $animalObject->{'user' . $this->fieldnumber};
+        $this->value        = $animalObject->{'user'.$this->fieldnumber};
         $this->defaultvalue = $parentObject->defaultvalue;
         if ('1' == $parentObject->LookupTable) {
-            new SystemMessage('No lookuptable may be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('No lookuptable may be specified for userfield'.$this->fieldnumber);
         }
         if ('1' == $parentObject->ViewInAdvanced) {
-            new SystemMessage('userfield' . $this->fieldnumber . ' cannot be shown in advanced info');
+            new SystemMessage('userfield'.$this->fieldnumber.' cannot be shown in advanced info');
         }
         if ('1' == $parentObject->ViewInPie) {
-            new SystemMessage('A Pie-chart cannot be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('A Pie-chart cannot be specified for userfield'.$this->fieldnumber);
         }
     }
 
@@ -637,7 +637,7 @@ 
      */
     public function editField()
     {
-        $textarea = new \XoopsFormTextArea('<b>' . $this->fieldname . '</b>', 'user' . $this->fieldnumber, $value = $this->value, $rows = 5, $cols = 50);
+        $textarea = new \XoopsFormTextArea('<b>'.$this->fieldname.'</b>', 'user'.$this->fieldnumber, $value = $this->value, $rows = 5, $cols = 50);
 
         return $textarea;
     }
@@ -649,7 +649,7 @@ 
      */
     public function newField($name = '')
     {
-        $textarea = new \XoopsFormTextArea('<b>' . $this->fieldname . '</b>', $name . 'user' . $this->fieldnumber, $value = $this->defaultvalue, $rows = 5, $cols = 50);
+        $textarea = new \XoopsFormTextArea('<b>'.$this->fieldname.'</b>', $name.'user'.$this->fieldnumber, $value = $this->defaultvalue, $rows = 5, $cols = 50);
 
         return $textarea;
     }
@@ -676,16 +676,16 @@ 
     {
         $this->fieldnumber  = $parentObject->getId();
         $this->fieldname    = $parentObject->fieldname;
-        $this->value        = $animalObject->{'user' . $this->fieldnumber};
+        $this->value        = $animalObject->{'user'.$this->fieldnumber};
         $this->defaultvalue = $parentObject->defaultvalue;
         if ('1' == $parentObject->lookuptable) {
-            new SystemMessage('No lookuptable may be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('No lookuptable may be specified for userfield'.$this->fieldnumber);
         }
         if ('1' == $parentObject->ViewInAdvanced) {
-            new SystemMessage('userfield' . $this->fieldnumber . ' cannot be shown in advanced info');
+            new SystemMessage('userfield'.$this->fieldnumber.' cannot be shown in advanced info');
         }
         if ('1' == $parentObject->ViewInPie) {
-            new SystemMessage('A Pie-chart cannot be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('A Pie-chart cannot be specified for userfield'.$this->fieldnumber);
         }
     }
 
@@ -695,7 +695,7 @@ 
     public function editField()
     {
         //$textarea = new \XoopsFormFile("<b>".$this->fieldname."</b>", $this->fieldname, $maxfilesize = 2000);
-        $textarea = new \XoopsFormTextDateSelect('<b>' . $this->fieldname . '</b>', 'user' . $this->fieldnumber, $size = 15, $this->value);
+        $textarea = new \XoopsFormTextDateSelect('<b>'.$this->fieldname.'</b>', 'user'.$this->fieldnumber, $size = 15, $this->value);
 
         return $textarea;
     }
@@ -707,7 +707,7 @@ 
      */
     public function newField($name = '')
     {
-        $textarea = new \XoopsFormTextDateSelect('<b>' . $this->fieldname . '</b>', $name . 'user' . $this->fieldnumber, $size = 15, $this->defaultvalue);
+        $textarea = new \XoopsFormTextDateSelect('<b>'.$this->fieldname.'</b>', $name.'user'.$this->fieldnumber, $size = 15, $this->defaultvalue);
 
         return $textarea;
     }
@@ -734,17 +734,17 @@ 
     {
         $this->fieldnumber  = $parentObject->getId();
         $this->fieldname    = $parentObject->fieldname;
-        $this->value        = $animalObject->{'user' . $this->fieldnumber};
+        $this->value        = $animalObject->{'user'.$this->fieldnumber};
         $this->defaultvalue = $parentObject->defaultvalue;
         $this->lookuptable  = $parentObject->lookuptable;
         if ('1' == $this->lookuptable) {
-            new SystemMessage('No lookuptable may be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('No lookuptable may be specified for userfield'.$this->fieldnumber);
         }
         if ('1' == $parentObject->ViewInAdvanced) {
-            new SystemMessage('userfield' . $this->fieldnumber . ' cannot be shown in advanced info');
+            new SystemMessage('userfield'.$this->fieldnumber.' cannot be shown in advanced info');
         }
         if ('1' == $parentObject->ViewInPie) {
-            new SystemMessage('A Pie-chart cannot be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('A Pie-chart cannot be specified for userfield'.$this->fieldnumber);
         }
     }
 
@@ -753,7 +753,7 @@ 
      */
     public function editField()
     {
-        $textbox = new \XoopsFormText('<b>' . $this->fieldname . '</b>', 'user' . $this->fieldnumber, $size = 50, $maxsize = 255, $value = $this->value);
+        $textbox = new \XoopsFormText('<b>'.$this->fieldname.'</b>', 'user'.$this->fieldnumber, $size = 50, $maxsize = 255, $value = $this->value);
 
         return $textbox;
     }
@@ -765,7 +765,7 @@ 
      */
     public function newField($name = '')
     {
-        $textbox = new \XoopsFormText('<b>' . $this->fieldname . '</b>', $name . 'user' . $this->fieldnumber, $size = 50, $maxsize = 255, $value = $this->defaultvalue);
+        $textbox = new \XoopsFormText('<b>'.$this->fieldname.'</b>', $name.'user'.$this->fieldnumber, $size = 50, $maxsize = 255, $value = $this->defaultvalue);
 
         return $textbox;
     }
@@ -775,7 +775,7 @@ 
      */
     public function viewField()
     {
-        $view = new \XoopsFormLabel($this->fieldname, '<a href="' . $this->value . '" target=\"_new\">' . $this->value . '</a>');
+        $view = new \XoopsFormLabel($this->fieldname, '<a href="'.$this->value.'" target=\"_new\">'.$this->value.'</a>');
 
         return $view;
     }
@@ -785,7 +785,7 @@ 
      */
     public function showField()
     {
-        return $this->fieldname . ' : <a href="' . $this->value . '" target="_new">' . $this->value . '</a>';
+        return $this->fieldname.' : <a href="'.$this->value.'" target="_new">'.$this->value.'</a>';
     }
 
     /**
@@ -793,7 +793,7 @@ 
      */
     public function showValue()
     {
-        return '<a href="' . $this->value . '" target="_new">' . $this->value . '</a>';
+        return '<a href="'.$this->value.'" target="_new">'.$this->value.'</a>';
     }
 
     /**
@@ -818,23 +818,23 @@ 
     {
         $this->fieldnumber  = $parentObject->getId();
         $this->fieldname    = $parentObject->fieldname;
-        $this->value        = $animalObject->{'user' . $this->fieldnumber};
+        $this->value        = $animalObject->{'user'.$this->fieldnumber};
         $this->defaultvalue = $parentObject->defaultvalue;
         $this->lookuptable  = $parentObject->lookuptable;
         if ('1' == $this->lookuptable) {
-            new SystemMessage('No lookuptable may be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('No lookuptable may be specified for userfield'.$this->fieldnumber);
         }
         if ('1' == $parentObject->ViewInAdvanced) {
-            new SystemMessage('userfield' . $this->fieldnumber . ' cannot be shown in advanced info');
+            new SystemMessage('userfield'.$this->fieldnumber.' cannot be shown in advanced info');
         }
         if ('1' == $parentObject->ViewInPie) {
-            new SystemMessage('A Pie-chart cannot be specified for userfield' . $this->fieldnumber);
+            new SystemMessage('A Pie-chart cannot be specified for userfield'.$this->fieldnumber);
         }
         if ('1' == $parentObject->ViewInList) {
-            new SystemMessage('userfield' . $this->fieldnumber . ' cannot be included in listview');
+            new SystemMessage('userfield'.$this->fieldnumber.' cannot be included in listview');
         }
         if ('1' == $parentObject->HasSearch) {
-            new SystemMessage('Search cannot be defined for userfield' . $this->fieldnumber);
+            new SystemMessage('Search cannot be defined for userfield'.$this->fieldnumber);
         }
     }
 
@@ -843,7 +843,7 @@ 
      */
     public function editField()
     {
-        $pictureField = new \XoopsFormFile($this->fieldname, 'user' . $this->fieldnumber, 1024000);
+        $pictureField = new \XoopsFormFile($this->fieldname, 'user'.$this->fieldnumber, 1024000);
         $pictureField->setExtra("size ='50'");
 
         return $pictureField;
@@ -856,7 +856,7 @@ 
      */
     public function newField($name = '')
     {
-        $pictureField = new \XoopsFormFile($this->fieldname, $name . 'user' . $this->fieldnumber, 1024000);
+        $pictureField = new \XoopsFormFile($this->fieldname, $name.'user'.$this->fieldnumber, 1024000);
         $pictureField->setExtra("size ='50'");
 
         return $pictureField;
@@ -867,7 +867,7 @@ 
      */
     public function viewField()
     {
-        $view = new \XoopsFormLabel($this->fieldname, '<img src="' . PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $this->value . '_400.jpeg">');
+        $view = new \XoopsFormLabel($this->fieldname, '<img src="'.PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$this->value.'_400.jpeg">');
 
         return $view;
     }
@@ -877,7 +877,7 @@ 
      */
     public function showField()
     {
-        return '<img src="' . PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $this->value . '_150.jpeg">';
+        return '<img src="'.PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$this->value.'_150.jpeg">';
     }
 
     /**
@@ -885,7 +885,7 @@ 
      */
     public function showValue()
     {
-        return '<img src="' . PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $this->value . '_400.jpeg">';
+        return '<img src="'.PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$this->value.'_400.jpeg">';
     }
 }
 

include/config.php

Spacing +13 added lines, -13 removed lines

@@ -23,25 +23,25 @@ 
     $moduleDirName      = basename(dirname(__DIR__));
     $moduleDirNameUpper = strtoupper($moduleDirName);
     return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
         'paths'          => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders'  => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images/thumbnails',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/images',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/images/thumbnails',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
         'copyBlankFiles' => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images/thumbnails'
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/images',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/images/thumbnails'
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
 
@@ -76,6 +76,6 @@ 
             '/images',
         ],
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>',
     ];
 }