mambax7 / pedigree

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);

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'))));

phpthumb/phpThumb.php

Indentation +2 added lines, -2 removed lines

@@ -263,7 +263,7 @@ 
             $phpThumb->ErrorImage('ERROR: "' . $SourceFilename . '" cannot be read');
         }
     }
-   if (\Xmf\Request::hasVar('HTTP_REFERER', 'SERVER')) {
+    if (\Xmf\Request::hasVar('HTTP_REFERER', 'SERVER')) {
         $phpThumb->ErrorImage('&md5s=' . $md5s);
     } else {
         die('&md5s=' . $md5s);
@@ -584,7 +584,7 @@ 
                 $phpThumb->ErrorImage('Headers already sent (' . basename(__FILE__) . ' line ' . __LINE__ . ')');
                 exit;
             }
-           if (\Xmf\Request::hasVar('phpThumbDebug', 'GET')) {
+            if (\Xmf\Request::hasVar('phpThumbDebug', 'GET')) {
                 $phpThumb->DebugTimingMessage('skipped direct $SourceFilename passthru', __FILE__, __LINE__);
                 $phpThumb->DebugMessage('Would have passed "' . $SourceFilename . '" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
                 break;

phpthumb/phpthumb.class.php

Indentation +31 added lines, -31 removed lines

@@ -1588,10 +1588,10 @@ 
                 $this->DebugMessage('using ImageMagick path from $this->config_imagemagick_path (' . $this->config_imagemagick_path . ')', __FILE__, __LINE__);
                 if ($this->iswindows) {
                     $commandline = substr($this->config_imagemagick_path, 0, 2)
-                                   . ' && cd '
-                                   . phpthumb_functions::escapeshellarg_replacement(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2)))
-                                   . ' && '
-                                   . phpthumb_functions::escapeshellarg_replacement(basename($this->config_imagemagick_path));
+                                    . ' && cd '
+                                    . phpthumb_functions::escapeshellarg_replacement(str_replace('/', DIRECTORY_SEPARATOR, substr(dirname($this->config_imagemagick_path), 2)))
+                                    . ' && '
+                                    . phpthumb_functions::escapeshellarg_replacement(basename($this->config_imagemagick_path));
                 } else {
                     $commandline = phpthumb_functions::escapeshellarg_replacement($this->config_imagemagick_path);
                 }
@@ -2204,9 +2204,9 @@ 
 
                             if (($method > 1)
                                 && !$this->ImageMagickSwitchAvailable([
-                                                                          'channel',
-                                                                          'contrast-stretch'
-                                                                      ])) {
+                                                                            'channel',
+                                                                            'contrast-stretch'
+                                                                        ])) {
                                 // Because ImageMagick processing happens before PHP-GD filters, and because some
                                 // clipping is involved in the "lvl" filter, if "lvl" happens before "wb" then the
                                 // "wb" filter will have (almost) no effect. Therefore, if "wb" is enabled then
@@ -2311,11 +2311,11 @@ 
 
                         case 'bord':
                             if ($this->ImageMagickSwitchAvailable([
-                                                                      'border',
-                                                                      'bordercolor',
-                                                                      'thumbnail',
-                                                                      'crop'
-                                                                  ])) {
+                                                                        'border',
+                                                                        'bordercolor',
+                                                                        'thumbnail',
+                                                                        'crop'
+                                                                    ])) {
                                 if (!$this->zc) {
                                     @list($width, $rX, $rY, $color) = explode('|', $parameter);
                                     $width = (int)$width;
@@ -2335,7 +2335,7 @@ 
                                             $commandline = str_replace(
                                                 ' -' . $IMresizeParameter . ' "' . $matches[1] . 'x' . $matches[2] . '" ',
                                                 ' -' . $IMresizeParameter . ' ' . phpthumb_functions::escapeshellarg_replacement(($matches[1] - (2 * $width)) . 'x' . ($matches[2] - (2 * $width))) . ' ',
-                                                                       $commandline
+                                                                        $commandline
                                             );
                                         }
                                         $successfullyProcessedFilters[] = $filterkey;
@@ -3976,16 +3976,16 @@ 
                 $memory_get_usage = (function_exists('memory_get_usage') ? memory_get_usage() : 0);
 
                 return $this->ErrorImage('Source image is too large ('
-                                         . $this->source_width
-                                         . 'x'
-                                         . $this->source_height
-                                         . ' = '
-                                         . number_format($this->source_width * $this->source_height / 1000000, 1)
-                                         . 'Mpx, max='
-                                         . number_format($this->config_max_source_pixels / 1000000, 1)
-                                         . 'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '
-                                         . ceil(($memory_get_usage + (5 * $this->source_width * $this->source_height)) / 1048576)
-                                         . 'M).');
+                                            . $this->source_width
+                                            . 'x'
+                                            . $this->source_height
+                                            . ' = '
+                                            . number_format($this->source_width * $this->source_height / 1000000, 1)
+                                            . 'Mpx, max='
+                                            . number_format($this->config_max_source_pixels / 1000000, 1)
+                                            . 'Mpx) for GD creation (either install ImageMagick or increase PHP memory_limit to at least '
+                                            . ceil(($memory_get_usage + (5 * $this->source_width * $this->source_height)) / 1048576)
+                                            . 'M).');
             }
             if ($this->md5s && ($this->md5s != md5($this->rawImageData))) {
                 return $this->ErrorImage('$this->md5s != md5($this->rawImageData)' . "\n" . '"' . $this->md5s . '" != ' . "\n" . '"' . md5($this->rawImageData) . '"');
@@ -4135,8 +4135,8 @@ 
                     $this->ErrorImage(implode("\n", $errormessages));
                 } else {
                     $this->DebugMessage('All attempts to create GD image source failed (' . (ini_get('safe_mode') ? 'Safe Mode enabled, ImageMagick unavailable and source image probably too large for GD' : ($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'
-                                                                                                                                                                                                                                                                  . $imageHeader
-                                                                                                                                                                                                                                                                  . '"')) . '), cannot generate thumbnail');
+                                                                                                                                                                                                                                                                    . $imageHeader
+                                                                                                                                                                                                                                                                    . '"')) . '), cannot generate thumbnail');
                     //$this->DebugMessage('All attempts to create GD image source failed ('.($GDreadSupport ? 'source image probably corrupt' : 'GD does not have read support for "'.$imageHeader.'"').'), outputing raw image', __FILE__, __LINE__);
                     //if (!$this->phpThumbDebug) {
                     //	header($imageHeader);
@@ -4545,12 +4545,12 @@ 
         $height = ($height ?: $this->config_error_image_height);
 
         $text = 'phpThumb() v' . $this->phpthumb_version . "\n" . 'http://phpthumb.sourceforge.net' . "\n\n" . ($this->config_disable_debug ? 'Error messages disabled.'
-                                                                                                                                              . "\n\n"
-                                                                                                                                              . 'edit phpThumb.config.php and (temporarily) set'
-                                                                                                                                              . "\n"
-                                                                                                                                              . '$PHPTHUMB_CONFIG[\'disable_debug\'] = false;'
-                                                                                                                                              . "\n"
-                                                                                                                                              . 'to view the details of this error' : $text);
+                                                                                                                                                . "\n\n"
+                                                                                                                                                . 'edit phpThumb.config.php and (temporarily) set'
+                                                                                                                                                . "\n"
+                                                                                                                                                . '$PHPTHUMB_CONFIG[\'disable_debug\'] = false;'
+                                                                                                                                                . "\n"
+                                                                                                                                                . 'to view the details of this error' : $text);
 
         $this->FatalError($text);
         $this->DebugMessage($text, __FILE__, __LINE__);

topstud.php

Indentation +17 added lines, -17 removed lines

@@ -87,23 +87,23 @@
 }
 //query
 $queryString = 'SELECT count( d.'
-               . $com
-               . ' ) AS X, d.'
-               . $com
-               . ', p.naam as p_NAAM, p.father as p_father, p.mother as p_mother, p.coi as p_coi, p.foto as p_foto FROM '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' d LEFT JOIN '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' p ON d.'
-               . $com
-               . ' = p.id WHERE d.'
-               . $com
-               . ' !=0 GROUP BY d.'
-               . $com
-               . ' ORDER BY X DESC LIMIT '
-               . $st
-               . ', '
-               . $perPage;
+                . $com
+                . ' ) AS X, d.'
+                . $com
+                . ', p.naam as p_NAAM, p.father as p_father, p.mother as p_mother, p.coi as p_coi, p.foto as p_foto FROM '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' d LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' p ON d.'
+                . $com
+                . ' = p.id WHERE d.'
+                . $com
+                . ' !=0 GROUP BY d.'
+                . $com
+                . ' ORDER BY X DESC LIMIT '
+                . $st
+                . ', '
+                . $perPage;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 
 while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {

latest.php

Indentation +11 added lines, -11 removed lines

@@ -60,17 +60,17 @@
 
 //query
 $queryString = 'SELECT d.id AS d_id, d.naam AS d_naam, d.roft AS d_roft, d.mother AS d_mother, d.father AS d_father, d.foto AS d_foto, d.user AS d_user, f.id AS f_id, f.naam AS f_naam, m.id AS m_id, m.naam AS m_naam, u.uname AS u_uname FROM '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' d LEFT JOIN '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' f ON d.father = f.id LEFT JOIN '
-               . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
-               . ' m ON d.mother = m.id LEFT JOIN '
-               . $GLOBALS['xoopsDB']->prefix('users')
-               . ' u ON d.user = u.uid ORDER BY d.id DESC LIMIT '
-               . $st
-               . ', '
-               . $perPage;
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' d LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' f ON d.father = f.id LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('pedigree_tree')
+                . ' m ON d.mother = m.id LEFT JOIN '
+                . $GLOBALS['xoopsDB']->prefix('users')
+                . ' u ON d.user = u.uid ORDER BY d.id DESC LIMIT '
+                . $st
+                . ', '
+                . $perPage;
 $result      = $GLOBALS['xoopsDB']->query($queryString);
 $pathIcon16  = \Xmf\Module\Admin::iconUrl('', 16);
 

coi.php

Indentation +17 added lines, -17 removed lines

@@ -272,15 +272,15 @@ 
     global $nl, $detail, $depth, $IDs;
     // print_r ($IDs) ;
     echo $nl
-         . '<br>'
-         . $nl
-         . '<table border="3" cellpadding="4" width="85%"" cellpadding="0" cellspacing="0">'
-         . $nl
-         . '<tr><th colspan="10" align="center">SKETCH &nbsp; PEDIGREE &nbsp; OF COMMON PROGENY</th></tr>'
-         . $nl
-         . '<tr align="center" valign="middle"><th>Progeny</th><th>'
-         . _('Sire / Dam')
-         . '</th>';
+            . '<br>'
+            . $nl
+            . '<table border="3" cellpadding="4" width="85%"" cellpadding="0" cellspacing="0">'
+            . $nl
+            . '<tr><th colspan="10" align="center">SKETCH &nbsp; PEDIGREE &nbsp; OF COMMON PROGENY</th></tr>'
+            . $nl
+            . '<tr align="center" valign="middle"><th>Progeny</th><th>'
+            . _('Sire / Dam')
+            . '</th>';
     if ($depth >= 2) {
         echo '<th>' . _('Grandparents') . '</th>' . $nl;
     }
@@ -950,14 +950,14 @@ 
 }
 
 $title   = strtr(_MA_PEDIGREE_FLD_FATH, ['[father]' => $moduleConfig['father']])
-           . ' ('
-           . stripslashes(Pedigree\Utility::showParent($codec2))
-           . ')'
-           . _MA_PEDIGREE_COI_AND
-           . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']])
-           . ' ('
-           . stripslashes(Pedigree\Utility::showParent($codec1))
-           . ')';
+            . ' ('
+            . stripslashes(Pedigree\Utility::showParent($codec2))
+            . ')'
+            . _MA_PEDIGREE_COI_AND
+            . strtr(_MA_PEDIGREE_FLD_MOTH, ['[mother]' => $moduleConfig['mother']])
+            . ' ('
+            . stripslashes(Pedigree\Utility::showParent($codec1))
+            . ')';
 $content = stripslashes(one_animal($codec2));
 $content .= stripslashes(one_animal($codec1));
 $val = '';

pedigree.php

Indentation +12 added lines, -12 removed lines

@@ -162,18 +162,18 @@
 
     //add data to smarty template
     $GLOBALS['xoopsTpl']->assign([
-                                     'page_title' => stripslashes($row['d_naam']),
-                                     'd'          => $d,  //assign dog
-                                     //assign config options
-                                     'male'       => "<img src='assets/images/male.gif'>",
-                                     'female'     => "<img src='assets/images/female.gif'>",
-                                     //assign extra display options
-                                     'unknown'    => 'Unknown',
-                                     'SD'         => _MA_PEDIGREE_SD,
-                                     'PA'         => _MA_PEDIGREE_PA,
-                                     'GP'         => _MA_PEDIGREE_GP,
-                                     'GGP'        => _MA_PEDIGREE_GGP
-                                 ]);
+                                        'page_title' => stripslashes($row['d_naam']),
+                                        'd'          => $d,  //assign dog
+                                        //assign config options
+                                        'male'       => "<img src='assets/images/male.gif'>",
+                                        'female'     => "<img src='assets/images/female.gif'>",
+                                        //assign extra display options
+                                        'unknown'    => 'Unknown',
+                                        'SD'         => _MA_PEDIGREE_SD,
+                                        'PA'         => _MA_PEDIGREE_PA,
+                                        'GP'         => _MA_PEDIGREE_GP,
+                                        'GGP'        => _MA_PEDIGREE_GGP
+                                    ]);
 
     //    include __DIR__ . '/footer.php';
 }

class/pedigree.php

Indentation +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     protected function __construct($debug)
     {
         $this->debug   = $debug;
-       $moduleDirName = basename(dirname(__DIR__));
-       parent::__construct($moduleDirName);
+        $moduleDirName = basename(dirname(__DIR__));
+        parent::__construct($moduleDirName);
     }
 
     /**