mambax7 / pedigree

include/functions.php

Spacing +40 added lines, -40 removed lines

@@ -66,7 +66,7 @@ 
     $max_imgheight     = $GLOBALS['xoopsModuleConfig']['maximgheight']; //1000;
     $allowed_mimetypes = ['image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'];
     //    $img_dir = XOOPS_ROOT_PATH . "/modules/" . $GLOBALS['xoopsModule']->dirname() . "/images" ;
-    $img_dir = $GLOBALS['xoopsModuleConfig']['uploaddir'] . '/images';
+    $img_dir = $GLOBALS['xoopsModuleConfig']['uploaddir'].'/images';
     require_once $GLOBALS['xoops']->path('class/uploader.php');
     $field = $_POST['xoops_upload_file'][$num];
     if (!empty($field) || '' != $field) {
@@ -121,7 +121,7 @@ 
     */
 
     // load the image
-    require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModule']->dirname() . '/library/Zebra_Image.php');
+    require_once $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModule']->dirname().'/library/Zebra_Image.php');
     $thumbnail_widths = [150, 400];
 
     // indicate a target image
@@ -133,12 +133,12 @@ 
     // create a new instance of the class
     $image = new Zebra_Image();
     // indicate a source image (a GIF, PNG or JPEG file)
-    $image->source_path = PEDIGREE_UPLOAD_PATH . "/images/{$filename}";
+    $image->source_path = PEDIGREE_UPLOAD_PATH."/images/{$filename}";
 
     foreach ($thumbnail_widths as $thumbnail_width) {
 
         // generate & output thumbnail
-        $output_filename    = PEDIGREE_UPLOAD_PATH . '/images/thumbnails/' . basename($filename) . "_{$thumbnail_width}.{$config_output_format}";
+        $output_filename    = PEDIGREE_UPLOAD_PATH.'/images/thumbnails/'.basename($filename)."_{$thumbnail_width}.{$config_output_format}";
         $image->target_path = $output_filename;
         // since in this example we're going to have a jpeg file, let's set the output
         // image's quality
@@ -293,17 +293,17 @@ 
             $x = $columns[$i]['columnnumber'];
             if (is_array($columns[$i]['lookupval'])) {
                 foreach ($columns[$i]['lookupval'] as $key => $keyValue) {
-                    if ($keyValue['id'] == $rowResult['user' . $x]) {
+                    if ($keyValue['id'] == $rowResult['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($rowResult['user' . $x], 'http://', 7)) {
-                $value = '<a href="' . $rowResult['user' . $x] . '">' . $rowResult['user' . $x] . '</a>';
+            elseif (0 === strncmp($rowResult['user'.$x], 'http://', 7)) {
+                $value = '<a href="'.$rowResult['user'.$x].'">'.$rowResult['user'.$x].'</a>';
             } else {
-                $value = $rowResult['user' . $x];
+                $value = $rowResult['user'.$x];
             }
             $columnvalue[] = ['value' => $value];
         }
@@ -311,7 +311,7 @@ 
             'id'          => $rowResult['d_id'],
             'name'        => $name,
             'gender'      => $gender,
-            'link'        => '<a href="dog.php?id=' . $rowResult['d_id'] . '">' . $name . '</a>',
+            'link'        => '<a href="dog.php?id='.$rowResult['d_id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => $columnvalue
@@ -332,9 +332,9 @@ 
 {
     global $numofcolumns1, $nummatch1, $pages1, $columns1, $dogs1;
     if ('0' == $pa && '0' == $ma) {
-        $sqlQuery = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE father = ' . $pa . ' AND mother = ' . $ma . ' AND id != ' . $oid . " AND father != '0' AND mother !='0' ORDER BY naam";
+        $sqlQuery = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE father = '.$pa.' AND mother = '.$ma.' AND id != '.$oid." AND father != '0' AND mother !='0' ORDER BY naam";
     } else {
-        $sqlQuery = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE father = ' . $pa . ' AND mother = ' . $ma . ' AND id != ' . $oid . ' ORDER BY naam';
+        $sqlQuery = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE father = '.$pa.' AND mother = '.$ma.' AND id != '.$oid.' ORDER BY naam';
     }
     $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
     $nummatch1   = $GLOBALS['xoopsDB']->getRowsNum($queryResult);
@@ -381,17 +381,17 @@ 
             $x = $columns1[$i]['columnnumber'];
             if (is_array($columns1[$i]['lookupval'])) {
                 foreach ($columns1[$i]['lookupval'] as $key => $keyValue) {
-                    if ($keyValue['id'] == $rowResult['user' . $x]) {
+                    if ($keyValue['id'] == $rowResult['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($rowResult['user' . $x], 'http://', 7)) {
-                $value = '<a href="' . $rowResult['user' . $x] . '">' . $rowResult['user' . $x] . '</a>';
+            elseif (0 === strncmp($rowResult['user'.$x], 'http://', 7)) {
+                $value = '<a href="'.$rowResult['user'.$x].'">'.$rowResult['user'.$x].'</a>';
             } else {
-                $value = $rowResult['user' . $x];
+                $value = $rowResult['user'.$x];
             }
             $columnvalue1[] = ['value' => $value];
         }
@@ -399,7 +399,7 @@ 
             'id'          => $rowResult['id'],
             'name'        => $name,
             'gender'      => $gender,
-            'link'        => '<a href="dog.php?id=' . $rowResult['id'] . '">' . $name . '</a>',
+            'link'        => '<a href="dog.php?id='.$rowResult['id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => $columnvalue1
@@ -420,9 +420,9 @@ 
     $content = '';
 
     if (0 == $breeder) {
-        $sqlQuery = 'SELECT id, naam, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id_owner = '" . $oid . "' ORDER BY naam";
+        $sqlQuery = 'SELECT id, naam, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id_owner = '".$oid."' ORDER BY naam";
     } else {
-        $sqlQuery = 'SELECT id, naam, roft FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id_breeder = '" . $oid . "' ORDER BY naam";
+        $sqlQuery = 'SELECT id, naam, roft FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id_breeder = '".$oid."' ORDER BY naam";
     }
     $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
     while (false !== ($rowResult = $GLOBALS['xoopsDB']->fetchArray($queryResult))) {
@@ -431,8 +431,8 @@ 
         } else {
             $gender = '<img src="assets/images/female.gif">';
         }
-        $link    = '<a href="dog.php?id=' . $rowResult['id'] . '">' . stripslashes($rowResult['naam']) . '</a>';
-        $content .= $gender . ' ' . $link . '<br>';
+        $link = '<a href="dog.php?id='.$rowResult['id'].'">'.stripslashes($rowResult['naam']).'</a>';
+        $content .= $gender.' '.$link.'<br>';
     }
 
     return $content;
@@ -446,7 +446,7 @@ 
 function getName($oid)
 {
     $oid         = (int)$oid;
-    $sqlQuery    = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id = '{$oid}'";
+    $sqlQuery    = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id = '{$oid}'";
     $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
     while (false !== ($rowResult = $GLOBALS['xoopsDB']->fetchArray($queryResult))) {
         $an = stripslashes($rowResult['naam']);
@@ -461,7 +461,7 @@ 
  */
 function showParent($PA)
 {
-    $sqlQuery    = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id='" . $PA . "'";
+    $sqlQuery    = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id='".$PA."'";
     $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
     while (false !== ($rowResult = $GLOBALS['xoopsDB']->fetchArray($queryResult))) {
         $result = $rowResult['naam'];
@@ -480,7 +480,7 @@ 
  */
 function findId($naam_hond)
 {
-    $sqlQuery    = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " where naam= '$naam_hond'";
+    $sqlQuery    = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." where naam= '$naam_hond'";
     $queryResult = $GLOBALS['xoopsDB']->query($sqlQuery);
     while (false !== ($rowResult = $GLOBALS['xoopsDB']->fetchArray($queryResult))) {
         $result = $rowResult['id'];
@@ -533,19 +533,19 @@ 
         $gender = '';
         if ((!empty($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser'] instanceof \XoopsUser)
             && ($row['user'] == $GLOBALS['xoopsUser']->getVar('uid') || true === $modadmin)) {
-            $gender = "<a href='dog.php?id={$row['id']}'><img src='images/edit.png' alt='" . _EDIT . "'></a>
-                     . <a href='delete.php?id={$row['id']}'><img src='images/delete.png' alt='" . _DELETE . "'></a>";
+            $gender = "<a href='dog.php?id={$row['id']}'><img src='images/edit.png' alt='"._EDIT."'></a>
+                     . <a href='delete.php?id={$row['id']}'><img src='images/delete.png' alt='"._DELETE."'></a>";
         }
 
         $genImg = (0 == $row['roft']) ? 'male.gif' : 'female.gif';
         $gender .= "<img src='assets/images/{$genImg}'>";
 
         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['naam']) . $camera;
+        $name = stripslashes($row['naam']).$camera;
         unset($columnvalue);
 
         //fill array
@@ -554,22 +554,22 @@ 
             $lookuparray = $columns[$i]['lookuparray'];
             if (is_array($lookuparray)) {
                 foreach ($lookuparray as $index => $indexValue) {
-                    if ($lookuparray[$index]['id'] == $row['user' . $x]) {
+                    if ($lookuparray[$index]['id'] == $row['user'.$x]) {
                         //echo "<h1>".$lookuparray[$index]['id']."</h1>";
                         $value = $lookuparray[$index]['value'];
                     }
                 }
             } //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);
         }
 
-        $linkto = '<a href="' . $link . $row[$element] . '">' . $name . '</a>';
+        $linkto = '<a href="'.$link.$row[$element].'">'.$name.'</a>';
         //create array
         $dogs[] = [
             'id'          => $row['id'],
@@ -599,10 +599,10 @@ 
 function animal_block_addCatSelect($cats)
 {
     if (is_array($cats)) {
-        $cat_sql = '(' . current($cats);
+        $cat_sql = '('.current($cats);
         array_shift($cats);
         foreach ($cats as $cat) {
-            $cat_sql .= ',' . $cat;
+            $cat_sql .= ','.$cat;
         }
         $cat_sql .= ')';
     }
@@ -710,7 +710,7 @@ 
             $letter_array['letter'] = $letter;
             $letter_array['count']  = $countsByLetters[$letter];
             //            $letter_array['url']    = "" . XOOPS_URL . "/modules/" . $helper->getModule()->dirname() . "/viewcat.php?list={$letter}";
-            $letter_array['url'] = '' . XOOPS_URL . '/modules/' . $helper->getModule()->dirname() . "/result.php?f=naam&amp;l=1&amp;w={$letter}%25&amp;o=naam";
+            $letter_array['url'] = ''.XOOPS_URL.'/modules/'.$helper->getModule()->dirname()."/result.php?f=naam&amp;l=1&amp;w={$letter}%25&amp;o=naam";
         } else {
             $letter_array['letter'] = $letter;
             $letter_array['count']  = 0;
@@ -728,7 +728,7 @@ 
     $letterschoiceTpl          = new \XoopsTpl();
     $letterschoiceTpl->caching = false; // Disable cache
     $letterschoiceTpl->assign('alphabet', $alphabet_array);
-    $html = $letterschoiceTpl->fetch('db:' . $helper->getModule()->dirname() . '_common_letterschoice.tpl');
+    $html = $letterschoiceTpl->fetch('db:'.$helper->getModule()->dirname().'_common_letterschoice.tpl');
     unset($letterschoiceTpl);
 
     return $html;
@@ -774,7 +774,7 @@ 
     if (!$withLink) {
         return $pedigreeModuleName;
     } else {
-        return '<a href="' . PEDIGREE_URL . '/">{$pedigreeModuleName}</a>';
+        return '<a href="'.PEDIGREE_URL.'/">{$pedigreeModuleName}</a>';
     }
 }
 
@@ -795,7 +795,7 @@ 
     $GLOBALS['xoopsDB'] = \XoopsDatabaseFactory::getDatabaseConnection();
     $realName           = $GLOBALS['xoopsDB']->prefix($table);
 
-    $sql = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+    $sql = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
     $ret = $GLOBALS['xoopsDB']->queryF($sql);
 
     while (false !== (list($m_table) = $GLOBALS['xoopsDB']->fetchRow($ret))) {
@@ -899,10 +899,10 @@ 
     $queryString = $_SERVER['QUERY_STRING'];
 
     if ('' != $queryString) {
-        $queryString = '?' . $queryString;
+        $queryString = '?'.$queryString;
     }
 
-    $currentURL = $http . $httpHost . $phpSelf . $queryString;
+    $currentURL = $http.$httpHost.$phpSelf.$queryString;
 
     $urls                = [];
     $urls['http']        = $http;

add_dog.php

Indentation +41 added lines, -41 removed lines

@@ -152,9 +152,9 @@ 
         //gender
         $gender_radio = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft', $value = '0');
         $gender_radio->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']])
+                                        ]);
         $form->addElement($gender_radio);
         if ('1' == $moduleConfig['ownerbreeder']) {
             //breeder
@@ -295,24 +295,24 @@ 
         //insert into pedigree_temp
         //        $query = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . " VALUES ('" . $random . "','" . Pedigree\Utility::unHtmlEntities($name) . "','" . $id_owner . "','" . $id_breeder . "','" . $user . "','" . $roft . "','','','" . $foto . "', ''" . $usersql . ')';
         $query = 'INSERT INTO '
-                 . $GLOBALS['xoopsDB']->prefix('pedigree_temp')
-                 . " VALUES ('"
-                 . $GLOBALS['xoopsDB']->escape($random)
-                 . "','"
-                 . $GLOBALS['xoopsDB']->escape(Pedigree\Utility::unHtmlEntities($name))
-                 . "','"
-                 . $GLOBALS['xoopsDB']->escape($id_owner)
-                 . "','"
-                 . $GLOBALS['xoopsDB']->escape($id_breeder)
-                 . "','"
-                 . $GLOBALS['xoopsDB']->escape($user)
-                 . "','"
-                 . $GLOBALS['xoopsDB']->escape($roft)
-                 . "','0','0','"
-                 . $GLOBALS['xoopsDB']->escape($foto)
-                 . "', ''"
-                 . $usersql
-                 . ')';
+                    . $GLOBALS['xoopsDB']->prefix('pedigree_temp')
+                    . " VALUES ('"
+                    . $GLOBALS['xoopsDB']->escape($random)
+                    . "','"
+                    . $GLOBALS['xoopsDB']->escape(Pedigree\Utility::unHtmlEntities($name))
+                    . "','"
+                    . $GLOBALS['xoopsDB']->escape($id_owner)
+                    . "','"
+                    . $GLOBALS['xoopsDB']->escape($id_breeder)
+                    . "','"
+                    . $GLOBALS['xoopsDB']->escape($user)
+                    . "','"
+                    . $GLOBALS['xoopsDB']->escape($roft)
+                    . "','0','0','"
+                    . $GLOBALS['xoopsDB']->escape($foto)
+                    . "', ''"
+                    . $usersql
+                    . ')';
         //echo $query; die();
         $GLOBALS['xoopsDB']->queryF($query);
         redirect_header('add_dog.php?f=sire&random=' . $random . '&st=' . $st . '&r=1&l=a', 1, strtr(_MA_PEDIGREE_ADD_SIREPLZ, ['[father]' => $moduleConfig['father']]));
@@ -757,26 +757,26 @@ 
         //insert into pedigree
         //$query = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " VALUES ('','" . addslashes($row['naam']) . "','" . $row['id_owner'] . "','" . $row['id_breeder'] . "','" . $row['user'] . "','" . $row['roft'] . "','" . $_GET['seldam'] . "','" . $row['father'] . "','" . addslashes($row['foto']) . "',''" . $usersql . ')';
         $sql = 'INSERT INTO '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . " VALUES (0,'"
-               . $GLOBALS['xoopsDB']->escape($row['naam'])
-               . "','"
-               . $GLOBALS['xoopsDB']->escape($row['id_owner'])
-               . "','"
-               . $GLOBALS['xoopsDB']->escape($row['id_breeder'])
-               . "','"
-               . $GLOBALS['xoopsDB']->escape($row['user'])
-               . "','"
-               . $GLOBALS['xoopsDB']->escape($row['roft'])
-               . "','"
-               . $GLOBALS['xoopsDB']->escape($_GET['seldam'])
-               . "','"
-               . $GLOBALS['xoopsDB']->escape($row['father'])
-               . "','"
-               . $GLOBALS['xoopsDB']->escape($row['foto'])
-               . "',''"
-               . $usersql
-               . ')';
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . " VALUES (0,'"
+                . $GLOBALS['xoopsDB']->escape($row['naam'])
+                . "','"
+                . $GLOBALS['xoopsDB']->escape($row['id_owner'])
+                . "','"
+                . $GLOBALS['xoopsDB']->escape($row['id_breeder'])
+                . "','"
+                . $GLOBALS['xoopsDB']->escape($row['user'])
+                . "','"
+                . $GLOBALS['xoopsDB']->escape($row['roft'])
+                . "','"
+                . $GLOBALS['xoopsDB']->escape($_GET['seldam'])
+                . "','"
+                . $GLOBALS['xoopsDB']->escape($row['father'])
+                . "','"
+                . $GLOBALS['xoopsDB']->escape($row['foto'])
+                . "',''"
+                . $usersql
+                . ')';
         $GLOBALS['xoopsDB']->queryF($sql);
         //echo $query; die();
     }

Spacing +69 added lines, -69 removed lines

@@ -5,21 +5,21 @@ 
 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_adddog.tpl';
 
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 $xoopsTpl->assign('page_title', 'Pedigree database - Update details');
 
 //check for access
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 if (empty($xoopsUser)) {
-    redirect_header('index.php', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+    redirect_header('index.php', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
 }
 
 //create function variable from url
@@ -70,13 +70,13 @@ 
 
     //check for access
     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);
     }
     if (0 == $xoopsUser->getVar('uid')) {
-        redirect_header('javascript:history.go(-1)', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+        redirect_header('javascript:history.go(-1)', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
     }
     //create form
-    include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $form = new \XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, ['[animalType]' => $moduleConfig['animalType']]), 'dogname', 'add_dog.php?f=checkName', 'post', true);
     $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
     //create random value
@@ -86,7 +86,7 @@ 
     $form->addElement(new \XoopsFormHidden('user', $xoopsUser->getVar('uid')));
 
     //name
-    $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_NAME . '</b>', 'naam', $size = 50, $maxsize = 255, $value = ''));
+    $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_NAME.'</b>', 'naam', $size = 50, $maxsize = 255, $value = ''));
     $string = strtr(_MA_PEDIGREE_FLD_NAME_EX, ['[animalType]' => $moduleConfig['animalType']]);
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, $string));
 
@@ -113,12 +113,12 @@ 
     $name = Request::getString('naam', '', 'POST');
     //query
     //$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE naam LIKE'%" . $name . "%' ORDER BY naam";
-    $queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE naam LIKE'%" . $GLOBALS['xoopsDB']->escape($name) . "%' ORDER BY naam";
+    $queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE naam LIKE'%".$GLOBALS['xoopsDB']->escape($name)."%' ORDER BY naam";
     $result      = $GLOBALS['xoopsDB']->query($queryString);
     $numResults  = $GLOBALS['xoopsDB']->getRowsNum($result);
     if ($numResults >= 1 && !isset($_GET['r'])) {
         //create form
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new \XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, ['[animalType]' => $moduleConfig['animalType']]), 'dogname', 'add_dog.php?f=checkName&r=1', 'post', true);
         //other elements
         $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
@@ -126,7 +126,7 @@ 
         $form->addElement(new \XoopsFormHidden('user', $xoopsUser->getVar('uid')));
         while (false !== ($row = $GLOBALS['xoopsDB']->fetchBoth($result))) {
             //name
-            $form->addElement(new \XoopsFormLabel('<b>' . _MA_PEDIGREE_FLD_NAME . '</b>', '<a href="dog.php?id=' . $row['id'] . '">' . stripslashes($row['naam']) . '</a>'));
+            $form->addElement(new \XoopsFormLabel('<b>'._MA_PEDIGREE_FLD_NAME.'</b>', '<a href="dog.php?id='.$row['id'].'">'.stripslashes($row['naam']).'</a>'));
         }
         $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_ADD_KNOWN, ['[animalTypes]' => $moduleConfig['animalTypes']])));
         //submit button
@@ -135,7 +135,7 @@ 
         $xoopsTpl->assign('form', $form->render());
     } else {
         //create form
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new \XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, ['[animalType]' => $moduleConfig['animalType']]), 'dogname', 'add_dog.php?f=sire', 'post', true);
         //added to handle upload
         $form->setExtra("enctype='multipart/form-data'");
@@ -148,9 +148,9 @@ 
         $form->addElement(new \XoopsFormHidden('user', $_POST['user']));
 
         //name
-        $form->addElement(new \XoopsFormLabel('<b>' . _MA_PEDIGREE_FLD_NAME . '</b>', stripslashes($_POST['naam'])));
+        $form->addElement(new \XoopsFormLabel('<b>'._MA_PEDIGREE_FLD_NAME.'</b>', stripslashes($_POST['naam'])));
         //gender
-        $gender_radio = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft', $value = '0');
+        $gender_radio = new \XoopsFormRadio('<b>'._MA_PEDIGREE_FLD_GEND.'</b>', 'roft', $value = '0');
         $gender_radio->addOptionArray([
                                           '0' => strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]),
                                           '1' => strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']])
@@ -158,23 +158,23 @@ 
         $form->addElement($gender_radio);
         if ('1' == $moduleConfig['ownerbreeder']) {
             //breeder
-            $breeder_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_BREE . '</b>', $name = 'id_breeder', $value = '0', $size = 1, $multiple = false);
-            $queryfok       = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY lastname';
+            $breeder_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_BREE.'</b>', $name = 'id_breeder', $value = '0', $size = 1, $multiple = false);
+            $queryfok       = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY lastname';
             $resfok         = $GLOBALS['xoopsDB']->query($queryfok);
             $breeder_select->addOption('0', $name = _MA_PEDIGREE_UNKNOWN);
             while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-                $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'] . ', ' . $rowfok['firstname']);
+                $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'].', '.$rowfok['firstname']);
             }
             $form->addElement($breeder_select);
             $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_FLD_BREE_EX, ['[animalType]' => $moduleConfig['animalType']])));
 
             //owner
-            $owner_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_OWNE . '</b>', $name = 'id_owner', $value = '0', $size = 1, $multiple = false);
-            $queryfok     = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY lastname';
+            $owner_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_OWNE.'</b>', $name = 'id_owner', $value = '0', $size = 1, $multiple = false);
+            $queryfok     = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY lastname';
             $resfok       = $GLOBALS['xoopsDB']->query($queryfok);
             $owner_select->addOption('0', $name = _MA_PEDIGREE_UNKNOWN);
             while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-                $owner_select->addOption($rowfok['id'], $name = $rowfok['lastname'] . ', ' . $rowfok['firstname']);
+                $owner_select->addOption($rowfok['id'], $name = $rowfok['lastname'].', '.$rowfok['firstname']);
             }
             $form->addElement($owner_select);
             $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_FLD_OWNE_EX, ['[animalType]' => $moduleConfig['animalType']])));
@@ -223,7 +223,7 @@ 
 
     //check for access
     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);
     }
     $user = isset($_POST['user']) ? $_POST['user'] : null;
     if (empty($random)) {
@@ -273,18 +273,18 @@ 
             $fieldObject = new $fieldType($userField, $animal);
             if ($userField->isActive()) {
                 //check if _FILES variable exists for user picturefield
-                $currentfield = 'user' . $iValue;
+                $currentfield = 'user'.$iValue;
                 $pictureField = $_FILES[$currentfield]['name'];
                 if ('Picture' === $fieldType && (!empty($pictureField) || '' != $pictureField)) {
                     $userpicture = Pedigree\Utility::uploadPicture($numPictureField);
-                    $usersql .= ",'" . $userpicture . "'";
+                    $usersql .= ",'".$userpicture."'";
                     ++$numPictureField;
                 } elseif ($userField->isLocked()) {
                     //userfield is locked, substitute default value
-                    $usersql .= ",'" . $userField->defaultvalue . "'";
+                    $usersql .= ",'".$userField->defaultvalue."'";
                 } else {
                     //echo $fieldType.":".$i.":".$fields[$i]."<br>";
-                    $usersql .= ",'" . Pedigree\Utility::unHtmlEntities($_POST['user' . $iValue]) . "'";
+                    $usersql .= ",'".Pedigree\Utility::unHtmlEntities($_POST['user'.$iValue])."'";
                 }
             } else {
                 $usersql .= ",''";
@@ -315,7 +315,7 @@ 
                  . ')';
         //echo $query; die();
         $GLOBALS['xoopsDB']->queryF($query);
-        redirect_header('add_dog.php?f=sire&random=' . $random . '&st=' . $st . '&r=1&l=a', 1, strtr(_MA_PEDIGREE_ADD_SIREPLZ, ['[father]' => $moduleConfig['father']]));
+        redirect_header('add_dog.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::getString('l', 'A', 'GET');
@@ -329,7 +329,7 @@ 
     //create list of males dog to select from
     $perPage = $moduleConfig['perpage'];
     //count total number of dogs
-    $numDog = 'SELECT count(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft='0' AND naam LIKE '" . $l . "%'";
+    $numDog = 'SELECT count(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
     list($numResults) = $GLOBALS['xoopsDB']->fetchRow($numRes);
@@ -344,20 +344,20 @@ 
     $pages = '';
     for ($i = 65; $i <= 90; ++$i) {
         if ($l == chr($i)) {
-            $pages .= '<b><a href="add_dog.php?f=sire&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a></b>&nbsp;';
+            $pages .= '<b><a href="add_dog.php?f=sire&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a></b>&nbsp;';
         } else {
-            $pages .= '<a href="add_dog.php?f=sire&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a>&nbsp;';
+            $pages .= '<a href="add_dog.php?f=sire&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a>&nbsp;';
         }
     }
     $pages .= '-&nbsp;';
-    $pages .= '<a href="add_dog.php?f=sire&r=1&random=' . $random . '&l=Ã…">Ã…</a>&nbsp;';
-    $pages .= '<a href="add_dog.php?f=sire&r=1&random=' . $random . '&l=Ö">Ö</a>&nbsp;';
+    $pages .= '<a href="add_dog.php?f=sire&r=1&random='.$random.'&l=Ã…">Ã…</a>&nbsp;';
+    $pages .= '<a href="add_dog.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_dog.php?f=sire&r=1&l=' . $l . '&random=' . $random . '&st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="add_dog.php?f=sire&r=1&l='.$l.'&random='.$random.'&st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp';
         }
     }
     //create numbers
@@ -367,20 +367,20 @@ 
             $pages .= '<br>';
         }
         if ($x != $currentPage) {
-            $pages .= '<a href="add_dog.php?f=sire&r=1&l=' . $l . '&random=' . $random . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="add_dog.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_dog.php?f=sire&r=1&l=' . $l . '&random=' . $random . '&st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="add_dog.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();
@@ -417,7 +417,7 @@ 
         'id'          => '0',
         'name'        => '',
         'gender'      => '',
-        'link'        => '<a href="add_dog.php?f=dam&random=' . $random . '&selsire=0">' . strtr(_MA_PEDIGREE_ADD_SIREUNKNOWN, ['[father]' => $moduleConfig['father']]) . '</a>',
+        'link'        => '<a href="add_dog.php?f=dam&random='.$random.'&selsire=0">'.strtr(_MA_PEDIGREE_ADD_SIREUNKNOWN, ['[father]' => $moduleConfig['father']]).'</a>',
         'colour'      => '',
         'number'      => '',
         'usercolumns' => $empty
@@ -430,7 +430,7 @@ 
         } else {
             $camera = '';
         }
-        $name = stripslashes($row['naam']) . $camera;
+        $name = stripslashes($row['naam']).$camera;
         //empty array
         unset($columnvalue);
         //fill array
@@ -438,17 +438,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];
         }
@@ -456,7 +456,7 @@ 
             'id'          => $row['id'],
             'name'        => $name,
             'gender'      => '<img src="assets/images/male.gif">',
-            'link'        => '<a href="add_dog.php?f=dam&random=' . $random . '&selsire=' . $row['id'] . '">' . $name . '</a>',
+            'link'        => '<a href="add_dog.php?f=dam&random='.$random.'&selsire='.$row['id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => $columnvalue
@@ -513,7 +513,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);
     }
     //    if (empty($random)) {
     //$random = isset($_POST['random']) ? $_POST['random'] : null;
@@ -541,16 +541,16 @@ 
         //insert into pedigree_temp
         //        $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . ' SET father =' . $_GET['selsire'] . ' WHERE id=' . $random;
         //        $GLOBALS['xoopsDB']->queryF($query);
-        $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_dog.php?f=dam&random=' . $random . '&st=' . $st . '&r=1&l=a', 1, strtr(_MA_PEDIGREE_ADD_SIREOK, ['[mother]' => $moduleConfig['mother']]));
+        redirect_header('add_dog.php?f=dam&random='.$random.'&st='.$st.'&r=1&l=a', 1, strtr(_MA_PEDIGREE_ADD_SIREOK, ['[mother]' => $moduleConfig['mother']]));
     }
 
     $xoopsTpl->assign('sire', '1');
     //create list of males dog to select from
     $perPage = $moduleConfig['perpage'];
     //count total number of dogs
-    $numDog = 'SELECT count(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft='1' AND naam LIKE '" . $l . "%'";
+    $numDog = 'SELECT count(id) FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE roft='1' AND naam LIKE '".$l."%'";
     $numRes = $GLOBALS['xoopsDB']->query($numDog);
     list($numResults) = $GLOBALS['xoopsDB']->fetchRow($numRes);
     $numPages = floor($numResults / $perPage) + 1;
@@ -562,19 +562,19 @@ 
     $pages = '';
     for ($i = 65; $i <= 90; ++$i) {
         if ($l == chr($i)) {
-            $pages .= '<b><a href="add_dog.php?f=dam&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a></b>&nbsp;';
+            $pages .= '<b><a href="add_dog.php?f=dam&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a></b>&nbsp;';
         } else {
-            $pages .= '<a href="add_dog.php?f=dam&r=1&random=' . $random . '&l=' . chr($i) . '">' . chr($i) . '</a>&nbsp;';
+            $pages .= '<a href="add_dog.php?f=dam&r=1&random='.$random.'&l='.chr($i).'">'.chr($i).'</a>&nbsp;';
         }
     }
     $pages .= '-&nbsp;';
-    $pages .= '<a href="add_dog.php?f=dam&r=1&random=' . $random . '&l=Ã…">Ã…</a>&nbsp;';
-    $pages .= '<a href="add_dog.php?f=dam&r=1&random=' . $random . '&l=Ö">Ö</a>&nbsp;';
+    $pages .= '<a href="add_dog.php?f=dam&r=1&random='.$random.'&l=Ã…">Ã…</a>&nbsp;';
+    $pages .= '<a href="add_dog.php?f=dam&r=1&random='.$random.'&l=Ö">Ö</a>&nbsp;';
     $pages .= '<br>';
     //create previous button
     if ($numPages > 1) {
         if ($currentPage > 1) {
-            $pages .= '<a href="add_dog.php?f=dam&r=1&l=' . $l . '&random=' . $random . '&st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp';
+            $pages .= '<a href="add_dog.php?f=dam&r=1&l='.$l.'&random='.$random.'&st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp';
         }
     }
     //create numbers
@@ -584,20 +584,20 @@ 
             $pages .= '<br>';
         }
         if ($x != $currentPage) {
-            $pages .= '<a href="add_dog.php?f=dam&r=1&l=' . $l . '&random=' . $random . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="add_dog.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_dog.php?f=dam&l=' . $l . '&r=1&random=' . $random . '&st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="add_dog.php?f=dam&l='.$l.'&r=1&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();
@@ -634,7 +634,7 @@ 
         'id'          => '0',
         'name'        => '',
         'gender'      => '',
-        'link'        => '<a href="add_dog.php?f=check&random=' . $random . '&seldam=0">' . strtr(_MA_PEDIGREE_ADD_DAMUNKNOWN, ['[mother]' => $moduleConfig['mother']]) . '</a>',
+        'link'        => '<a href="add_dog.php?f=check&random='.$random.'&seldam=0">'.strtr(_MA_PEDIGREE_ADD_DAMUNKNOWN, ['[mother]' => $moduleConfig['mother']]).'</a>',
         'colour'      => '',
         'number'      => '',
         'usercolumns' => $empty
@@ -647,7 +647,7 @@ 
         } else {
             $camera = '';
         }
-        $name = stripslashes($row['naam']) . $camera;
+        $name = stripslashes($row['naam']).$camera;
         //empty array
         unset($columnvalue);
         //fill array
@@ -655,17 +655,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];
         }
@@ -673,7 +673,7 @@ 
             'id'          => $row['id'],
             'name'        => $name,
             'gender'      => '<img src="assets/images/female.gif">',
-            'link'        => '<a href="add_dog.php?f=check&random=' . $random . '&seldam=' . $row['id'] . '">' . $name . '</a>',
+            'link'        => '<a href="add_dog.php?f=check&random='.$random.'&seldam='.$row['id'].'">'.$name.'</a>',
             'colour'      => '',
             'number'      => '',
             'usercolumns' => $columnvalue
@@ -724,7 +724,7 @@ 
     //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);
     }
     if (empty($random)) {
         $random = $_POST['random'];
@@ -734,7 +734,7 @@ 
     }
 
     //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);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         //create animal object
@@ -748,9 +748,9 @@ 
             $fieldType   = $userField->getSetting('FieldType');
             $fieldObject = new $fieldType($userField, $animal);
             if ($userField->isActive()) {
-                $usersql .= ",'" . addslashes($row['user' . $iValue]) . "'";
+                $usersql .= ",'".addslashes($row['user'.$iValue])."'";
             } else {
-                $usersql .= ",'" . $fieldObject->defaultvalue . "'";
+                $usersql .= ",'".$fieldObject->defaultvalue."'";
             }
             //echo $fields[$i]."<br>";
         }
@@ -780,10 +780,10 @@ 
         $GLOBALS['xoopsDB']->queryF($sql);
         //echo $query; die();
     }
-    $sqlQuery = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . " WHERE id='" . $random . "'";
+    $sqlQuery = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_temp')." WHERE id='".$random."'";
     $GLOBALS['xoopsDB']->queryF($sqlQuery);
     redirect_header('latest.php', 1, strtr(_MA_PEDIGREE_ADD_OK, ['[animalType]' => $moduleConfig['animalType']]));
 }
 
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

language/english/common.php

Spacing +40 added lines, -40 removed lines

@@ -21,59 +21,59 @@
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
 
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
 
 
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
 
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');
 
 //Sample Data
-define('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA', 'Add Sample Data (will delete ALL current data)');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA', 'Export Tables to YAML');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
+define('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA', 'Add Sample Data (will delete ALL current data)');
+define('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
+define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA', 'Export Tables to YAML');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
 

result.php

Indentation +5 added lines, -5 removed lines

@@ -251,11 +251,11 @@
 //add data to smarty template
 //assign dog
 $GLOBALS['xoopsTpl']->assign([
-                                 'dogs'         => $animals,
-                                 'columns'      => $columns,
-                                 'numofcolumns' => $numofcolumns,
-                                 'tsarray'      => Pedigree\Utility::sortTable($numofcolumns)
-                             ]);
+                                    'dogs'         => $animals,
+                                    'columns'      => $columns,
+                                    'numofcolumns' => $numofcolumns,
+                                    'tsarray'      => Pedigree\Utility::sortTable($numofcolumns)
+                                ]);
 //assign links
 
 //find last shown number

Spacing +16 added lines, -16 removed lines

@@ -5,13 +5,13 @@ 
 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_result.tpl';
 include $GLOBALS['xoops']->path('/header.php');
@@ -43,7 +43,7 @@ 
 }
 
 if (!isset($_GET['w'])) {
-    $w = '%' . $q . '%';
+    $w = '%'.$q.'%';
 }
 
 if (isset($_GET['p'])) {
@@ -98,7 +98,7 @@ 
 }
 
 //count total number of dogs
-$numDog = 'SELECT COUNT(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE ' . $f . ' ' . $l . " '" . $w . "'";
+$numDog = 'SELECT COUNT(id) FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE '.$f.' '.$l." '".$w."'";
 $numRes = $GLOBALS['xoopsDB']->query($numDog);
 //total number of dogs the query will find
 list($numResults) = $GLOBALS['xoopsDB']->fetchRow($numRes);
@@ -120,10 +120,10 @@ 
 
 $length = strlen($w);
 if ('%' === substr($w, $length - 1, $length)) {
-    $whe = substr($w, 0, $length - 1) . '%25';
+    $whe = substr($w, 0, $length - 1).'%25';
     if (0 === strncmp($whe, '%', 1)) {
         $length = strlen($whe);
-        $whe    = '%25' . substr($whe, 1, $length);
+        $whe    = '%25'.substr($whe, 1, $length);
     }
 } else {
     $whe = $w;
@@ -132,7 +132,7 @@ 
 //create previous button
 if ($numPages > 1) {
     if ($currentPage > 1) {
-        $pages .= '<a href="result.php?f=' . $f . '&amp;l=' . $l . '&amp;w=' . $whe . '&amp;o=' . $o . '&amp;d=' . $d . '&amp;st=' . ($st - $perPage) . '">' . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp;';
+        $pages .= '<a href="result.php?f='.$f.'&amp;l='.$l.'&amp;w='.$whe.'&amp;o='.$o.'&amp;d='.$d.'&amp;st='.($st - $perPage).'">'._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp;';
 }
 
 //create numbers
@@ -142,21 +142,21 @@ 
             $pages .= '<br>';
     }
         if ($x != $currentPage) {
-            $pages .= '<a href="result.php?f=' . $f . '&l=' . $l . '&w=' . $whe . '&o=' . $o . '&d=' . $d . '&st=' . ($perPage * ($x - 1)) . '">' . $x . '</a>&nbsp;&nbsp;';
+            $pages .= '<a href="result.php?f='.$f.'&l='.$l.'&w='.$whe.'&o='.$o.'&d='.$d.'&st='.($perPage * ($x - 1)).'">'.$x.'</a>&nbsp;&nbsp;';
     } else {
-        $pages .= '<b>' . $x . '</b>&nbsp;&nbsp';
+        $pages .= '<b>'.$x.'</b>&nbsp;&nbsp';
     }
 }
 }
 //create next button
 if ($numPages > 1) {
     if ($currentPage < $numPages) {
-        $pages .= '<a href="result.php?f=' . $f . '&amp;l=' . $l . '&amp;w=' . $whe . '&amp;o=' . $o . '&amp;d=' . $d . '&amp;st=' . ($st + $perPage) . '">' . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp';
+        $pages .= '<a href="result.php?f='.$f.'&amp;l='.$l.'&amp;w='.$whe.'&amp;o='.$o.'&amp;d='.$d.'&amp;st='.($st + $perPage).'">'._MA_PEDIGREE_NEXT.'</a>&nbsp;&nbsp';
     }
 }
 
 //query
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE ' . $f . ' ' . $l . " '" . $w . "' ORDER BY " . $o . ' ' . $d . ' LIMIT ' . $st . ', ' . $perPage;
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE '.$f.' '.$l." '".$w."' ORDER BY ".$o.' '.$d.' LIMIT '.$st.', '.$perPage;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 $animal = new Pedigree\Animal();
@@ -194,8 +194,8 @@ 
     $gender = '';
     if ((!empty($GLOBALS['xoopsUser']) && ($GLOBALS['xoopsUser'] instanceof \XoopsUser))
         && (($row['user'] == $xoopsUser->getVar('uid')) || (true === $modadmin))) {
-        $gender = "<a href='dog.php?id={$row['id']}'><img src=" . $pathIcon16 . '/edit.png alt=' . _EDIT . "'></a>
-              <a href='delete.php?id={$row['id']}'><img src=" . $pathIcon16 . '/delete.png alt=' . _DELETE . "'></a>";
+        $gender = "<a href='dog.php?id={$row['id']}'><img src=".$pathIcon16.'/edit.png alt='._EDIT."'></a>
+              <a href='delete.php?id={$row['id']}'><img src=".$pathIcon16.'/delete.png alt='._DELETE."'></a>";
     }
     if (0 == $row['roft']) {
         $gender .= "<img src='assets/images/male.gif'>";
@@ -210,12 +210,12 @@ 
         $camera = '';
     }
 
-    $name = stripslashes($row['naam']) . $camera;
+    $name = stripslashes($row['naam']).$camera;
     //empty array
     unset($columnvalue);
     //fill array
     for ($i = 1; $i < $numofcolumns; ++$i) {
-        $x = 'user' . $columns[$i]['columnnumber'];
+        $x = 'user'.$columns[$i]['columnnumber'];
         //echo $x."columnnumber";
         if (is_array($columns[$i]['lookupval'])) {
             foreach ($columns[$i]['lookupval'] as $key => $keyValue) {
@@ -266,7 +266,7 @@ 
 }
 //create string
 $matches     = strtr(_MA_PEDIGREE_MATCHES, ['[animalTypes]' => $moduleConfig['animalTypes']]);
-$nummatchstr = "{$numResults}{$matches}" . ($st + 1) . " - {$lastshown} ({$numPages} pages)";
+$nummatchstr = "{$numResults}{$matches}".($st + 1)." - {$lastshown} ({$numPages} pages)";
 $GLOBALS['xoopsTpl']->assign('nummatch', $nummatchstr);
 $GLOBALS['xoopsTpl']->assign('pages', $pages);
 

edit.php

Indentation +3 added lines, -3 removed lines

@@ -102,9 +102,9 @@
         $roft         = $row['roft'];
         $gender_radio = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft', $value = $roft);
         $gender_radio->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']])
+                                        ]);
         $form->addElement($gender_radio);
         //father
         $sql       = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id='" . $row['father'] . "'";

Spacing +30 added lines, -30 removed lines

@@ -5,19 +5,19 @@ 
 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);
 
 //needed for generation of pie charts
 ob_start();
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/include/class_eq_pie.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/class_eq_pie.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_edit.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';
 
 global $xoopsTpl, $xoopsDB;
 
@@ -45,21 +45,21 @@ 
     foreach ($fields as $i => $iValue) {
         $userField = new Pedigree\Field($fields[$i], $animal->getConfig());
         if ($userField->isActive()) {
-            $currentfield = 'user' . $iValue;
+            $currentfield = 'user'.$iValue;
             $pictureField = $_FILES[$currentfield]['name'];
             if (empty($pictureField) || '' == $pictureField) {
-                $newvalue = $_POST['user' . $iValue];
+                $newvalue = $_POST['user'.$iValue];
             } else {
                 $newvalue = Pedigree\Utility::uploadPicture(0);
             }
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' SET user' . $iValue . "='" . $GLOBALS['xoopsDB']->escape($newvalue) . "' WHERE id='" . $a . "'";
+            $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' SET user'.$iValue."='".$GLOBALS['xoopsDB']->escape($newvalue)."' WHERE id='".$a."'";
             $GLOBALS['xoopsDB']->query($sql);
         }
     }
     //    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET naam = '" . $_POST['naam'] . "', roft = '" . $_POST['roft'] . "' WHERE id='" . $a . "'";
     $NAAM = Request::getString('naam', '', 'post');
     $roft = Request::getString('roft', '', 'post');
-    $sql  = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET naam = '" . $GLOBALS['xoopsDB']->escape($NAAM) . "', roft = '" . $GLOBALS['xoopsDB']->escape($roft) . "' WHERE id='" . $a . "'";
+    $sql  = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." SET naam = '".$GLOBALS['xoopsDB']->escape($NAAM)."', roft = '".$GLOBALS['xoopsDB']->escape($roft)."' WHERE id='".$a."'";
     $GLOBALS['xoopsDB']->query($sql);
     $pictureField = $_FILES['photo']['name'];
     if (empty($pictureField) || '' == $pictureField) {
@@ -67,15 +67,15 @@ 
     } else {
         $foto = Pedigree\Utility::uploadPicture(0);
         //      $sql  = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET foto='" . $foto . "' WHERE id='" . $a . "'";
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET foto='" . $GLOBALS['xoopsDB']->escape($foto) . "' WHERE id='" . $a . "'";
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." SET foto='".$GLOBALS['xoopsDB']->escape($foto)."' WHERE id='".$a."'";
     }
     $GLOBALS['xoopsDB']->query($sql);
     if ('1' == $moduleConfig['ownerbreeder']) {
         //      $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET id_owner = '" . $_POST['id_owner'] . "', id_breeder = '" . $_POST['id_breeder'] . "' WHERE id='" . $a . "'";
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET id_owner = '" . Request::getInt('id_owner', 0, 'post') . "', id_breeder = '" . Request::getInt('id_breeder', 0, 'post') . "' WHERE id='" . $a . "'";
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." SET id_owner = '".Request::getInt('id_owner', 0, 'post')."', id_breeder = '".Request::getInt('id_breeder', 0, 'post')."' WHERE id='".$a."'";
         $GLOBALS['xoopsDB']->query($sql);
     }
-    redirect_header('dog.php?id=' . $a, 2, 'Your changes have been saved');
+    redirect_header('dog.php?id='.$a, 2, 'Your changes have been saved');
 }
 
 /**
@@ -87,70 +87,70 @@ 
     if (isset($_GET['id'])) {
         $id = $_GET['id'];
     }
-    include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-    $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $id;
+    $sql    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$id;
     $result = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $form = new \XoopsThemeForm('Edit ' . $row['naam'], 'dogname', 'edit.php?f=save', 'post', true);
+        $form = new \XoopsThemeForm('Edit '.$row['naam'], 'dogname', 'edit.php?f=save', 'post', true);
         $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
         $form->addElement(new \XoopsFormHidden('id', $id));
         //name
         $naam = htmlentities(stripslashes($row['naam']), ENT_QUOTES);
-        $form->addElement(new \XoopsFormText('<b>' . _MA_PEDIGREE_FLD_NAME . '</b>', 'naam', $size = 50, $maxsize = 255, $value = $naam));
+        $form->addElement(new \XoopsFormText('<b>'._MA_PEDIGREE_FLD_NAME.'</b>', 'naam', $size = 50, $maxsize = 255, $value = $naam));
         //gender
         $roft         = $row['roft'];
-        $gender_radio = new \XoopsFormRadio('<b>' . _MA_PEDIGREE_FLD_GEND . '</b>', 'roft', $value = $roft);
+        $gender_radio = new \XoopsFormRadio('<b>'._MA_PEDIGREE_FLD_GEND.'</b>', 'roft', $value = $roft);
         $gender_radio->addOptionArray([
                                           '0' => strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]),
                                           '1' => strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']])
                                       ]);
         $form->addElement($gender_radio);
         //father
-        $sql       = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id='" . $row['father'] . "'";
+        $sql       = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id='".$row['father']."'";
         $resfather = $GLOBALS['xoopsDB']->query($sql);
         $numfields = $GLOBALS['xoopsDB']->getRowsNum($resfather);
         if ('0' == !$numfields) {
             while (false !== ($rowfetch = $GLOBALS['xoopsDB']->fetchArray($resfather))) {
-                $form->addElement(new \XoopsFormLabel('<b>' . strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]) . '</b>', '<img src="assets/images/male.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=0&letter=a">' . $rowfetch['naam'] . '</a>'));
+                $form->addElement(new \XoopsFormLabel('<b>'.strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]).'</b>', '<img src="assets/images/male.gif"><a href="seldog.php?curval='.$row['id'].'&gend=0&letter=a">'.$rowfetch['naam'].'</a>'));
             }
         } else {
-            $form->addElement(new \XoopsFormLabel('<b>' . strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]) . '</b>', '<img src="assets/images/male.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=0&letter=a">Unknown</a>'));
+            $form->addElement(new \XoopsFormLabel('<b>'.strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]).'</b>', '<img src="assets/images/male.gif"><a href="seldog.php?curval='.$row['id'].'&gend=0&letter=a">Unknown</a>'));
         }
         //mother
-        $sql       = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE id='" . $row['mother'] . "'";
+        $sql       = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE id='".$row['mother']."'";
         $resmother = $GLOBALS['xoopsDB']->query($sql);
         $numfields = $GLOBALS['xoopsDB']->getRowsNum($resmother);
         if ('0' == !$numfields) {
             while (false !== ($rowfetch = $GLOBALS['xoopsDB']->fetchArray($resmother))) {
-                $form->addElement(new \XoopsFormLabel('<b>' . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]) . '</b>', '<img src="assets/images/female.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=1&letter=a">' . $rowfetch['naam'] . '</a>'));
+                $form->addElement(new \XoopsFormLabel('<b>'.strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]).'</b>', '<img src="assets/images/female.gif"><a href="seldog.php?curval='.$row['id'].'&gend=1&letter=a">'.$rowfetch['naam'].'</a>'));
             }
         } else {
-            $form->addElement(new \XoopsFormLabel('<b>' . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]) . '</b>', '<img src="assets/images/female.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=1&letter=a">Unknown</a>'));
+            $form->addElement(new \XoopsFormLabel('<b>'.strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]).'</b>', '<img src="assets/images/female.gif"><a href="seldog.php?curval='.$row['id'].'&gend=1&letter=a">Unknown</a>'));
         }
         //owner/breeder
         if ('1' == $moduleConfig['ownerbreeder']) {
-            $owner_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_OWNE . '</b>', $name = 'id_owner', $value = $row['id_owner'], $size = 1, $multiple = false);
-            $queryeig     = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY "lastname"';
+            $owner_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_OWNE.'</b>', $name = 'id_owner', $value = $row['id_owner'], $size = 1, $multiple = false);
+            $queryeig     = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY "lastname"';
             $reseig       = $GLOBALS['xoopsDB']->query($queryeig);
             $owner_select->addOption(0, $name = _MA_PEDIGREE_UNKNOWN);
             while (false !== ($roweig = $GLOBALS['xoopsDB']->fetchArray($reseig))) {
-                $owner_select->addOption($roweig['id'], $name = $roweig['lastname'] . ', ' . $roweig['firstname']);
+                $owner_select->addOption($roweig['id'], $name = $roweig['lastname'].', '.$roweig['firstname']);
             }
             $form->addElement($owner_select);
             //breeder
-            $breeder_select = new \XoopsFormSelect('<b>' . _MA_PEDIGREE_FLD_BREE . '</b>', $name = 'id_breeder', $value = $row['id_breeder'], $size = 1, $multiple = false);
-            $queryfok       = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' ORDER BY "lastname"';
+            $breeder_select = new \XoopsFormSelect('<b>'._MA_PEDIGREE_FLD_BREE.'</b>', $name = 'id_breeder', $value = $row['id_breeder'], $size = 1, $multiple = false);
+            $queryfok       = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' ORDER BY "lastname"';
             $resfok         = $GLOBALS['xoopsDB']->query($queryfok);
             $breeder_select->addOption(0, $name = _MA_PEDIGREE_UNKNOWN);
             while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-                $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'] . ', ' . $rowfok['firstname']);
+                $breeder_select->addOption($rowfok['id'], $name = $rowfok['lastname'].', '.$rowfok['firstname']);
             }
             $form->addElement($breeder_select);
         }
         //picture
         if ('' != $row['foto']) {
-            $picture = '<img src=' . PEDIGREE_UPLOAD_URL . '/images/thumbnails/' . $row['foto'] . '_400.jpeg>';
+            $picture = '<img src='.PEDIGREE_UPLOAD_URL.'/images/thumbnails/'.$row['foto'].'_400.jpeg>';
             $form->addElement(new \XoopsFormLabel('<b>Picture</b>', $picture));
         } else {
             $picture = '';
@@ -179,4 +179,4 @@ 
 }
 
 //comments and footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

seldog.php

Indentation +9 added lines, -9 removed lines

@@ -202,11 +202,11 @@ 
 //add data to smarty template
 //assign dog
 $GLOBALS['xoopsTpl']->assign([
-                                 'dogs'         => $dogs,
-                                 'columns'      => $columns,
-                                 'numofcolumns' => $numofcolumns,
-                                 'tsarray'      => Pedigree\Utility::sortTable($numofcolumns)
-                             ]);
+                                    'dogs'         => $dogs,
+                                    'columns'      => $columns,
+                                    'numofcolumns' => $numofcolumns,
+                                    'tsarray'      => Pedigree\Utility::sortTable($numofcolumns)
+                                ]);
 //add data to smarty template
 if (0 == $gend) {
     $selTtlParent = strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]);
@@ -225,10 +225,10 @@ 
 $matches     = strtr(_MA_PEDIGREE_MATCHES, ['[animalTypes]' => $moduleConfig['animalTypes']]);
 $nummatchstr = "{$numResults}{$matches}" . ($st + 1) . " - {$lastshown} ({$numPages} pages)";
 $GLOBALS['xoopsTpl']->assign([
-                                 'nummatch' => $nummatchstr,
-                                 'pages'    => $pages,
-                                 'curval'   => $curval
-                             ]);
+                                    'nummatch' => $nummatchstr,
+                                    'pages'    => $pages,
+                                    'curval'   => $curval
+                                ]);
 
 //mb ========= MOTHER LETTERS===============================
 $myObject = Pedigree\Helper::getInstance();

Spacing +16 added lines, -16 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';
 
 /*
 // Get all HTTP post or get parameters into global variables that are prefixed with "param_"
@@ -43,7 +43,7 @@ 
 $GLOBALS['xoopsTpl']->assign('page_title', _MI_PEDIGREE_TITLE);
 
 //count total number of dogs
-$numDog = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE naam LIKE '{$letter}%' AND roft = '{$gend}'";
+$numDog = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE naam LIKE '{$letter}%' AND roft = '{$gend}'";
 $numRes = $GLOBALS['xoopsDB']->query($numDog);
 //total number of dogs the query will find
 $numResults = $GLOBALS['xoopsDB']->getRowsNum($numRes);
@@ -59,9 +59,9 @@ 
 $pages = '';
 for ($i = 65; $i <= 90; ++$i) {
     if ($letter == chr($i)) {
-        $pages .= "<b><a href='seldog.php?gend={$gend}&curval={$curval}&letter=" . chr($i) . "'>" . chr($i) . '</a></b>&nbsp;';
+        $pages .= "<b><a href='seldog.php?gend={$gend}&curval={$curval}&letter=".chr($i)."'>".chr($i).'</a></b>&nbsp;';
     } else {
-        $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter=" . chr($i) . "'>" . chr($i) . '</a>&nbsp;';
+        $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter=".chr($i)."'>".chr($i).'</a>&nbsp;';
     }
 }
 $pages .= '-&nbsp;';
@@ -71,7 +71,7 @@ 
 $pages .= '<br>';
 //create previous button
 if (($numPages > 1) && ($currentPage > 1)) {
-    $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter={$letter}&st=" . ($st - $perPage) . "'>" . _MA_PEDIGREE_PREVIOUS . '</a>&nbsp;&nbsp';
+    $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter={$letter}&st=".($st - $perPage)."'>"._MA_PEDIGREE_PREVIOUS.'</a>&nbsp;&nbsp';
 }
 //create numbers
 for ($x = 1; $x < ($numPages + 1); ++$x) {
@@ -80,18 +80,18 @@ 
         $pages .= '<br>';
     }
     if ($x != $currentPage) {
-        $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter={$letter}&st=" . ($perPage * ($x - 1)) . "'>{$x}</a>&nbsp;&nbsp";
+        $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter={$letter}&st=".($perPage * ($x - 1))."'>{$x}</a>&nbsp;&nbsp";
     } else {
         $pages .= "{$x}&nbsp;&nbsp";
     }
 }
 //create next button
 if (($numPages > 1) && ($currentPage < $numPages)) {
-    $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter={$letter}&st=" . ($st + $perPage) . "'>" . _MA_PEDIGREE_NEXT . '</a>&nbsp;&nbsp';
+    $pages .= "<a href='seldog.php?gend={$gend}&curval={$curval}&letter={$letter}&st=".($st + $perPage)."'>"._MA_PEDIGREE_NEXT.'</a>&nbsp;&nbsp';
 }
 
 //query
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE naam LIKE '{$letter}%' AND roft = '{$gend}' ORDER BY naam LIMIT {$st}, {$perPage}";
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE naam LIKE '{$letter}%' AND roft = '{$gend}' ORDER BY naam LIMIT {$st}, {$perPage}";
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 $animal = new Pedigree\Animal();
@@ -134,7 +134,7 @@ 
         'id'          => '0',
         'name'        => '',
         'gender'      => '',
-        'link'        => "<a href='updatepage.php?gend={$gend}&curval={$curval}&thisid=0'>" . strtr(_MA_PEDIGREE_ADD_SIREUNKNOWN, ['[father]' => $moduleConfig['father']]) . '</a>',
+        'link'        => "<a href='updatepage.php?gend={$gend}&curval={$curval}&thisid=0'>".strtr(_MA_PEDIGREE_ADD_SIREUNKNOWN, ['[father]' => $moduleConfig['father']]).'</a>',
         'colour'      => '',
         'number'      => '',
         'usercolumns' => $empty
@@ -144,7 +144,7 @@ 
         'id'          => '0',
         'name'        => '',
         'gender'      => '',
-        'link'        => "<a href='updatepage.php?gend={$gend}&curval={$curval}&thisid=0'>" . strtr(_MA_PEDIGREE_ADD_DAMUNKNOWN, ['[mother]' => $moduleConfig['mother']]) . '</a>',
+        'link'        => "<a href='updatepage.php?gend={$gend}&curval={$curval}&thisid=0'>".strtr(_MA_PEDIGREE_ADD_DAMUNKNOWN, ['[mother]' => $moduleConfig['mother']]).'</a>',
         'colour'      => '',
         'number'      => '',
         'usercolumns' => $empty
@@ -154,12 +154,12 @@ 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
     //create picture information
     $camera = ('' != $row['foto']) ? ' <img src="assets/images/camera.png">' : '';
-    $name   = stripslashes($row['naam']) . $camera;
+    $name   = stripslashes($row['naam']).$camera;
     //empty array
     unset($columnvalue);
     //fill array
     for ($i = 1; $i < $numofcolumns; ++$i) {
-        $x = 'user' . $columns[$i]['columnnumber'];
+        $x = 'user'.$columns[$i]['columnnumber'];
         if (is_array($columns[$i]['lookupval'])) {
             foreach ($columns[$i]['lookupval'] as $key => $keyValue) {
                 if ($key == $row[$x]) {
@@ -213,7 +213,7 @@ 
 } else {
     $selTtlParent = strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]);
 }
-$seltitle = _MA_PEDIGREE_SEL . $selTtlParent . _MA_PEDIGREE_FROM . Pedigree\Utility::getName($curval);
+$seltitle = _MA_PEDIGREE_SEL.$selTtlParent._MA_PEDIGREE_FROM.Pedigree\Utility::getName($curval);
 
 $GLOBALS['xoopsTpl']->assign('seltitle', $seltitle);
 
@@ -223,7 +223,7 @@ 
 //create string
 /* @todo: move hard coded language string to language files */
 $matches     = strtr(_MA_PEDIGREE_MATCHES, ['[animalTypes]' => $moduleConfig['animalTypes']]);
-$nummatchstr = "{$numResults}{$matches}" . ($st + 1) . " - {$lastshown} ({$numPages} pages)";
+$nummatchstr = "{$numResults}{$matches}".($st + 1)." - {$lastshown} ({$numPages} pages)";
 $GLOBALS['xoopsTpl']->assign([
                                  'nummatch' => $nummatchstr,
                                  'pages'    => $pages,
@@ -241,7 +241,7 @@ 
 $link         = "seldog.php?gend={$gend}&curval={$curval}&letter=";
 
 $criteria = $myObject->getHandler('Tree')->getActiveCriteria($roft);
-$criteria->setGroupby('UPPER(LEFT(' . $name . ',1))');
+$criteria->setGroupby('UPPER(LEFT('.$name.',1))');
 
 $motherArray['letters'] = Pedigree\Utility::lettersChoice($myObject, $activeObject, $criteria, $name, $link);
 //$catarray['toolbar']          = pedigree_toolbar();