mambax7 / pedigree

admin/config.php

Switch Indentation +11 added lines, -11 removed lines

@@ -142,15 +142,15 @@
 }
 
 switch ($op) {
-    case 'main':
-        pedigree_config_main();
-        break;
-    case 'config':
-        pedigree_config_post();
-        break;
-    default:
-        //xoops_cp_header();
-        /* @todo: move hard coded language string to language file */
-        print "<h1>Unknown method requested ('{$op}')</h1>";
-        xoops_cp_footer();
+        case 'main':
+            pedigree_config_main();
+            break;
+        case 'config':
+            pedigree_config_post();
+            break;
+        default:
+            //xoops_cp_header();
+            /* @todo: move hard coded language string to language file */
+            print "<h1>Unknown method requested ('{$op}')</h1>";
+            xoops_cp_footer();
 }

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
 
 //To be deleted?
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 //require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/pedigree_includes.php");
 //require_once dirname(__DIR__) . "/include/pedigree_includes.php";
 
@@ -56,7 +56,7 @@ 
     print "
     <form action='config.php' method='POST' enctype='application/x-www-form-urlencoded'>\n
     <table border='1' cellpadding='0' cellspacing='0' width='100%'>\n
-        <tr><th>" . _AM_PEDIGREE_CTITLE . "</th></tr>\n
+        <tr><th>" . _AM_PEDIGREE_CTITLE."</th></tr>\n
         <tr>\n
         <td class='bg2'>\n
             <table width='100%' border='0' cellpadding='4' cellspacing='1'>\n";
@@ -65,7 +65,7 @@ 
         if ('config_id' === $field) {
             continue;
         }
-        $pname = 'param_' . $field;
+        $pname = 'param_'.$field;
         print "
                 <tr nowrap='nowrap'>\n
                 <td class ='head'>{$prompt}</td>\n
@@ -79,7 +79,7 @@ 
                 <td class='even'>\n
                     <input type='hidden' name='op' value='config'>\n
                     <input type='hidden' name='window' value='config'>\n
-                    <input type='submit' value='" . _AM_PEDIGREE_BUT_GO . "'>\n
+                    <input type='submit' value='" . _AM_PEDIGREE_BUT_GO."'>\n
                 </td></tr>\n
             </table>\n
         </td></tr>\n
@@ -117,21 +117,21 @@ 
 {
     $config_fields = pedigree_get_config_fields();
     foreach ($config_fields as $field => $prompt) {
-        $param = 'param_' . $field;
+        $param = 'param_'.$field;
         global $$param;
     }
     $param_config_id = 1;
-    $sql             = 'REPLACE INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_config') . ' (' . pedigree_to_string($config_fields) . ') VALUES (';
+    $sql             = 'REPLACE INTO '.$GLOBALS['xoopsDB']->prefix('pedigree_config').' ('.pedigree_to_string($config_fields).') VALUES (';
 
     $first = true;
     foreach ($config_fields as $field => $prompt) {
-        $param = 'param_' . $field;
+        $param = 'param_'.$field;
         if (!$first) {
             $sql .= ', ';
         }
         // Handle a 'feature' of PHP that adds backslashes to HTTP parameters.
         $param_value = get_magic_quotes_gpc() ? stripslashes($$param) : $$param;
-        $sql         .= "'" . $GLOBALS['xoopsDB']->escape($param_value) . "'";
+        $sql .= "'".$GLOBALS['xoopsDB']->escape($param_value)."'";
         $first       = false;
     }
     $sql .= ' )';

include/class_eq_pie.php

Spacing +6 added lines, -6 removed lines

@@ -114,12 +114,12 @@ 
 
             $piePart = $value[1];
             if (isset($this->total) && $this->total > 0) {
-                $piePart100 = round($piePart / $this->total * 100, 2);  // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
+                $piePart100 = round($piePart / $this->total * 100, 2); // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
             } else {
                 $piePart100 = 0;
             }
 
-            $piePart360 = $piePart100 * 3.6;                    // in degrees
+            $piePart360 = $piePart100 * 3.6; // in degrees
 
             $colR      = hexdec(substr($value[2], 1, 2));
             $colG      = hexdec(substr($value[2], 3, 2));
@@ -146,11 +146,11 @@ 
         foreach ($EQpieData as $i => $value) {
             $piePart = $value[1];
             if (isset($this->total) && $this->total > 0) {
-                $piePart100 = round($piePart / $this->total * 100, 2);  // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
+                $piePart100 = round($piePart / $this->total * 100, 2); // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
             } else {
                 $piePart100 = 0;
             }
-            $piePart360 = $piePart100 * 3.6;                    // in degrees
+            $piePart360 = $piePart100 * 3.6; // in degrees
 
             $colR      = hexdec(substr($value[2], 1, 2));
             $colG      = hexdec(substr($value[2], 3, 2));
@@ -193,7 +193,7 @@ 
             foreach ($EQpieData as $i => $value) {
                 $piePart = $value[1];
                 if (isset($this->total) && $this->total > 0) {
-                    $piePart100 = round($piePart / $this->total * 100, 2);  // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
+                    $piePart100 = round($piePart / $this->total * 100, 2); // value in percentage, the rounding and * 100 for extra accuracy for pie w/o gaps
                 } else {
                     $piePart100 = 0;
                 }
@@ -205,7 +205,7 @@ 
                 imagefilledrectangle($legendImage, 5, $yOffset + 2, 5 + $box_width, $yOffset + $box_height + 2, $PartColor);
                 imagerectangle($legendImage, 5, $yOffset + 2, 5 + $box_width, $yOffset + $box_height + 2, $borderColor);
 
-                $text = $value[0] . ' ' . $piePart100 . '%';
+                $text = $value[0].' '.$piePart100.'%';
                 imagestring($legendImage, 2, '20', $yOffset, $text, $textColor);
                 $yOffset += 15;
             }

include/color.php

Spacing +2 added lines, -2 removed lines

@@ -216,8 +216,8 @@
      */
     public function changeLightness($degree = 10)
     {
-        $color1 =& $this->color1;
-        $color2 =& $this->color2;
+        $color1 = & $this->color1;
+        $color2 = & $this->color2;
 
         for ($x = 0; $x < 3; ++$x) {
             if (($color1[$x] + $degree) < 256) {

tools.php

Switch Indentation +101 added lines, -101 removed lines

@@ -68,107 +68,107 @@
 }
 
 switch ($op) {
-    case 'lang':
-        lang();
-        break;
-    case 'langsave':
-        langsave();
-        break;
-    case 'colours':
-        colours();
-        break;
-    case 'savecolours':
-        savecolours();
-        break;
-    case 'settings':
-        settings();
-        break;
-    case 'settingssave':
-        settingssave();
-        break;
-    case 'pro':
-        pro();
-        break;
-    case 'userfields':
-        userfields($field);
-        $uf = true;
-        break;
-    case 'listuserfields':
-        listuserfields();
-        $uf = true;
-        break;
-    case 'togglelocked':
-        togglelocked($field);
-        break;
-    case 'fieldmove':
-        fieldmove($field, $_GET['move']);
-        break;
-    case 'deluserfield':
-        deluserfield($_GET['id']);
-        break;
-    case 'restoreuserfield':
-        restoreuserfield($_GET['id']);
-        break;
-    case 'editlookup':
-        editlookup($_GET['id']);
-        break;
-    case 'lookupmove':
-        lookupmove($field, $_GET['id'], $_GET['move']);
-        break;
-    case 'dellookupvalue':
-        dellookupvalue($field, $_GET['id']);
-        break;
-    case 'addlookupvalue':
-        addlookupvalue($field);
-        break;
-    case 'editlookupvalue':
-        editlookupvalue($field, $_GET['id']);
-        break;
-    case 'savelookupvalue':
-        savelookupvalue($field, $_GET['id']);
-        break;
-    case 'deleted':
-        deleted();
-        break;
-    case 'delperm':
-        delperm($_GET['id']);
-        break;
-    case 'delall':
-        delall();
-        break;
-    case 'restore':
-        restore($_GET['id']);
-        break;
-    case 'database':
-        database();
-        $db = true;
-        break;
-    case 'userq':
-        userq();
-        $db = true;
-        break;
-    case 'userqrun':
-        userqrun($_GET['f']);
-        $db = true;
-        break;
-    case 'dbanc':
-        database_oa();
-        $db = true;
-        break;
-    case 'fltypar':
-        database_fp();
-        $db = true;
-        break;
-    case 'credits':
-        credits();
-        break;
-    case 'index':
-        index();
-        break;
-    default :
-        userfields();
-        $uf = true;
-        break;
+        case 'lang':
+            lang();
+            break;
+        case 'langsave':
+            langsave();
+            break;
+        case 'colours':
+            colours();
+            break;
+        case 'savecolours':
+            savecolours();
+            break;
+        case 'settings':
+            settings();
+            break;
+        case 'settingssave':
+            settingssave();
+            break;
+        case 'pro':
+            pro();
+            break;
+        case 'userfields':
+            userfields($field);
+            $uf = true;
+            break;
+        case 'listuserfields':
+            listuserfields();
+            $uf = true;
+            break;
+        case 'togglelocked':
+            togglelocked($field);
+            break;
+        case 'fieldmove':
+            fieldmove($field, $_GET['move']);
+            break;
+        case 'deluserfield':
+            deluserfield($_GET['id']);
+            break;
+        case 'restoreuserfield':
+            restoreuserfield($_GET['id']);
+            break;
+        case 'editlookup':
+            editlookup($_GET['id']);
+            break;
+        case 'lookupmove':
+            lookupmove($field, $_GET['id'], $_GET['move']);
+            break;
+        case 'dellookupvalue':
+            dellookupvalue($field, $_GET['id']);
+            break;
+        case 'addlookupvalue':
+            addlookupvalue($field);
+            break;
+        case 'editlookupvalue':
+            editlookupvalue($field, $_GET['id']);
+            break;
+        case 'savelookupvalue':
+            savelookupvalue($field, $_GET['id']);
+            break;
+        case 'deleted':
+            deleted();
+            break;
+        case 'delperm':
+            delperm($_GET['id']);
+            break;
+        case 'delall':
+            delall();
+            break;
+        case 'restore':
+            restore($_GET['id']);
+            break;
+        case 'database':
+            database();
+            $db = true;
+            break;
+        case 'userq':
+            userq();
+            $db = true;
+            break;
+        case 'userqrun':
+            userqrun($_GET['f']);
+            $db = true;
+            break;
+        case 'dbanc':
+            database_oa();
+            $db = true;
+            break;
+        case 'fltypar':
+            database_fp();
+            $db = true;
+            break;
+        case 'credits':
+            credits();
+            break;
+        case 'index':
+            index();
+            break;
+        default :
+            userfields();
+            $uf = true;
+            break;
 }
 
 //create tools array

Indentation +26 added lines, -26 removed lines

@@ -395,9 +395,9 @@ 
             $form .= "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=up'>" . "<img src='assets/images/up.gif' alt='move field up'></a></td>\n" . "<td>&nbsp;</td>\n";
         } else { //other rows
             $form .= "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=up'>"
-                     . "<img src='assets/images/up.gif' alt='move field up'></a></td>\n"
-                     . "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=down'>\n"
-                     . "<img src='assets/images/down.gif' alt='move field down'></a></td>\n";
+                        . "<img src='assets/images/up.gif' alt='move field up'></a></td>\n"
+                        . "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=down'>\n"
+                        . "<img src='assets/images/down.gif' alt='move field down'></a></td>\n";
         }
         $form .= "<td><a href='tools.php?op=deluserfield&id={$row['id']}'>" . "<img src='images/delete.png' alt='delete field'></a>&nbsp;" . "<a href='tools.php?op=userfields&field={$row['id']}'>{$row['fieldName']}</a></td>\n";
         //can the filed be shown in a list
@@ -567,33 +567,33 @@ 
         $form .= "  <tr>\n";
         if (0 == $count) { //first row
             $form .= "    <td style='width: 15px;'>&nbsp;</td>\n"
-                     . "    <td style='width: 15px;'>\n"
-                     . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=down'><img src='assets/images/down.gif'></a>\n"
-                     . "    </td>\n"
-                     . "    <td>\n"
-                     . "      <a href='tools.php?op=dellookupvalue&field={$field}&id={$row['id']}'><img src='images/delete.png'></a>\n"
-                     . "      &nbsp;<a href='tools.php?op=editlookupvalue&field={$field}&id={$row['id']}'>{$row['value']}</a>\n"
-                     . "    </td>\n";
+                        . "    <td style='width: 15px;'>\n"
+                        . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=down'><img src='assets/images/down.gif'></a>\n"
+                        . "    </td>\n"
+                        . "    <td>\n"
+                        . "      <a href='tools.php?op=dellookupvalue&field={$field}&id={$row['id']}'><img src='images/delete.png'></a>\n"
+                        . "      &nbsp;<a href='tools.php?op=editlookupvalue&field={$field}&id={$row['id']}'>{$row['value']}</a>\n"
+                        . "    </td>\n";
         } elseif ($count == $numrows - 1) { //last row
             $form .= "    <td>\n"
-                     . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=up'><img src='assets/images/up.gif'></a>\n"
-                     . "    </td>\n"
-                     . "    <td>&nbsp;</td>\n"
-                     . "    <td>\n"
-                     . "      <a href='tools.php?op=dellookupvalue&field={$field}&id={$row['id']}'><img src='assets/images/delete.png'></a>\n"
-                     . "      &nbsp;<a href='tools.php?op=editlookupvalue&field={$field}&id={$row['id']}'>{$row['value']}</a>\n"
-                     . "    </td>\n";
+                        . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=up'><img src='assets/images/up.gif'></a>\n"
+                        . "    </td>\n"
+                        . "    <td>&nbsp;</td>\n"
+                        . "    <td>\n"
+                        . "      <a href='tools.php?op=dellookupvalue&field={$field}&id={$row['id']}'><img src='assets/images/delete.png'></a>\n"
+                        . "      &nbsp;<a href='tools.php?op=editlookupvalue&field={$field}&id={$row['id']}'>{$row['value']}</a>\n"
+                        . "    </td>\n";
         } else { //other rows
             $form .= "    <td>\n"
-                     . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=up'><img src='assets/images/up.gif'></a>\n"
-                     . "    </td>\n"
-                     . "    <td>\n"
-                     . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=down'><img src='assets/images/down.gif'></a>\n"
-                     . "    </td>\n"
-                     . "    <td>\n"
-                     . "      <a href='tools.php?op=dellookupvalue&field={$field}&id={$row['id']}'><img src='images/delete.png'></a>\n"
-                     . "      &nbsp;<a href='tools.php?op=editlookupvalue&field={$field}&id={$row['id']}'>{$row['value']}</a>\n"
-                     . "    </td>\n";
+                        . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=up'><img src='assets/images/up.gif'></a>\n"
+                        . "    </td>\n"
+                        . "    <td>\n"
+                        . "      <a href='tools.php?op=lookupmove&field={$field}&id={$row['id']}&move=down'><img src='assets/images/down.gif'></a>\n"
+                        . "    </td>\n"
+                        . "    <td>\n"
+                        . "      <a href='tools.php?op=dellookupvalue&field={$field}&id={$row['id']}'><img src='images/delete.png'></a>\n"
+                        . "      &nbsp;<a href='tools.php?op=editlookupvalue&field={$field}&id={$row['id']}'>{$row['value']}</a>\n"
+                        . "    </td>\n";
         }
         $form .= "</tr>\n";
         ++$count;

Spacing +134 added lines, -134 removed lines

@@ -24,7 +24,7 @@ 
 
 
 //require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $moduleDirName = basename(__DIR__);
 xoops_loadLanguage('main', $moduleDirName);
 $helper = Pedigree\Helper::getInstance();
@@ -34,23 +34,23 @@ 
 include $GLOBALS['xoops']->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';
 
 //check for access
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 if (empty($GLOBALS['xoopsUser']) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)) {
-    redirect_header('index.php', 3, _NOPERM . '<br>' . _MA_PEDIGREE_REGIST);
+    redirect_header('index.php', 3, _NOPERM.'<br>'._MA_PEDIGREE_REGIST);
 }
 
-$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
+$xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
 //$xoTheme->addScript(PEDIGREE_URL . '/assets/js/jquery.ThickBox/thickbox-compressed.js');
 
-$xoTheme->addScript(PEDIGREE_URL . '/assets/js/jquery.magnific-popup.min.js');
-$xoTheme->addScript(PEDIGREE_URL . '/assets/js/colpick.js');
+$xoTheme->addScript(PEDIGREE_URL.'/assets/js/jquery.magnific-popup.min.js');
+$xoTheme->addScript(PEDIGREE_URL.'/assets/js/colpick.js');
 
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/colpick.css');
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/magnific-popup.css');
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/style.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/colpick.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/magnific-popup.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/style.css');
 
 global $field;
 //add JS routines
@@ -201,7 +201,7 @@ 
 $GLOBALS['xoopsTpl']->assign('tools', $tools);
 
 //footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';
 
 function index()
 {
@@ -260,26 +260,26 @@ 
     </script>
 
     <?php
-    $form = _MA_PEDIGREE_BGCOLOR . '<br><br>';
+    $form = _MA_PEDIGREE_BGCOLOR.'<br><br>';
     $form .= '<FORM NAME="myForm" action=\'tools.php?op=savecolours\' method=\'POST\'>
 <table>
 
 <!--
-    <tr><td>' . _MA_PEDIGREE_TXT_COLOR . '</td><td><INPUT TYPE="text" id="text" name="text" value="' . $text . '" size="11" maxlength="7">
+    <tr><td>' . _MA_PEDIGREE_TXT_COLOR.'</td><td><INPUT TYPE="text" id="text" name="text" value="'.$text.'" size="11" maxlength="7">
     <a href="TCP.popup(document.forms[\'myForm\'].elements[\'text\'])">
     <img width="15" height="13" border="0" alt="Click Here to Pick up the color" src="assets/images/sel.gif"></a></td></tr>
 
 
-    <tr><td>' . _MA_PEDIGREE_LINK_COLOR . '</td><td><INPUT TYPE="text" id="actlink" name="actlink" value="' . $actlink . '" size="11" maxlength="7">
+    <tr><td>' . _MA_PEDIGREE_LINK_COLOR.'</td><td><INPUT TYPE="text" id="actlink" name="actlink" value="'.$actlink.'" size="11" maxlength="7">
     <a href="TCP.popup(document.forms[\'myForm\'].elements[\'actlink\'])">
     <img width="15" height="13" border="0" alt="Click Here to Pick up the color" src="assets/images/sel.gif"></a></td></tr>
 
 
-    <tr><td>' . _MA_PEDIGREE_BACK1_COLOR . '</td><td><INPUT TYPE="text" id="even" name="even" value="' . $even . '" size="11" maxlength="7">
+    <tr><td>' . _MA_PEDIGREE_BACK1_COLOR.'</td><td><INPUT TYPE="text" id="even" name="even" value="'.$even.'" size="11" maxlength="7">
     <a href="TCP.popup(document.forms[\'myForm\'].elements[\'even\'])">
     <img width="15" height="13" border="0" alt="Click Here to Pick up the color" src="assets/images/sel.gif"></a></td></tr>
 
-    <tr><td>' . _MA_PEDIGREE_BACK2_COLOR . '</td><td><INPUT TYPE="text" id="body" name="body" value="' . $body . '" size="11" maxlength="7">
+    <tr><td>' . _MA_PEDIGREE_BACK2_COLOR.'</td><td><INPUT TYPE="text" id="body" name="body" value="'.$body.'" size="11" maxlength="7">
     <a href="TCP.popup(document.forms[\'myForm\'].elements[\'body\'])">
     <img width="15" height="13" border="0" alt="Click Here to Pick up the color" src="assets/images/sel.gif"></a></td></tr>
 
@@ -287,36 +287,36 @@ 
 
 <!--
 
-    <tr><td>' . _MA_PEDIGREE_TXT_COLOR . '</td><td>#<input type="text" id="picker" name="text" value="' . $text . '" size="11" maxlength="7">
+    <tr><td>' . _MA_PEDIGREE_TXT_COLOR.'</td><td>#<input type="text" id="picker" name="text" value="'.$text.'" size="11" maxlength="7">
     </td></tr>
 
-    <tr><td>' . _MA_PEDIGREE_LINK_COLOR . '</td><td>#<input type="text" id="picker" name="actlink" value="' . $actlink . '" size="11" maxlength="7">
+    <tr><td>' . _MA_PEDIGREE_LINK_COLOR.'</td><td>#<input type="text" id="picker" name="actlink" value="'.$actlink.'" size="11" maxlength="7">
     </td></tr>
 
-    <tr><td>' . _MA_PEDIGREE_BACK1_COLOR . '</td><td>#<input type="text" id="picker" name="even" value="' . $even . '" size="11" maxlength="7">
+    <tr><td>' . _MA_PEDIGREE_BACK1_COLOR.'</td><td>#<input type="text" id="picker" name="even" value="'.$even.'" size="11" maxlength="7">
     </td></tr>
 
-        <tr><td>' . _MA_PEDIGREE_BACK2_COLOR . '</td><td>#<input type="text" id="picker" name="body" value="' . $body . '" size="11" maxlength="7">
+        <tr><td>' . _MA_PEDIGREE_BACK2_COLOR.'</td><td>#<input type="text" id="picker" name="body" value="'.$body.'" size="11" maxlength="7">
     </td></tr>
 
 -->
 
-<tr><td>' . _MA_PEDIGREE_TXT_COLOR . '</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="text" maxlength="7" size="7" id="colorpickerField1" value="' . $text . '">
+<tr><td>' . _MA_PEDIGREE_TXT_COLOR.'</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="text" maxlength="7" size="7" id="colorpickerField1" value="'.$text.'">
 </td></tr>
 
 
-<tr><td>' . _MA_PEDIGREE_LINK_COLOR . '</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="actlink" maxlength="7" size="7" id="colorpickerField1" value="' . $actlink . '">
+<tr><td>' . _MA_PEDIGREE_LINK_COLOR.'</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="actlink" maxlength="7" size="7" id="colorpickerField1" value="'.$actlink.'">
 </td></tr>
 
 
-<tr><td>' . _MA_PEDIGREE_BACK1_COLOR . '</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="even" maxlength="7" size="7" id="colorpickerField1" value="' . $even . '">
+<tr><td>' . _MA_PEDIGREE_BACK1_COLOR.'</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="even" maxlength="7" size="7" id="colorpickerField1" value="'.$even.'">
 </td></tr>
 
 
-<tr><td>' . _MA_PEDIGREE_BACK2_COLOR . '</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="body" maxlength="7" size="7" id="colorpickerField1" value="' . $body . '">
+<tr><td>' . _MA_PEDIGREE_BACK2_COLOR.'</td><td><input class="color {hash:true,caps:false}" onMouseOver="changeTextColor(\'back4\', this.value)" type="text" name="body" maxlength="7" size="7" id="colorpickerField1" value="'.$body.'">
 </td></tr>
 
-    <tr><td><INPUT TYPE="submit" value="' . _MA_PEDIGREE_SUBMIT_BUTTON . '"></td><td>&nbsp;</td></tr>
+    <tr><td><INPUT TYPE="submit" value="' . _MA_PEDIGREE_SUBMIT_BUTTON.'"></td><td>&nbsp;</td></tr>
 
     </table>
 
@@ -338,8 +338,8 @@ 
 {
     $color = new \XoopsModules\Pedigree\ImageColor();
     //create darker link hover colour
-    $actLink = Request::getString('actlink', '', 'POST');  //active link color in hex
-    $even    = Request::getString('even', '', 'POST');     // even color in hex
+    $actLink = Request::getString('actlink', '', 'POST'); //active link color in hex
+    $even    = Request::getString('even', '', 'POST'); // even color in hex
     $text    = Request::getString('text', '', 'POST');
     $body    = Request::getString('body', '', 'POST');
 
@@ -358,7 +358,7 @@ 
     $col = "{$actLink};{$even};#{$female};{$text};#{$dark};#{$head};{$body};{$actLink}";
 
     //  $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('config') . " SET conf_value = '{$col}' WHERE conf_name = 'colourscheme'";
-    $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('config') . " SET conf_value = '" . $GLOBALS['xoopsDB']->escape($col) . "' WHERE conf_name = 'colourscheme'";
+    $query = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('config')." SET conf_value = '".$GLOBALS['xoopsDB']->escape($col)."' WHERE conf_name = 'colourscheme'";
     $GLOBALS['xoopsDB']->query($query);
     redirect_header('tools.php?op=colours', 1, 'Your settings have been saved.');
 }
@@ -373,12 +373,12 @@ 
 {
     global $form;
     $form .= _MA_PEDIGREE_FIELD_EXPLAIN4;
-    $sql     = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " WHERE isActive = '1' ORDER BY `order`";
+    $sql     = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." WHERE isActive = '1' ORDER BY `order`";
     $result  = $GLOBALS['xoopsDB']->query($sql);
     $numrows = $GLOBALS['xoopsDB']->getRowsNum($result);
     $count   = 0;
     $form .= _MA_PEDIGREE_FIELD_FORM1;
-    $form    .= "<tr ><td colspan='7'><hr></td></tr>";
+    $form .= "<tr ><td colspan='7'><hr></td></tr>";
     $mark = "<td><span style='font-weight: bold;'>X</span></td>\n";
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $form .= "<tr>\n";
@@ -390,16 +390,16 @@ 
         }
 
         if (0 == $count) { //first row
-            $form .= "<td style='width: 15px;'>&nbsp;</td><td style='width: 15px;'><a href='tools.php?op=fieldmove&field={$row['id']}&move=down'>" . "<img src='assets/images/down.gif' alt='move field down'></a></td>\n";
+            $form .= "<td style='width: 15px;'>&nbsp;</td><td style='width: 15px;'><a href='tools.php?op=fieldmove&field={$row['id']}&move=down'>"."<img src='assets/images/down.gif' alt='move field down'></a></td>\n";
         } elseif ($count == $numrows - 1) { //last row
-            $form .= "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=up'>" . "<img src='assets/images/up.gif' alt='move field up'></a></td>\n" . "<td>&nbsp;</td>\n";
+            $form .= "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=up'>"."<img src='assets/images/up.gif' alt='move field up'></a></td>\n"."<td>&nbsp;</td>\n";
         } else { //other rows
             $form .= "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=up'>"
                      . "<img src='assets/images/up.gif' alt='move field up'></a></td>\n"
                      . "<td><a href='tools.php?op=fieldmove&field={$row['id']}&move=down'>\n"
                      . "<img src='assets/images/down.gif' alt='move field down'></a></td>\n";
         }
-        $form .= "<td><a href='tools.php?op=deluserfield&id={$row['id']}'>" . "<img src='images/delete.png' alt='delete field'></a>&nbsp;" . "<a href='tools.php?op=userfields&field={$row['id']}'>{$row['fieldName']}</a></td>\n";
+        $form .= "<td><a href='tools.php?op=deluserfield&id={$row['id']}'>"."<img src='images/delete.png' alt='delete field'></a>&nbsp;"."<a href='tools.php?op=userfields&field={$row['id']}'>{$row['fieldName']}</a></td>\n";
         //can the filed be shown in a list
         if (1 == $row['ViewInList']) {
             $form .= $mark;
@@ -414,7 +414,7 @@ 
         }
         //has lookuptable ?
         if (1 == $row['LookupTable']) {
-            $form .= "<td><a href='tools.php?op=editlookup&id={$row['id']}'>" . _EDIT . "</a></td>\n";
+            $form .= "<td><a href='tools.php?op=editlookup&id={$row['id']}'>"._EDIT."</a></td>\n";
         } else {
             $form .= "<td>&nbsp;</td>\n";
         }
@@ -423,7 +423,7 @@ 
         ++$count;
     }
     $form .= "</table>\n";
-    $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " WHERE isActive = '0' ORDER BY 'id'";
+    $sql    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." WHERE isActive = '0' ORDER BY 'id'";
     $result = $GLOBALS['xoopsDB']->query($sql);
     if ($GLOBALS['xoopsDB']->getRowsNum($result) > 0) {
         $form .= _MA_PEDIGREE_FIELD_EXPLAIN5;
@@ -445,7 +445,7 @@ 
 function togglelocked($id)
 {
     //find current status
-    $sql    = 'SELECT locked FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " WHERE id = '{$id}'";
+    $sql    = 'SELECT locked FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." WHERE id = '{$id}'";
     $result = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         if (0 == $row['locked']) { //not locked
@@ -465,7 +465,7 @@ 
 function lock($id)
 {
     $id  = (int)$id;
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " SET locked = '1' WHERE id = '{$id}'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." SET locked = '1' WHERE id = '{$id}'";
     $GLOBALS['xoopsDB']->queryF($sql);
 }
 
@@ -475,7 +475,7 @@ 
 function unlock($id)
 {
     $id  = (int)$id;
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " SET locked = '0' WHERE id = '{$id}'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." SET locked = '0' WHERE id = '{$id}'";
     $GLOBALS['xoopsDB']->queryF($sql);
 }
 
@@ -491,7 +491,7 @@ 
 function fieldmove($field, $move)
 {
     //find next id
-    $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " WHERE isActive = '1' ORDER BY `order`";
+    $sql    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." WHERE isActive = '1' ORDER BY `order`";
     $result = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $valorder[] = $row['order'];
@@ -513,12 +513,12 @@ 
         $nextorder = $valorder[$x - 1];
     }
     //move value with ID=nextid to original location
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " SET `order` = '127' WHERE `order` = '{$nextorder}'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." SET `order` = '127' WHERE `order` = '{$nextorder}'";
     $GLOBALS['xoopsDB']->queryF($sql);
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " SET `order` = '{$nextorder}' WHERE `order` = '{$currentorder}'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." SET `order` = '{$nextorder}' WHERE `order` = '{$currentorder}'";
     $GLOBALS['xoopsDB']->queryF($sql);
     //move current value into nextvalue's spot
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " SET `order` = '{$currentorder}' WHERE `order` = '127'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." SET `order` = '{$currentorder}' WHERE `order` = '127'";
     $GLOBALS['xoopsDB']->queryF($sql);
     listuserfields();
 }
@@ -531,7 +531,7 @@ 
 function deluserfield($id)
 {
     $id  = (int)$id;
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " SET isActive = '0' WHERE id = {$id}";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." SET isActive = '0' WHERE id = {$id}";
     $GLOBALS['xoopsDB']->queryF($sql);
     listuserfields();
 }
@@ -545,7 +545,7 @@ 
 function restoreuserfield($id)
 {
     $id  = (int)$id;
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_fields') . " SET isActive = '1' WHERE id = {$id}";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_fields')." SET isActive = '1' WHERE id = {$id}";
     $GLOBALS['xoopsDB']->queryF($sql);
     listuserfields();
 }
@@ -558,7 +558,7 @@ 
 function editlookup($field)
 {
     $form    = _MA_PEDIGREE_LOOKUPFIELD;
-    $sql     = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $field) . ' ORDER BY `order`';
+    $sql     = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$field).' ORDER BY `order`';
     $result  = $GLOBALS['xoopsDB']->query($sql);
     $numrows = $GLOBALS['xoopsDB']->getRowsNum($result);
     $count   = 0;
@@ -598,7 +598,7 @@ 
         $form .= "</tr>\n";
         ++$count;
     }
-    $form .= "</table>\n" . "<form method='post' action='tools.php?op=addlookupvalue&field={$field}'>\n" . "<input type='text' name='value' style='width: 140px;'>&nbsp;\n" . "<input type='submit' value='Add value'>\n" . _MA_PEDIGREE_DELVALUE . "\n";
+    $form .= "</table>\n"."<form method='post' action='tools.php?op=addlookupvalue&field={$field}'>\n"."<input type='text' name='value' style='width: 140px;'>&nbsp;\n"."<input type='submit' value='Add value'>\n"._MA_PEDIGREE_DELVALUE."\n";
     //    $form .= '<br><br><input type="submit" name="reset" value=Exit>&nbsp;';
     $GLOBALS['xoopsTpl']->assign('form', $form);
 }
@@ -611,7 +611,7 @@ 
 function lookupmove($field, $id, $move)
 {
     //find next id
-    $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $field) . ' ORDER BY `order`';
+    $sql    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$field).' ORDER BY `order`';
     $result = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $values[] = ['id' => $row['id'], 'content' => $row['value'], 'orderof' => $row['order']];
@@ -637,9 +637,9 @@ 
         $nextid    = $values[$arraylocation - 1]['id'];
         $nextorder = $values[$arraylocation - 1]['orderof'];
     }
-    $sql = 'UPDATE `draaf_pedigree_lookup' . $field . "` SET `order` = '" . $nextorder . "' WHERE `id` = '" . $id . "'";
+    $sql = 'UPDATE `draaf_pedigree_lookup'.$field."` SET `order` = '".$nextorder."' WHERE `id` = '".$id."'";
     $GLOBALS['xoopsDB']->queryF($sql);
-    $sql = 'UPDATE `draaf_pedigree_lookup' . $field . "` SET `order` = '" . $currentorder . "' WHERE `id` = '" . $nextid . "'";
+    $sql = 'UPDATE `draaf_pedigree_lookup'.$field."` SET `order` = '".$currentorder."' WHERE `id` = '".$nextid."'";
     $GLOBALS['xoopsDB']->queryF($sql);
     editlookup($field);
 }
@@ -654,10 +654,10 @@ 
  */
 function editlookupvalue($field, $id)
 {
-    $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $field) . ' WHERE id =' . $id;
+    $sql    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$field).' WHERE id ='.$id;
     $result = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $form = "<form method='post' action='tools.php?op=savelookupvalue&field={$field}&id={$id}'>" . "<input type='text' name='value' value='{$row['value']}' style='width: 140px;'>&nbsp;" . "<input type='submit' value='Save value'>\n";
+        $form = "<form method='post' action='tools.php?op=savelookupvalue&field={$field}&id={$id}'>"."<input type='text' name='value' value='{$row['value']}' style='width: 140px;'>&nbsp;"."<input type='submit' value='Save value'>\n";
     }
     $GLOBALS['xoopsTpl']->assign('form', $form);
 }
@@ -671,9 +671,9 @@ 
  */
 function savelookupvalue($field, $id)
 {
-    $id    = (int)$id;  //sanitize id
+    $id    = (int)$id; //sanitize id
     $value = Request::getString('value', '', 'POST');
-    $SQL   = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $field) . " SET value = '{$value}' WHERE id = {$id}";
+    $SQL   = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$field)." SET value = '{$value}' WHERE id = {$id}";
     $GLOBALS['xoopsDB']->queryF($SQL);
     redirect_header("tools.php?op=editlookup&id={$field}", 2, 'The value has been saved.');
 }
@@ -692,16 +692,16 @@ 
     //    $default     = $fieldObject->defaultvalue;
     $default = $GLOBALS['xoopsDB']->escape($fieldObject->defaultvalue);
     if ($default == $id) {
-        redirect_header('tools.php?op=editlookup&id=' . $field, 3, _MA_PEDIGREE_NO_DELETE . $fieldObject->fieldname);
+        redirect_header('tools.php?op=editlookup&id='.$field, 3, _MA_PEDIGREE_NO_DELETE.$fieldObject->fieldname);
     }
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $field) . ' WHERE id = ' . $id;
+    $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$field).' WHERE id = '.$id;
     $GLOBALS['xoopsDB']->queryF($sql);
     //change current values to default for deleted value
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' SET user' . $field . " = '" . $default . "' WHERE user" . $field . " = '" . $id . "'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' SET user'.$field." = '".$default."' WHERE user".$field." = '".$id."'";
     $GLOBALS['xoopsDB']->queryF($sql);
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_temp') . ' SET user' . $field . " = '" . $default . "' WHERE user" . $field . " = '" . $id . "'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_temp').' SET user'.$field." = '".$default."' WHERE user".$field." = '".$id."'";
     $GLOBALS['xoopsDB']->queryF($sql);
-    $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_trash') . ' SET user' . $field . " = '" . $default . "' WHERE user" . $field . " = '" . $id . "'";
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_trash').' SET user'.$field." = '".$default."' WHERE user".$field." = '".$id."'";
     $GLOBALS['xoopsDB']->queryF($sql);
     editlookup($field);
 }
@@ -711,15 +711,15 @@ 
  */
 function addlookupvalue($field)
 {
-    $SQL    = 'SELECT id FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $field) . ' ORDER BY id DESC LIMIT 1';
+    $SQL    = 'SELECT id FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$field).' ORDER BY id DESC LIMIT 1';
     $result = $GLOBALS['xoopsDB']->query($SQL);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $count = $row['id'];
         ++$count;
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_lookup' . $field) . " VALUES ('" . $count . "', '" . $_POST['value'] . "', '" . $count . "')";
+        $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('pedigree_lookup'.$field)." VALUES ('".$count."', '".$_POST['value']."', '".$count."')";
         $GLOBALS['xoopsDB']->queryF($sql);
     }
-    redirect_header('tools.php?op=editlookup&id=' . $field, 2, 'The value has been added.');
+    redirect_header('tools.php?op=editlookup&id='.$field, 2, 'The value has been added.');
 }
 
 /**
@@ -728,7 +728,7 @@ 
 function userfields($field = 0)
 {
     global $field;
-    require_once __DIR__ . '/include/checkoutwizard.php';
+    require_once __DIR__.'/include/checkoutwizard.php';
 
     $wizard = new CheckoutWizard();
     $action = $wizard->coalesce($_GET['action']);
@@ -745,29 +745,29 @@ 
         } else {
             $form = _MA_PEDIGREE_FIELDPROP_ELSE;
         }
-        $form .= "<form method='post' action='" . $_SERVER['PHP_SELF'] . '?op=userfields&action=' . $wizard->resetAction() . "'>";
-        $form .= "<input type='submit' value='" . _MA_PEDIGREE_FINISH_BUTTON . "'></form>";
+        $form .= "<form method='post' action='".$_SERVER['PHP_SELF'].'?op=userfields&action='.$wizard->resetAction()."'>";
+        $form .= "<input type='submit' value='"._MA_PEDIGREE_FINISH_BUTTON."'></form>";
     } else {
-        $form = "<form method='post' action='" . $_SERVER['PHP_SELF'] . '?op=userfields&action=' . $wizard->getStepName() . "'>";
+        $form = "<form method='post' action='".$_SERVER['PHP_SELF'].'?op=userfields&action='.$wizard->getStepName()."'>";
         if (0 == !$field) {
             $form .= "<input type='hidden' name='field' value='{$field}'>";
         }
         if (0 == !$wizard->getValue('field')) { // field allready exists (editing mode)
-            $form .= '<h2>' . $wizard->getStepProperty('title') . ' - ' . $wizard->getValue('name') . ' - step ' . $wizard->getStepNumber() . '</h2>';
+            $form .= '<h2>'.$wizard->getStepProperty('title').' - '.$wizard->getValue('name').' - step '.$wizard->getStepNumber().'</h2>';
         } else {
-            $form .= '<h2>' . $wizard->getStepProperty('title') . ' - step ' . $wizard->getStepNumber() . '</h2>';
+            $form .= '<h2>'.$wizard->getStepProperty('title').' - step '.$wizard->getStepNumber().'</h2>';
         }
 
         if ('fieldname' === $wizard->getStepName()) {
             $form .= _MA_PEDIGREE_FIELD_FORM2;
-            $form .= "<input type='text' name='name' value='" . htmlspecialchars($wizard->getValue('name'), ENT_QUOTES | ENT_HTML5) . "'>";
+            $form .= "<input type='text' name='name' value='".htmlspecialchars($wizard->getValue('name'), ENT_QUOTES | ENT_HTML5)."'>";
             $form .= "</td><td style='width: 25%;'>";
             if ($wizard->isError('name')) {
                 $form .= $wizard->getError('name');
             }
             $form .= '</td></tr>';
             $form .= _MA_PEDIGREE_FIELD_FORM3;
-            $form .= "<textarea name='explain' rows='5' cols='15'>" . htmlspecialchars($wizard->getValue('explain'), ENT_QUOTES | ENT_HTML5) . '</textarea>';
+            $form .= "<textarea name='explain' rows='5' cols='15'>".htmlspecialchars($wizard->getValue('explain'), ENT_QUOTES | ENT_HTML5).'</textarea>';
             $form .= "</td><td style='width: 25%;'>";
             if ($wizard->isError('explain')) {
                 $form .= $wizard->getError('explain');
@@ -798,10 +798,10 @@ 
             $form .= "<input type='hidden' name='fc' value='{$i}'>";
             $form .= '<table>';
             for ($x = 1; $x < $i; ++$x) {
-                $form .= "<tr><td>Value : ({$x})</td><td>" . htmlspecialchars($wizard->getValue('lookup' . $x), ENT_QUOTES | ENT_HTML5) . '</td></tr>';
+                $form .= "<tr><td>Value : ({$x})</td><td>".htmlspecialchars($wizard->getValue('lookup'.$x), ENT_QUOTES | ENT_HTML5).'</td></tr>';
             }
             $form .= "<tr><td>Value : ({$i})</td><td>";
-            $form .= "<input type='text' name='lookup{$i}' value='" . htmlspecialchars($wizard->getValue('lookup' . $i), ENT_QUOTES | ENT_HTML5) . "'>";
+            $form .= "<input type='text' name='lookup{$i}' value='".htmlspecialchars($wizard->getValue('lookup'.$i), ENT_QUOTES | ENT_HTML5)."'>";
             $form .= "<input type='hidden' name='id{$i}' value='{$i}'>";
             if ($wizard->isError('lookup')) {
                 $form .= $wizard->getError('lookup');
@@ -817,25 +817,25 @@ 
                     if ('hassearch' === $wizard->getValue('hassearch')) {
                         $form .= ' checked =_MA_PEDIGREE_CHECKED ';
                     }
-                    $form .= '>' . _MA_PEDIGREE_FIELDSEARCH . '<br>';
+                    $form .= '>'._MA_PEDIGREE_FIELDSEARCH.'<br>';
                 } else {
-                    $form .= "<input type='checkbox' name='hassearch' disabled='true' value='hassearch'>" . _MA_PEDIGREE_FIELDSEARCH . '<br>';
+                    $form .= "<input type='checkbox' name='hassearch' disabled='true' value='hassearch'>"._MA_PEDIGREE_FIELDSEARCH.'<br>';
                 }
                 //viewinpedigree
                 $form .= "<input type='checkbox' name='viewinpedigree' value='viewinpedigree'";
                 if ('viewinpedigree' === $wizard->getValue('viewinpedigree')) {
                     $form .= ' checked =_MA_PEDIGREE_CHECKED ';
                 }
-                $form .= '>' . _MA_PEDIGREE_SHOWFIELD . '<br>';
+                $form .= '>'._MA_PEDIGREE_SHOWFIELD.'<br>';
                 //viewinadvanced
                 if ('radiobutton' === $fieldtype || 'selectbox' === $fieldtype) {
                     $form .= "<input type='checkbox' name='viewinadvanced' value='viewinadvanced'";
                     if ('viewinadvanced' === $wizard->getValue('viewinadvanced')) {
                         $form .= ' checked=checked';
                     }
-                    $form .= '>' . _MA_PEDIGREE_SHOWFIELD_ADVANCE . '<br>';
+                    $form .= '>'._MA_PEDIGREE_SHOWFIELD_ADVANCE.'<br>';
                 } else {
-                    $form .= "<input type='checkbox' name='viewinadvanced' disabled='true' value='viewinadvanced'>" . _MA_PEDIGREE_SHOWFIELD_ADVANCE . '<br>';
+                    $form .= "<input type='checkbox' name='viewinadvanced' disabled='true' value='viewinadvanced'>"._MA_PEDIGREE_SHOWFIELD_ADVANCE.'<br>';
                 }
                 //viewinpie
                 if ('radiobutton' === $fieldtype || 'selectbox' === $fieldtype) {
@@ -843,9 +843,9 @@ 
                     if ('viewinpie' === $wizard->getValue('viewinpie')) {
                         $form .= ' checked =_MA_PEDIGREE_CHECKED ';
                     }
-                    $form .= '>' . _MA_PEDIGREE_SHOWFIELD_PIECHART . '<br>';
+                    $form .= '>'._MA_PEDIGREE_SHOWFIELD_PIECHART.'<br>';
                 } else {
-                    $form .= "<input type='checkbox' name='viewinpie' disabled='true' value='viewinpie'>" . _MA_PEDIGREE_SHOWFIELD_PIECHART . '<br>';
+                    $form .= "<input type='checkbox' name='viewinpie' disabled='true' value='viewinpie'>"._MA_PEDIGREE_SHOWFIELD_PIECHART.'<br>';
                 }
                 //viewinlist
                 if (in_array($fieldtype, ['textbox', 'dateselect', 'urlfield', 'radiobutton', 'selectbox'])) {
@@ -853,9 +853,9 @@ 
                     if ('viewinlist' === $wizard->getValue('viewinlist')) {
                         $form .= ' checked =_MA_PEDIGREE_CHECKED ';
                     }
-                    $form .= '>' . _MA_PEDIGREE_SHOWFIELD_RESULT . '<br>';
+                    $form .= '>'._MA_PEDIGREE_SHOWFIELD_RESULT.'<br>';
                 } else {
-                    $form .= "<input type='checkbox' name='viewinlist' disabled='true' value='viewinlist'>" . _MA_PEDIGREE_SHOWFIELD_RESULT . '<br>';
+                    $form .= "<input type='checkbox' name='viewinlist' disabled='true' value='viewinlist'>"._MA_PEDIGREE_SHOWFIELD_RESULT.'<br>';
                 }
                 //add a litter
                 $form .= "<input type='checkbox' name='Litter' value='Litter'";
@@ -865,7 +865,7 @@ 
                     //disable if generallitter is active (you cant have both)
                     $form .= " disabled='true'";
                 }
-                $form .= '>' . _MA_PEDIGREE_SHOWFIELD_ADDLITTER . '<br>';
+                $form .= '>'._MA_PEDIGREE_SHOWFIELD_ADDLITTER.'<br>';
 
                 //add a litter general
                 $form .= "<input type='checkbox' name='Generallitter' value='Generallitter'";
@@ -875,7 +875,7 @@ 
                     //disable if add a litter is active (you cant have both)
                     $form .= " disabled='true'";
                 }
-                $form .= '>' . _MA_PEDIGREE_SHOWFIELD_ADDLITTGLOBAL . '<br>';
+                $form .= '>'._MA_PEDIGREE_SHOWFIELD_ADDLITTGLOBAL.'<br>';
             } else {
                 if ('search' === $wizard->getStepName()) {
                     $form .= _MA_PEDIGREE_SEARCH_NAME;
@@ -892,7 +892,7 @@ 
                     }
                     $form .= '</td></tr>';
                     $form .= _MA_PEDIGREE_FIELDEXPLANSEARCH;
-                    $form .= "<textarea name='searchexplain' rows='5' cols='15'>" . htmlspecialchars($wizard->getValue('searchexplain'), ENT_QUOTES | ENT_HTML5) . '</textarea>';
+                    $form .= "<textarea name='searchexplain' rows='5' cols='15'>".htmlspecialchars($wizard->getValue('searchexplain'), ENT_QUOTES | ENT_HTML5).'</textarea>';
                     $form .= "</td><td style='width: 25%;'>";
                     if ($wizard->isError('searchexplain')) {
                         $form .= $wizard->getError('searchexplain');
@@ -906,15 +906,15 @@ 
                         $form .= "Default value : <select size='1' name='defaultvalue'>";
                         $radioarray = $wizard->getValue('radioarray');
                         foreach ($radioarray as $x => $xValue) {
-                            $form .= "<option value='" . $radioarray[$x]['id'] . "'";
+                            $form .= "<option value='".$radioarray[$x]['id']."'";
                             if ($wizard->getValue('defaultvalue') == $radioarray[$x]['id']) {
                                 $form .= ' selected';
                             }
-                            $form .= ' >' . $radioarray[$x]['value'] . '</option>';
+                            $form .= ' >'.$radioarray[$x]['value'].'</option>';
                         }
                         $form .= '</select>';
                     } else {
-                        $form .= '' . _MA_PEDIGREE_FIELDVALUE . " <input type='text' name='defaultvalue' value='" . htmlspecialchars($wizard->getValue('defaultvalue'), ENT_QUOTES | ENT_HTML5) . "'>";
+                        $form .= ''._MA_PEDIGREE_FIELDVALUE." <input type='text' name='defaultvalue' value='".htmlspecialchars($wizard->getValue('defaultvalue'), ENT_QUOTES | ENT_HTML5)."'>";
                     }
                     $form .= _MA_PEDIGREE_DEFAUTVALUE_EXPLAIN;
                 } elseif ('confirm' === $wizard->getStepName()) {
@@ -926,27 +926,27 @@ 
                 }
                 //            }
                 //        }
-                $form .= '<b>' . _MA_PEDIGREE_FIELDCONTROL4 . $wizard->getValue('name') . '</b><br>';
-                $form .= '<b>' . _MA_PEDIGREE_FIELDCONTROL5 . stripslashes($wizard->getValue('explain')) . '</b><br>';
-                $form .= '<b>' . _MA_PEDIGREE_FIELDCONTROL6 . $wizard->getValue('fieldtype') . '</b><br>';
+                $form .= '<b>'._MA_PEDIGREE_FIELDCONTROL4.$wizard->getValue('name').'</b><br>';
+                $form .= '<b>'._MA_PEDIGREE_FIELDCONTROL5.stripslashes($wizard->getValue('explain')).'</b><br>';
+                $form .= '<b>'._MA_PEDIGREE_FIELDCONTROL6.$wizard->getValue('fieldtype').'</b><br>';
                 if ('selectbox' === $wizard->getValue('fieldtype')
                     || 'radiobutton' === $wizard->getValue('fieldtype')) {
                     $count = $wizard->getValue('fc');
                     for ($x = 1; $x < $count + 1; ++$x) {
                         $radioarray[] = [
-                            'id'    => $wizard->getValue('id' . $x),
-                            'value' => $wizard->getValue('lookup' . $x)
+                            'id'    => $wizard->getValue('id'.$x),
+                            'value' => $wizard->getValue('lookup'.$x)
                         ];
                     }
                     $val = $wizard->getValue('defaultvalue');
-                    $form .= '<b>' . _MA_PEDIGREE_FIELDCONTROL7 . $wizard->getValue('lookup' . $val) . '</b><br>';
+                    $form .= '<b>'._MA_PEDIGREE_FIELDCONTROL7.$wizard->getValue('lookup'.$val).'</b><br>';
                 } else {
-                    $form .= '<b>' . _MA_PEDIGREE_FIELDCONTROL7 . $wizard->getValue('defaultvalue') . '</b><br>';
+                    $form .= '<b>'._MA_PEDIGREE_FIELDCONTROL7.$wizard->getValue('defaultvalue').'</b><br>';
                 }
                 if ('hasearch' === $wizard->getValue('hassearch')) {
-                    $form .= _MA_PEDIGREE_FIELDSEARCH . ' : <b>  ' . _YES . '</b><br>';
-                    $form .= '<b>' . _MA_PEDIGREE_FIELDSEARCH . $wizard->getValue('searchname') . '</b><br>';
-                    $form .= '<b>' . _MA_PEDIGREE_FIELDCONTROL5 . $wizard->getValue('searhexplain') . '</b><br>';
+                    $form .= _MA_PEDIGREE_FIELDSEARCH.' : <b>  '._YES.'</b><br>';
+                    $form .= '<b>'._MA_PEDIGREE_FIELDSEARCH.$wizard->getValue('searchname').'</b><br>';
+                    $form .= '<b>'._MA_PEDIGREE_FIELDCONTROL5.$wizard->getValue('searhexplain').'</b><br>';
                 }
                 if ('viewinpedigree' === $wizard->getValue('viewinpedigree')) {
                     $form .= _MA_PEDIGREE_SYNTH1;
@@ -966,13 +966,13 @@ 
                 if ('Generallitter' === $wizard->getValue('generallitter')) {
                     $form .= _MA_PEDIGREE_SYNTH6;
                 }
-                $form .= _MA_PEDIGREE_FIELDCONTROL3 . '<br><br>';
+                $form .= _MA_PEDIGREE_FIELDCONTROL3.'<br><br>';
             }
         }
     }
 
     if (!$wizard->isFirstStep()) {
-        $form .= "<p><input type='submit' name='previous' value='&lt;&lt; " . _MA_PEDIGREE_PREVIOUS_BUTTON . "'>&nbsp;";
+        $form .= "<p><input type='submit' name='previous' value='&lt;&lt; "._MA_PEDIGREE_PREVIOUS_BUTTON."'>&nbsp;";
     }
     $form .= "<input type='submit' name='reset' value=Exit>&nbsp;";
     $last = $wizard->isLastStep() ? _MA_PEDIGREE_FINISH_BUTTON : _MA_PEDIGREE_NEXT_BUTTON;
@@ -991,7 +991,7 @@ 
     $moduleConfig  = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
     */
     $helper = Pedigree\Helper::getInstance(false);
-    $form     = 'Pedigree database module<br><br><li>Programming : James Cotton<br><li>Design & Layout : Ton van der Hagen<br><li>Version : '
+    $form = 'Pedigree database module<br><br><li>Programming : James Cotton<br><li>Design & Layout : Ton van der Hagen<br><li>Version : '
                 . round($helper->getModule()->getVar('version') / 100, 2)
                 . ' '
                 . $helper->getModule()->getVar('module_status')
@@ -1009,7 +1009,7 @@ 
 function userq()
 {
     $form = _MA_PEDIGREE_QUERIE_EXPLAN;
-    $d    = $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModule']->dirname() . '/userqueries/');
+    $d    = $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModule']->dirname().'/userqueries/');
 
     $dir = opendir($d);
     while (false !== ($f = readdir($dir))) {
@@ -1025,7 +1025,7 @@ 
  */
 function userqrun($file)
 {
-    include $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModule']->dirname() . "/userqueries/{$file}");
+    include $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModule']->dirname()."/userqueries/{$file}");
     $GLOBALS['xoopsTpl']->assign('form', $form);
 }
 
@@ -1038,13 +1038,13 @@ 
 {
     $form   = _MA_PEDIGREE_ANCEST_EXPLAN;
     $sql    = 'SELECT 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
-            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mm ON mm.id = m.mother
-            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' mf ON mf.id = m.father
-            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' fm ON fm.id = f.mother
-            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' ff ON ff.id = f.father
+            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
+            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mm ON mm.id = m.mother
+            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' mf ON mf.id = m.father
+            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' fm ON fm.id = f.mother
+            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' ff ON ff.id = f.father
             WHERE
             d.mother = d.id
             OR d.father = d.id
@@ -1076,8 +1076,8 @@ 
 {
     $form   = _MA_PEDIGREE_GENDER_EXPLAN;
     $sql    = 'SELECT d.id AS d_id, d.naam AS d_naam, d.mother AS d_mother, m.roft AS m_roft
-            FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' d
-            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " m ON m.id = d.mother
+            FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' d
+            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree')." m ON m.id = d.mother
             WHERE
             d.mother = m.id
             AND m.roft = '0' ";
@@ -1085,15 +1085,15 @@ 
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         $form .= "<li><a href='dog.php?id={$row['d_id']}'>{$row['d_naam']}</a> [mother seems to be male]<br>";
     }
-    $sql    = 'SELECT d.id AS d_id, d.naam AS d_naam, d.father AS d_father, f.roft AS f_roft
-            FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' d
-            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " f ON f.id = d.father
+    $sql = 'SELECT d.id AS d_id, d.naam AS d_naam, d.father AS d_father, f.roft AS f_roft
+            FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree').' d
+            LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree')." f ON f.id = d.father
             WHERE
             d.father = f.id
             AND f.roft = '1' ";
     $result = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $form .= '<li><a href="dog.php?id=' . $row['d_id'] . '">' . $row['d_naam'] . '</a> [father seems to be female]<br>';
+        $form .= '<li><a href="dog.php?id='.$row['d_id'].'">'.$row['d_naam'].'</a> [father seems to be female]<br>';
     }
     $GLOBALS['xoopsTpl']->assign('form', $form);
 }
@@ -1118,13 +1118,13 @@ 
 {
     global $helper;
     $form   = "Below the line are the animals which have been deleted from your database.<br><br>By clicking on the name you can reinsert them into the database.<br>By clicking on the 'X' in front of the name you can permanently delete the animal.<hr>";
-    $sql    = 'SELECT id, naam  FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_trash');
+    $sql    = 'SELECT id, naam  FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_trash');
     $result = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $form .= '<a href="tools.php?op=delperm&id=' . $row['id'] . '"><img src=' . $GLOBALS['pathIcon16'] . '/delete.png></a>&nbsp;<a href="tools.php?op=restore&id=' . $row['id'] . '">' . $row['naam'] . '</a><br>';
+        $form .= '<a href="tools.php?op=delperm&id='.$row['id'].'"><img src='.$GLOBALS['pathIcon16'].'/delete.png></a>&nbsp;<a href="tools.php?op=restore&id='.$row['id'].'">'.$row['naam'].'</a><br>';
     }
     if ($GLOBALS['xoopsDB']->getRowsNum($result) > 0) {
-        $form .= '<hr><a href="tools.php?op=delall">Click here</a> to remove all these ' . $helper->getConfig('animalTypes') . ' permenantly ';
+        $form .= '<hr><a href="tools.php?op=delall">Click here</a> to remove all these '.$helper->getConfig('animalTypes').' permenantly ';
     }
     $GLOBALS['xoopsTpl']->assign('form', $form);
 }
@@ -1134,14 +1134,14 @@ 
  */
 function delperm($id)
 {
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_trash') . " WHERE id = {$id}";
+    $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_trash')." WHERE id = {$id}";
     $GLOBALS['xoopsDB']->queryF($sql);
     deleted();
 }
 
 function delall()
 {
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_trash');
+    $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_trash');
     $GLOBALS['xoopsDB']->queryF($sql);
     deleted();
 }
@@ -1152,18 +1152,18 @@ 
 function restore($id)
 {
     $queryvalues = '';
-    $sql         = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_trash') . ' WHERE id = ' . $id;
+    $sql         = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_trash').' WHERE id = '.$id;
     $result      = $GLOBALS['xoopsDB']->query($sql);
     while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
         foreach ($row as $key => $values) {
-            $queryvalues .= "'" . $values . "',";
+            $queryvalues .= "'".$values."',";
         }
         $outgoing = substr_replace($queryvalues, '', -1);
-        $query    = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' VALUES (' . $outgoing . ')';
+        $query    = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' VALUES ('.$outgoing.')';
         $GLOBALS['xoopsDB']->queryF($query);
-        $delquery = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_trash') . ' WHERE id = ' . $id;
+        $delquery = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_trash').' WHERE id = '.$id;
         $GLOBALS['xoopsDB']->queryF($delquery);
-        $form = '<li><a href="pedigree.php?pedid=' . $row['id'] . '">' . $row['naam'] . '</a> has been restored into the database.<hr>';
+        $form = '<li><a href="pedigree.php?pedid='.$row['id'].'">'.$row['naam'].'</a> has been restored into the database.<hr>';
     }
     if (isset($form)) {
         $GLOBALS['xoopsTpl']->assign('form', $form);
@@ -1174,7 +1174,7 @@ 
 {
     $helper = Pedigree\Helper::getInstance();
 
-    include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $form = new \XoopsThemeForm(_MA_PEDIGREE_BLOCK_SETTING, 'settings', 'tools.php?op=settingssave', 'POST', 1);
     $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
     $select  = new \XoopsFormSelect(_MA_PEDIGREE_RESULT, 'perpage', $value = $helper->getConfig('perpage'), $size = 1, $multiple = false);
@@ -1214,7 +1214,7 @@ 
     $radiolit->addOption(0, $name = _MA_PEDIGREE_NO);
     $form->addElement($radiolit);
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_USE_LITTER_EXPLAIN));
-    $radioch = new \XoopsFormRadio(PED_SHOW_KITT_A . $helper->getConfig('children') . _MA_PEDIGREE_SHOW_KITT_B, 'pups', $value = $helper->getConfig('pups'));
+    $radioch = new \XoopsFormRadio(PED_SHOW_KITT_A.$helper->getConfig('children')._MA_PEDIGREE_SHOW_KITT_B, 'pups', $value = $helper->getConfig('pups'));
     $radioch->addOption(1, $name = _MA_PEDIGREE_YES);
     $radioch->addOption(0, $name = _MA_PEDIGREE_NO);
     $form->addElement($radioch);
@@ -1239,7 +1239,7 @@ 
     foreach ($_POST as $key => $values) {
         if (in_array($key, $settings)) {
             //            $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('config') . " SET conf_value = '" . $values . "' WHERE conf_name = '" . $key . "'";
-            $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('config') . " SET conf_value = '" . $GLOBALS['xoopsDB']->escape($values) . "' WHERE conf_name = '" . $GLOBALS['xoopsDB']->escape($key) . "'";
+            $query = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('config')." SET conf_value = '".$GLOBALS['xoopsDB']->escape($values)."' WHERE conf_name = '".$GLOBALS['xoopsDB']->escape($key)."'";
             $GLOBALS['xoopsDB']->query($query);
         }
     }
@@ -1249,28 +1249,28 @@ 
 function lang()
 {
     global $helper;
-    include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $form = new \XoopsThemeForm(_MA_PEDIGREE_BLOCK_NAME, 'language', 'tools.php?op=langsave', 'post', true);
     $form->addElement(new \XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_TYPE_AN, 'animalType', $size = 50, $maxsize = 255, $value = $helper->getConfig('animalType')));
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FIELD_EXPLAIN . $helper->getConfig('animalType') . _MA_PEDIGREE_SEARCH_FORM . $helper->getConfig('animalType') . '</b>.'));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FIELD_EXPLAIN.$helper->getConfig('animalType')._MA_PEDIGREE_SEARCH_FORM.$helper->getConfig('animalType').'</b>.'));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_TYPE_AN, 'animalTypes', $size = 50, $maxsize = 255, $value = $value = $helper->getConfig('animalTypes')));
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FIELD_EXPLAIN2 . $helper->getConfig('animalTypes') . _MA_PEDIGREE_FIELD_EXPLAIN3));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FIELD_EXPLAIN2.$helper->getConfig('animalTypes')._MA_PEDIGREE_FIELD_EXPLAIN3));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_MALE, 'male', $size = 50, $maxsize = 255, $value = $helper->getConfig('male')));
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_MALE_EXPLAIN));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_FEMALE, 'female', $size = 50, $maxsize = 255, $value = $helper->getConfig('female')));
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FEMALE_EXPLAIN));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_CHILDREN, 'children', $size = 50, $maxsize = 255, $value = $helper->getConfig('children')));
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_KITTEN_EXPLAIN1 . $helper->getConfig('animalTypes') . _MA_PEDIGREE_KITTEN_EXPLAIN2));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_KITTEN_EXPLAIN1.$helper->getConfig('animalTypes')._MA_PEDIGREE_KITTEN_EXPLAIN2));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_MOTHER, 'mother', $size = 50, $maxsize = 255, $value = $helper->getConfig('mother')));
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_MOTHER1 . $helper->getConfig('animalTypes') . _MA_PEDIGREE_MOTHER2));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_MOTHER1.$helper->getConfig('animalTypes')._MA_PEDIGREE_MOTHER2));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_FATHER, 'father', $size = 50, $maxsize = 255, $value = $helper->getConfig('father')));
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FATHER1 . $helper->getConfig('animalTypes') . _MA_PEDIGREE_FATHER2));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FATHER1.$helper->getConfig('animalTypes')._MA_PEDIGREE_FATHER2));
     $form->addElement(new \XoopsFormText(_MA_PEDIGREE_LITTER, 'litter', $size = 50, $maxsize = 255, $value = $helper->getConfig('litter')));
     $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_LITTER1));
     $form->addElement(new \XoopsFormTextArea(_MA_PEDIGREE_WELC_TEXT, 'welcome', $value = $helper->getConfig('welcome'), $rows = 15, $cols = 50));
 
-    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_WELC_TXT_EXPLAIN . $helper->getConfig('animalType') . '<br>[animalTypes] = ' . $helper->getConfig('animalTypes') . _MA_PEDIGREE_WELC_TXT_EXPLAIN2));
+    $form->addElement(new \XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_WELC_TXT_EXPLAIN.$helper->getConfig('animalType').'<br>[animalTypes] = '.$helper->getConfig('animalTypes')._MA_PEDIGREE_WELC_TXT_EXPLAIN2));
     $form->addElement(new \XoopsFormButton('', 'button_id', 'Submit', 'submit'));
     $GLOBALS['xoopsTpl']->assign('form', $form->render());
 }
@@ -1296,7 +1296,7 @@ 
     ];
     foreach ($_POST as $key => $values) {
         if (in_array($key, $settings)) {
-            $query = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('config') . " SET conf_value = '{$values}' WHERE conf_name = '{$key}'";
+            $query = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('config')." SET conf_value = '{$values}' WHERE conf_name = '{$key}'";
             $GLOBALS['xoopsDB']->query($query);
         }
     }

advanced.php

Indentation +12 added lines, -12 removed lines

@@ -125,14 +125,14 @@ 
                                 '[children]' => $moduleConfig['children']
                             ]) . '</a>');
 $xoopsTpl->assign('topfemales', '<a href="topstud.php?com=mother">' . strtr(_MA_PEDIGREE_ADV_BITC, [
-                                  '[female]'   => $moduleConfig['female'],
-                                  '[children]' => $moduleConfig['children']
-                              ]) . '</a>');
+                                    '[female]'   => $moduleConfig['female'],
+                                    '[children]' => $moduleConfig['children']
+                                ]) . '</a>');
 $xoopsTpl->assign('tnmftitle', strtr(_MA_PEDIGREE_ADV_TNMFTIT, ['[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female']]));
 $xoopsTpl->assign('countmales', '<img src="assets/images/male.gif"> ' . strtr(_MA_PEDIGREE_ADV_TCMA, [
-                                  '[male]'   => $moduleConfig['male'],
-                                  '[female]' => $moduleConfig['female']
-                              ]) . ' : <a href="result.php?f=roft&w=zero&o=naam">' . $countmales . '</a>');
+                                    '[male]'   => $moduleConfig['male'],
+                                    '[female]' => $moduleConfig['female']
+                                ]) . ' : <a href="result.php?f=roft&w=zero&o=naam">' . $countmales . '</a>');
 $xoopsTpl->assign('countfemales', '<img src="assets/images/female.gif"> ' . strtr(_MA_PEDIGREE_ADV_TCFE, [
                                     '[male]'   => $moduleConfig['male'],
                                     '[female]' => $moduleConfig['female']
@@ -144,13 +144,13 @@ 
 $xoopsTpl->assign('orptitle', _MA_PEDIGREE_ADV_ORPTIT);
 $xoopsTpl->assign('orpall', '<a href="result.php?f=father=0 and mother&w=zero&o=naam">' . strtr(_MA_PEDIGREE_ADV_ORPALL, ['[animalTypes]' => $moduleConfig['animalTypes']]) . '</a>');
 $xoopsTpl->assign('orpdad', '<a href="result.php?f=mother!=0 and father&w=zero&o=naam">' . strtr(_MA_PEDIGREE_ADV_ORPDAD, [
-                              '[father]'      => $moduleConfig['father'],
-                              '[animalTypes]' => $moduleConfig['animalTypes']
-                          ]) . '</a>');
+                                '[father]'      => $moduleConfig['father'],
+                                '[animalTypes]' => $moduleConfig['animalTypes']
+                            ]) . '</a>');
 $xoopsTpl->assign('orpmum', '<a href="result.php?f=father!=0 and mother&w=zero&o=naam">' . strtr(_MA_PEDIGREE_ADV_ORPMUM, [
-                              '[mother]'      => $moduleConfig['mother'],
-                              '[animalTypes]' => $moduleConfig['animalTypes']
-                          ]) . '</a>');
+                                '[mother]'      => $moduleConfig['mother'],
+                                '[animalTypes]' => $moduleConfig['animalTypes']
+                            ]) . '</a>');
 $xoopsTpl->assign('position', _MA_PEDIGREE_M50_POS);
 $xoopsTpl->assign('numdogs', _MA_PEDIGREE_M50_NUMD);
 $xoopsTpl->assign('maledogs', $perc_mdogs);

Spacing +21 added lines, -21 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);
 
@@ -13,11 +13,11 @@ 
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_advanced.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/' . $xoopsModule->dirname() . '/include/common.php';
-$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
-$xoTheme->addScript(PEDIGREE_URL . '/assets/js/jquery.canvasjs.min.js');
+require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/common.php';
+$xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
+$xoTheme->addScript(PEDIGREE_URL.'/assets/js/jquery.canvasjs.min.js');
 
 global $xoopsTpl, $xoopsDB;
 $totpl = [];
@@ -41,11 +41,11 @@ 
 $title   = $colors[7];
 
 //query to count male dogs
-$result = $GLOBALS['xoopsDB']->query('SELECT count(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft='0'");
+$result = $GLOBALS['xoopsDB']->query('SELECT count(id) FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE roft='0'");
 list($countmales) = $GLOBALS['xoopsDB']->fetchRow($result);
 
 //query to count female dogs
-$result = $GLOBALS['xoopsDB']->query('SELECT count(id) FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE roft='1'");
+$result = $GLOBALS['xoopsDB']->query('SELECT count(id) FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE roft='1'");
 list($countfemales) = $GLOBALS['xoopsDB']->fetchRow($result);
 
 /*
@@ -120,40 +120,40 @@ 
     $xoopsTpl->assign('pro', true);
 }
 $xoopsTpl->assign('title', strtr(_MA_PEDIGREE_ADV_VTMF, ['[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female']]));
-$xoopsTpl->assign('topmales', '<a href="topstud.php?com=father">' . strtr(_MA_PEDIGREE_ADV_STUD, [
+$xoopsTpl->assign('topmales', '<a href="topstud.php?com=father">'.strtr(_MA_PEDIGREE_ADV_STUD, [
                                 '[male]'     => $moduleConfig['male'],
                                 '[children]' => $moduleConfig['children']
-                            ]) . '</a>');
-$xoopsTpl->assign('topfemales', '<a href="topstud.php?com=mother">' . strtr(_MA_PEDIGREE_ADV_BITC, [
+                            ]).'</a>');
+$xoopsTpl->assign('topfemales', '<a href="topstud.php?com=mother">'.strtr(_MA_PEDIGREE_ADV_BITC, [
                                   '[female]'   => $moduleConfig['female'],
                                   '[children]' => $moduleConfig['children']
-                              ]) . '</a>');
+                              ]).'</a>');
 $xoopsTpl->assign('tnmftitle', strtr(_MA_PEDIGREE_ADV_TNMFTIT, ['[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female']]));
-$xoopsTpl->assign('countmales', '<img src="assets/images/male.gif"> ' . strtr(_MA_PEDIGREE_ADV_TCMA, [
+$xoopsTpl->assign('countmales', '<img src="assets/images/male.gif"> '.strtr(_MA_PEDIGREE_ADV_TCMA, [
                                   '[male]'   => $moduleConfig['male'],
                                   '[female]' => $moduleConfig['female']
-                              ]) . ' : <a href="result.php?f=roft&w=zero&o=naam">' . $countmales . '</a>');
-$xoopsTpl->assign('countfemales', '<img src="assets/images/female.gif"> ' . strtr(_MA_PEDIGREE_ADV_TCFE, [
+                              ]).' : <a href="result.php?f=roft&w=zero&o=naam">'.$countmales.'</a>');
+$xoopsTpl->assign('countfemales', '<img src="assets/images/female.gif"> '.strtr(_MA_PEDIGREE_ADV_TCFE, [
                                     '[male]'   => $moduleConfig['male'],
                                     '[female]' => $moduleConfig['female']
-                                ]) . ' : <a href="result.php?f=roft&w=1&o=naam">' . $countfemales) . '</a>';
+                                ]).' : <a href="result.php?f=roft&w=1&o=naam">'.$countfemales).'</a>';
 $xoopsTpl->assign('pienumber', '<img src="assets/images/numbers.png">');
 $xoopsTpl->assign('totpl', $totpl);
 $xoopsTpl->assign('books', $books);
 
 $xoopsTpl->assign('orptitle', _MA_PEDIGREE_ADV_ORPTIT);
-$xoopsTpl->assign('orpall', '<a href="result.php?f=father=0 and mother&w=zero&o=naam">' . strtr(_MA_PEDIGREE_ADV_ORPALL, ['[animalTypes]' => $moduleConfig['animalTypes']]) . '</a>');
-$xoopsTpl->assign('orpdad', '<a href="result.php?f=mother!=0 and father&w=zero&o=naam">' . strtr(_MA_PEDIGREE_ADV_ORPDAD, [
+$xoopsTpl->assign('orpall', '<a href="result.php?f=father=0 and mother&w=zero&o=naam">'.strtr(_MA_PEDIGREE_ADV_ORPALL, ['[animalTypes]' => $moduleConfig['animalTypes']]).'</a>');
+$xoopsTpl->assign('orpdad', '<a href="result.php?f=mother!=0 and father&w=zero&o=naam">'.strtr(_MA_PEDIGREE_ADV_ORPDAD, [
                               '[father]'      => $moduleConfig['father'],
                               '[animalTypes]' => $moduleConfig['animalTypes']
-                          ]) . '</a>');
-$xoopsTpl->assign('orpmum', '<a href="result.php?f=father!=0 and mother&w=zero&o=naam">' . strtr(_MA_PEDIGREE_ADV_ORPMUM, [
+                          ]).'</a>');
+$xoopsTpl->assign('orpmum', '<a href="result.php?f=father!=0 and mother&w=zero&o=naam">'.strtr(_MA_PEDIGREE_ADV_ORPMUM, [
                               '[mother]'      => $moduleConfig['mother'],
                               '[animalTypes]' => $moduleConfig['animalTypes']
-                          ]) . '</a>');
+                          ]).'</a>');
 $xoopsTpl->assign('position', _MA_PEDIGREE_M50_POS);
 $xoopsTpl->assign('numdogs', _MA_PEDIGREE_M50_NUMD);
 $xoopsTpl->assign('maledogs', $perc_mdogs);
 $xoopsTpl->assign('femaledogs', $perc_fdogs);
 //comments and footer
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

index.php

Indentation +6 added lines, -6 removed lines

@@ -87,12 +87,12 @@
 
 //add data to smarty template
 $GLOBALS['xoopsTpl']->assign([
-                                 'sselect'    => strtr(_MA_PEDIGREE_SELECT, ['[animalType]' => $moduleConfig['animalType']]),
-                                 'explain'     => _MA_PEDIGREE_EXPLAIN,
-                                 'sname'       => _MA_PEDIGREE_SEARCHNAME,
-                                 'snameex'    => strtr(_MA_PEDIGREE_SEARCHNAME_EX, ['[animalTypes]' => $moduleConfig['animalTypes']]),
-                                 'usersearch' => isset($usersearch) ? $usersearch : ''
-                             ]);
+                                    'sselect'    => strtr(_MA_PEDIGREE_SELECT, ['[animalType]' => $moduleConfig['animalType']]),
+                                    'explain'     => _MA_PEDIGREE_EXPLAIN,
+                                    'sname'       => _MA_PEDIGREE_SEARCHNAME,
+                                    'snameex'    => strtr(_MA_PEDIGREE_SEARCHNAME_EX, ['[animalTypes]' => $moduleConfig['animalTypes']]),
+                                    'usersearch' => isset($usersearch) ? $usersearch : ''
+                                ]);
 $GLOBALS['xoopsTpl']->assign('showwelcome', $moduleConfig['showwelcome']);
 //$GLOBALS['xoopsTpl']->assign('welcome', $GLOBALS['myts']->displayTarea($moduleConfig['welcome']));
 //$word = $myts->displayTarea(strtr($helper->getConfig('welcome'), array('[numanimals]' => $numdogs, '[animalType]' => $helper->getConfig('animalType'), '[animalTypes]' => $helper->getConfig('animalTypes'))));

Spacing +14 added lines, -14 removed lines

@@ -3,35 +3,35 @@ 
 
 use XoopsModules\Pedigree;
 
-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 __DIR__ . '/welcome.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/include/common.php';
+require_once __DIR__.'/welcome.php';
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_index.tpl';
 
 include $GLOBALS['xoops']->path('/header.php');
 
 //load javascript
-$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
+$xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
 //$xoTheme->addScript(PEDIGREE_URL . '/assets/js/jquery.ThickBox/thickbox-compressed.js');
 
-$xoTheme->addScript(PEDIGREE_URL . '/assets/js/jquery.magnific-popup.min.js');
-$xoTheme->addScript(PEDIGREE_URL . '/assets/js/colpick.js');
+$xoTheme->addScript(PEDIGREE_URL.'/assets/js/jquery.magnific-popup.min.js');
+$xoTheme->addScript(PEDIGREE_URL.'/assets/js/colpick.js');
 
 //load CSS style sheets
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/colpick.css');
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/magnific-popup.css');
-$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/style.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/colpick.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/magnific-popup.css');
+$xoTheme->addStylesheet(PEDIGREE_URL.'/assets/css/style.css');
 
 //$xoTheme->addStylesheet(PEDIGREE_URL . '/assets/css/jquery.ThickBox/thickbox.css');
 //$xoTheme->addStylesheet(PEDIGREE_URL . '/module.css');
 
-$GLOBALS['xoopsTpl']->assign('pedigree_url', PEDIGREE_URL . '/');
+$GLOBALS['xoopsTpl']->assign('pedigree_url', PEDIGREE_URL.'/');
 
 // Breadcrumb
 $breadcrumb = new Pedigree\Breadcrumb();
@@ -58,11 +58,11 @@ 
     if ($userField->isActive() && $userField->hasSearch()) {
         $fieldType   = $userField->getSetting('FieldType');
         $fieldObject = new $fieldType($userField, $animal);
-        $function    = 'user' . $iValue . $fieldObject->getSearchString();
+        $function    = 'user'.$iValue.$fieldObject->getSearchString();
         //echo $function."<br>";
         $usersearch[] = [
             'title'       => $userField->getSetting('SearchName'),
-            'searchid'    => 'user' . $iValue,
+            'searchid'    => 'user'.$iValue,
             'function'    => $function,
             'explanation' => $userField->getSetting('SearchExplanation'),
             'searchfield' => $fieldObject->searchfield()
@@ -71,7 +71,7 @@ 
 }
 
 //$catarray['letters']          = Pedigree\Utility::lettersChoice();
-$letter              = '';
+$letter = '';
 $myObject     = Pedigree\Helper::getInstance();
 $activeObject = 'Tree';
 $name         = 'naam';
@@ -79,7 +79,7 @@ 
 $link2        = '%25';
 
 $criteria = $myObject->getHandler('Tree')->getActiveCriteria();
-$criteria->setGroupby('UPPER(LEFT(' . $name . ',1))');
+$criteria->setGroupby('UPPER(LEFT('.$name.',1))');
 $catarray['letters'] = Pedigree\Utility::lettersChoice($myObject, $activeObject, $criteria, $name, $link, $link2);
 //$catarray['toolbar']          = pedigree_toolbar();
 $xoopsTpl->assign('catarray', $catarray);

dog.php

Spacing +38 added lines, -38 removed lines

@@ -5,11 +5,11 @@ 
 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';
 
 // Get all HTTP post or get parameters into global variables that are prefixed with "param_"
 //import_request_variables("gp", "param_");
@@ -17,7 +17,7 @@ 
 extract($_POST, EXTR_PREFIX_ALL, 'param');
 
 $GLOBALS['xoopsOption']['template_main'] = 'pedigree_dog.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 global $xoopsUser, $xoopsTpl, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
 global $numofcolumns, $numMatch, $pages, $columns, $dogs;
@@ -43,78 +43,78 @@ 
 }
 
 if (isset($_GET['delpicture']) && 'true' === $_GET['delpicture']) {
-    $delpicsql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " SET foto = '' WHERE id = '" . $id . "'";
+    $delpicsql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." SET foto = '' WHERE id = '".$id."'";
     $GLOBALS['xoopsDB']->query($delpicsql);
 }
 //query
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $id;
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$id;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
     //name
     $naam = stripslashes($row['naam']);
-    $xoopsTpl->assign('xoops_pagetitle', $naam . ' -- detailed information');
+    $xoopsTpl->assign('xoops_pagetitle', $naam.' -- detailed information');
     //owner
     if ('0' != $row['id_owner']) {
-        $queryeig = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $row['id_owner'];
+        $queryeig = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$row['id_owner'];
         $reseig   = $GLOBALS['xoopsDB']->query($queryeig);
         while (false !== ($roweig = $GLOBALS['xoopsDB']->fetchArray($reseig))) {
-            $eig = '<a href="owner.php?ownid=' . $roweig['id'] . '">' . $roweig['firstname'] . ' ' . $roweig['lastname'] . '</a>';
+            $eig = '<a href="owner.php?ownid='.$roweig['id'].'">'.$roweig['firstname'].' '.$roweig['lastname'].'</a>';
         }
     } else {
-        $eig = '<a href="update.php?id=' . $row['id'] . '&fld=ow">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $eig = '<a href="update.php?id='.$row['id'].'&fld=ow">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //breeder
     if ('0' != $row['id_breeder']) {
-        $queryfok = 'SELECT id, lastname, firstname FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_owner') . ' WHERE id=' . $row['id_breeder'];
+        $queryfok = 'SELECT id, lastname, firstname FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_owner').' WHERE id='.$row['id_breeder'];
         $resfok   = $GLOBALS['xoopsDB']->query($queryfok);
         while (false !== ($rowfok = $GLOBALS['xoopsDB']->fetchArray($resfok))) {
-            $fok = '<a href="owner.php?ownid=' . $rowfok['id'] . '">' . $rowfok['firstname'] . ' ' . $rowfok['lastname'] . '</a>';
+            $fok = '<a href="owner.php?ownid='.$rowfok['id'].'">'.$rowfok['firstname'].' '.$rowfok['lastname'].'</a>';
         }
     } else {
-        $fok = '<a href="update.php?id=' . $row['id'] . '&fld=br">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $fok = '<a href="update.php?id='.$row['id'].'&fld=br">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //gender
     if (0 == $row['roft']) {
-        $gender = '<img src="assets/images/male.gif"> ' . strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]);
+        $gender = '<img src="assets/images/male.gif"> '.strtr(_MA_PEDIGREE_FLD_MALE, ['[male]' => $moduleConfig['male']]);
     } else {
-        $gender = '<img src="assets/images/female.gif"> ' . strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']]);
+        $gender = '<img src="assets/images/female.gif"> '.strtr(_MA_PEDIGREE_FLD_FEMA, ['[female]' => $moduleConfig['female']]);
     }
     //Sire
     if (0 != $row['father']) {
-        $querysire = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $row['father'];
+        $querysire = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$row['father'];
         $ressire   = $GLOBALS['xoopsDB']->query($querysire);
         while (false !== ($rowsire = $GLOBALS['xoopsDB']->fetchArray($ressire))) {
-            $sire = '<img src="assets/images/male.gif"><a href="dog.php?id=' . $row['father'] . '">' . stripslashes($rowsire['naam']) . '</a>';
+            $sire = '<img src="assets/images/male.gif"><a href="dog.php?id='.$row['father'].'">'.stripslashes($rowsire['naam']).'</a>';
         }
     } else {
-        $sire = '<img src="assets/images/male.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=0&letter=A">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $sire = '<img src="assets/images/male.gif"><a href="seldog.php?curval='.$row['id'].'&gend=0&letter=A">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //Dam
     if (0 != $row['mother']) {
-        $querydam = 'SELECT naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' WHERE id=' . $row['mother'];
+        $querydam = 'SELECT naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' WHERE id='.$row['mother'];
         $resdam   = $GLOBALS['xoopsDB']->query($querydam);
         while (false !== ($rowdam = $GLOBALS['xoopsDB']->fetchArray($resdam))) {
-            $dam = '<img src="assets/images/female.gif"><a href="dog.php?id=' . $row['mother'] . '">' . stripslashes($rowdam['naam']) . '</a>';
+            $dam = '<img src="assets/images/female.gif"><a href="dog.php?id='.$row['mother'].'">'.stripslashes($rowdam['naam']).'</a>';
         }
     } else {
-        $dam = '<img src="assets/images/female.gif"><a href="seldog.php?curval=' . $row['id'] . '&gend=1&letter=A">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $dam = '<img src="assets/images/female.gif"><a href="seldog.php?curval='.$row['id'].'&gend=1&letter=A">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //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>';
     } else {
-        $picture = '<a href="update.php?id=' . $row['id'] . '&fld=pc">' . _MA_PEDIGREE_UNKNOWN . '</a>';
+        $picture = '<a href="update.php?id='.$row['id'].'&fld=pc">'._MA_PEDIGREE_UNKNOWN.'</a>';
     }
     //inbred precentage
     if ('' == $row['coi']) {
         if (0 != $row['father'] && 0 != $row['mother']) {
-            $inbred = '<a href="coi.php?s=' . $row['father'] . '&d=' . $row['mother'] . '&dogid=' . $row['id'] . '&detail=1">' . strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]) . '</a>';
+            $inbred = '<a href="coi.php?s='.$row['father'].'&d='.$row['mother'].'&dogid='.$row['id'].'&detail=1">'.strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]).'</a>';
         } else {
             $inbred = _MA_PEDIGREE_COI_MORE;
         }
     } else {
-        $inbred = '<a href="coi.php?s=' . $row['father'] . '&d=' . $row['mother'] . '&dogid=' . $row['id'] . '&detail=1" title="' . strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]) . '">' . $row['coi'] . ' %</a>';
+        $inbred = '<a href="coi.php?s='.$row['father'].'&d='.$row['mother'].'&dogid='.$row['id'].'&detail=1" title="'.strtr(_MA_PEDIGREE_COI_WAIT, ['[animalType]' => $moduleConfig['animalType']]).'">'.$row['coi'].' %</a>';
     }
     //brothers and sisters
     $bas = Pedigree\Utility::bas($id, $row['father'], $row['mother']);
@@ -137,46 +137,46 @@ 
     //name
     $items[] = [
         'header' => _MA_PEDIGREE_FLD_NAME,
-        'data'   => '<a href="pedigree.php?pedid=' . $row['id'] . '">' . $naam . '</a> (click to view pedigree)',
-        'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=nm\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'data'   => '<a href="pedigree.php?pedid='.$row['id'].'">'.$naam.'</a> (click to view pedigree)',
+        'edit'   => '<a href="update.php?id='.$row['id']."&fld=nm\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     if ('1' == $moduleConfig['ownerbreeder']) {
         //owner
         $items[] = [
             'header' => _MA_PEDIGREE_FLD_OWNE,
             'data'   => $eig,
-            'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=ow\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+            'edit'   => '<a href="update.php?id='.$row['id']."&fld=ow\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
         ];
         //breeder
         $items[] = [
             'header' => _MA_PEDIGREE_FLD_BREE,
             'data'   => $fok,
-            'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=br\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+            'edit'   => '<a href="update.php?id='.$row['id']."&fld=br\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
         ];
     }
     //gender
     $items[] = [
         'header' => _MA_PEDIGREE_FLD_GEND,
         'data'   => $gender,
-        'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=sx\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'edit'   => '<a href="update.php?id='.$row['id']."&fld=sx\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     //sire
     $items[] = [
         'header' => strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']]),
         'data'   => $sire,
-        'edit'   => '<a href="seldog.php?curval=' . $row['id'] . "&gend=0&letter=A\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'edit'   => '<a href="seldog.php?curval='.$row['id']."&gend=0&letter=A\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     //dam
     $items[] = [
         'header' => strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']]),
         'data'   => $dam,
-        'edit'   => '<a href="seldog.php?curval=' . $row['id'] . "&gend=1&letter=A\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+        'edit'   => '<a href="seldog.php?curval='.$row['id']."&gend=1&letter=A\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
     ];
     //picture
     $items[] = [
         'header' => _MA_PEDIGREE_FLD_PICT,
         'data'   => $picture,
-        'edit'   => '<a href="update.php?id=' . $row['id'] . "&fld=pc\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a><a href=\"dog.php?id=" . $row['id'] . "&delpicture=true\"><img src=' " . $pathIcon16 . "/delete.png' border='0' alt=_DELETE title=_DELETE></a>"
+        'edit'   => '<a href="update.php?id='.$row['id']."&fld=pc\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a><a href=\"dog.php?id=".$row['id']."&delpicture=true\"><img src=' ".$pathIcon16."/delete.png' border='0' alt=_DELETE title=_DELETE></a>"
     ];
 
     //userdefined fields
@@ -202,7 +202,7 @@ 
                 $items[] = [
                     'header' => $userField->getSetting('FieldName'),
                     'data'   => $fieldObject->showValue(),
-                    'edit'   => '<a href="update.php?id=' . $row['id'] . '&fld=' . $iValue . "\"><img src=' " . $pathIcon16 . "/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
+                    'edit'   => '<a href="update.php?id='.$row['id'].'&fld='.$iValue."\"><img src=' ".$pathIcon16."/edit.png' border='0' alt=_EDIT title=_EDIT></a>"
                 ];
             }
         }
@@ -255,7 +255,7 @@ 
     if ('1' == $moduleConfig['proversion']) {
         $items[] = [
             'header' => 'Inbred Pedigree',
-            'data'   => '<a href="mpedigree.php?pedid=' . $row['id'] . '">Inbreeding pedigree</a>',
+            'data'   => '<a href="mpedigree.php?pedid='.$row['id'].'">Inbreeding pedigree</a>',
             'edit'   => ''
         ];
     }
@@ -268,13 +268,13 @@ 
 $xoopsTpl->assign('dogs', $dogs);
 $xoopsTpl->assign('columns', $columns);
 $xoopsTpl->assign('numofcolumns', $numofcolumns);
-$xoopsTpl->assign('nummatch', $numMatch . ' Animals found.');
+$xoopsTpl->assign('nummatch', $numMatch.' Animals found.');
 
 //bas
 $xoopsTpl->assign('dogs1', $dogs1);
 $xoopsTpl->assign('columns1', $columns1);
 $xoopsTpl->assign('numofcolumns1', $numofcolumns1);
-$xoopsTpl->assign('nummatch1', $nummatch1 . ' Animals found.');
+$xoopsTpl->assign('nummatch1', $nummatch1.' Animals found.');
 
 //both pups and bas
 $xoopsTpl->assign('width', 100 / $numofcolumns);
@@ -293,5 +293,5 @@ 
 $xoopsTpl->assign('delete', _DELETE);
 
 //comments and footer
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/footer.php';

userqueries/remove escaped slash.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 $form        = 'The following animals have been found in your database with a slah. Any escape characters have been removed.<hr>';
-$queryString = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE naam LIKE '%\'%'";
+$queryString = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE naam LIKE '%\'%'";
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-    $form .= '<a href="pedigree.php?pedid=' . $row['id'] . '">' . $row['naam'] . '</a><br>';
-    $sql  = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . ' SET naam = "' . stripslashes($row['naam']) . "\" WHERE id = '" . $row['id'] . "'";
+    $form .= '<a href="pedigree.php?pedid='.$row['id'].'">'.$row['naam'].'</a><br>';
+    $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('pedigree_tree').' SET naam = "'.stripslashes($row['naam'])."\" WHERE id = '".$row['id']."'";
     $GLOBALS['xoopsDB']->queryF($sql);
 }

userqueries/animals with a picture.php

Spacing +3 added lines, -3 removed lines

@@ -1,11 +1,11 @@
 <?php
 
 $form     = 'This is an example of a userquery.<br><br>Shown below are the animals in your database that have a picture.<hr>';
-$sql      = 'SELECT id, naam FROM ' . $GLOBALS['xoopsDB']->prefix('pedigree_tree') . " WHERE foto != ''";
+$sql      = 'SELECT id, naam FROM '.$GLOBALS['xoopsDB']->prefix('pedigree_tree')." WHERE foto != ''";
 $result   = $GLOBALS['xoopsDB']->query($sql);
 $countpic = 0;
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-    $form .= '<a href="pedigree.php?pedid=' . $row['id'] . '">' . $row['naam'] . '</a><br>';
+    $form .= '<a href="pedigree.php?pedid='.$row['id'].'">'.$row['naam'].'</a><br>';
     ++$countpic;
 }
-$form .= '<hr>There are a total of ' . $countpic . ' animals with a picture';
+$form .= '<hr>There are a total of '.$countpic.' animals with a picture';