danielgp / common-lib

source/DomComponentsByDanielGP.php

Spacing +93 added lines, -93 removed lines

@@ -62,13 +62,13 @@ 
                         $ditTitle .= ' (0)';
                     }
                     $divTab = [
-                        'start' => '<div class="tabbertab tabbertabdefault" id="tab_NoData" title="' . $ditTitle . '">',
+                        'start' => '<div class="tabbertab tabbertabdefault" id="tab_NoData" title="'.$ditTitle.'">',
                         'end'   => '</div><!-- from tab_NoData -->',
                     ];
                     if (!isset($ftrs['noGlobalTab'])) {
                         $divTab = [
-                            'start' => '<div class="tabber" id="tab">' . $divTab['start'],
-                            'end'   => $divTab['end'] . '</div><!-- from global Tab -->',
+                            'start' => '<div class="tabber" id="tab">'.$divTab['start'],
+                            'end'   => $divTab['end'].'</div><!-- from global Tab -->',
                         ];
                     }
                 }
@@ -91,14 +91,14 @@ 
         }
         $checkboxFormId = '';
         if ((isset($ftrs['actions']['checkbox_inlineEdit'])) || (isset($ftrs['actions']['checkbox']))) {
-            $checkboxFormId = 'frm' . date('YmdHis');
-            $sReturn        .= '<form id="' . $checkboxFormId . '" name="' . $checkboxFormId
-                . '" method="post" ' . ' action="' . $this->tCmnRequest->server->get('PHP_SELF') . '" >';
+            $checkboxFormId = 'frm'.date('YmdHis');
+            $sReturn .= '<form id="'.$checkboxFormId.'" name="'.$checkboxFormId
+                . '" method="post" '.' action="'.$this->tCmnRequest->server->get('PHP_SELF').'" >';
         }
         $tbl        = [];
         $tbl['Def'] = '<table'
-            . (isset($ftrs['table_style']) ? ' style="' . $ftrs['table_style'] . '"' : '')
-            . (isset($ftrs['table_class']) ? ' class="' . $ftrs['table_class'] . '"' : '')
+            . (isset($ftrs['table_style']) ? ' style="'.$ftrs['table_style'].'"' : '')
+            . (isset($ftrs['table_class']) ? ' class="'.$ftrs['table_class'].'"' : '')
             . '>';
         if (!isset($ftrs['grouping_cell_type'])) {
             $ftrs['grouping_cell_type'] = 'row';
@@ -139,7 +139,7 @@ 
                     $sReturn .= $tbl['Head'];
                 }
                 if (isset($iStartingPageRecord)) {
-                    $pgn     = $this->setPagination($ftrs['limits'][0], $ftrs['limits'][1], $ftrs['limits'][2], $bKpFlPge);
+                    $pgn = $this->setPagination($ftrs['limits'][0], $ftrs['limits'][1], $ftrs['limits'][2], $bKpFlPge);
                     $sReturn .= $this->setStringIntoTag($this->setStringIntoTag($pgn, 'th', [
                             'colspan' => $iTableColumns
                         ]), 'tr');
@@ -181,22 +181,22 @@ 
                     }
                     $remebered_value = $color_column_value;
                 }
-                $color = ' style="background-color: ' . $ftrs['row_colored_alternated'][$color_no] . ';"';
+                $color = ' style="background-color: '.$ftrs['row_colored_alternated'][$color_no].';"';
             } else {
                 if (isset($ftrs['RowStyle'])) {
-                    $color = ' style="' . $aElements[$rCntr][$ftrs['RowStyle']] . '"';
+                    $color = ' style="'.$aElements[$rCntr][$ftrs['RowStyle']].'"';
                 } else {
                     $color = '';
                 }
             }
-            $tbl['tr_Color'] = '<tr' . $color . '>';
+            $tbl['tr_Color'] = '<tr'.$color.'>';
 // Grouping column
             if (isset($ftrs['grouping_cell'])) {
                 foreach ($aElements[$rCntr] as $key => $value) {
                     if (($ftrs['grouping_cell'] == $key) && ($remindGroupValue != $value)) {
                         switch ($ftrs['grouping_cell_type']) {
                             case 'row':
-                                $sReturn .= $tbl['tr_Color'] . '<td ' . 'colspan="' . $iTableColumns . '">'
+                                $sReturn .= $tbl['tr_Color'].'<td '.'colspan="'.$iTableColumns.'">'
                                     . $this->setStringIntoTag($value, 'div', ['class' => 'rowGroup rounded'])
                                     . '</td></tr>';
                                 break;
@@ -208,7 +208,7 @@ 
                                 } else {
                                     $sReturn .= '</tbody></table>';
                                     if (isset($ftrs['showGroupingCounter'])) {
-                                        $sReturn      .= $this->updateDivTitleName($remindGroupValue, $groupCounter);
+                                        $sReturn .= $this->updateDivTitleName($remindGroupValue, $groupCounter);
                                         $groupCounter = 0;
                                     }
                                     $sReturn .= '</div>';
@@ -217,9 +217,9 @@ 
                                 if (isset($ftrs['grouping_default_tab'])) {
                                     $sReturn .= ($ftrs['grouping_default_tab'] == $value ? ' tabbertabdefault' : '');
                                 }
-                                $sReturn .= '" id="tab_' . $this->cleanStringForId($value) . '" '
-                                    . 'title="' . $value . '">'
-                                    . $tbl['Def'] . $tbl['Head'] . $tbl['Header'];
+                                $sReturn .= '" id="tab_'.$this->cleanStringForId($value).'" '
+                                    . 'title="'.$value.'">'
+                                    . $tbl['Def'].$tbl['Head'].$tbl['Header'];
                                 break;
                         }
                         $remindGroupValue = $value;
@@ -233,12 +233,12 @@ 
                     }
                 }
             }
-            $sReturn       .= $tbl['tr_Color'];
+            $sReturn .= $tbl['tr_Color'];
 // Action column
             $checkboxName  = '';
             $checkboxNameS = '';
             if (isset($ftrs['actions'])) {
-                $sReturn         .= '<td style="white-space:nowrap;">';
+                $sReturn .= '<td style="white-space:nowrap;">';
                 $action_argument = 0;
                 if (isset($ftrs['actions']['key'])) {
                     $actionKey = $ftrs['actions']['key'];
@@ -246,7 +246,7 @@ 
                     $actionKey = 'view';
                 }
                 if (isset($ftrs['action_prefix'])) {
-                    $actPrfx   = $ftrs['action_prefix'] . '&amp;';
+                    $actPrfx   = $ftrs['action_prefix'].'&amp;';
                     $actionKey = 'view2';
                 } else {
                     $actPrfx = '';
@@ -257,11 +257,11 @@ 
                     }
                     switch ($key) {
                         case 'checkbox':
-                            $checkboxName  = $value . '[]';
+                            $checkboxName  = $value.'[]';
                             $checkboxNameS = $value;
-                            $sReturn       .= '&nbsp;<input type="checkbox" name="' . $checkboxName
-                                . '" id="n' . $aElements[$rCntr][$value]
-                                . '" value="' . $aElements[$rCntr][$value] . '" ';
+                            $sReturn .= '&nbsp;<input type="checkbox" name="'.$checkboxName
+                                . '" id="n'.$aElements[$rCntr][$value]
+                                . '" value="'.$aElements[$rCntr][$value].'" ';
                             if (isset($_REQUEST[$checkboxNameS])) {
                                 if (is_array($_REQUEST[$checkboxNameS])) {
                                     if (in_array($aElements[$rCntr][$value], $_REQUEST[$checkboxNameS])) {
@@ -276,29 +276,29 @@ 
                             if (strpos($_REQUEST['view'], 'multiEdit') !== false) {
                                 $sReturn .= 'disabled="disabled" ';
                             }
-                            $sReturn       .= '/>';
+                            $sReturn .= '/>';
                             break;
                         case 'checkbox_inlineEdit':
-                            $checkboxName  = $value . '[]';
+                            $checkboxName  = $value.'[]';
                             $checkboxNameS = $value;
-                            $sReturn       .= '&nbsp;<input type="checkbox" name="' . $checkboxName
-                                . '" id="n' . $aElements[$rCntr][$value] . '" value="'
-                                . $aElements[$rCntr][$value] . '"/>';
+                            $sReturn .= '&nbsp;<input type="checkbox" name="'.$checkboxName
+                                . '" id="n'.$aElements[$rCntr][$value].'" value="'
+                                . $aElements[$rCntr][$value].'"/>';
                             break;
                         case 'delete':
-                            $sReturn       .= '<a href="#" onclick="javascript:setQuest(\'' . $value[0] . '\',\'';
-                            $iActArgs      = count($value[1]);
+                            $sReturn .= '<a href="#" onclick="javascript:setQuest(\''.$value[0].'\',\'';
+                            $iActArgs = count($value[1]);
                             for ($cntr2 = 0; $cntr2 < $iActArgs; $cntr2++) {
-                                $sReturn .= $value[1][$cntr2] . '=' . $aElements[$rCntr][$value[1][$cntr2]];
+                                $sReturn .= $value[1][$cntr2].'='.$aElements[$rCntr][$value[1][$cntr2]];
                             }
-                            $sReturn .= '\');" id="' . $key . $rCntr . '"><i class="fa fa-times">&nbsp;</i></a>';
+                            $sReturn .= '\');" id="'.$key.$rCntr.'"><i class="fa fa-times">&nbsp;</i></a>';
                             break;
                         case 'edit':
                         case 'list2':
                         case 'schedule':
-                            $vIc     = ($key == 'edit' ? 'pencil' : ($key == 'list2' ? 'list' : 'hourglass-half'));
+                            $vIc = ($key == 'edit' ? 'pencil' : ($key == 'list2' ? 'list' : 'hourglass-half'));
                             $sReturn .= $this->setDynamicActionToSpecialCell($value, $aElements, [
-                                'vIcon'    => 'fa fa-' . $vIc,
+                                'vIcon'    => 'fa fa-'.$vIc,
                                 'aPrefix'  => $actPrfx,
                                 'aKey'     => $actionKey,
                                 'rCounter' => $rCntr,
@@ -326,7 +326,7 @@ 
                     switch ($value[1]) {
                         case '/':
                             // next variable is only to avoid a long line
-                            $shorter                 = [
+                            $shorter = [
                                 $aElements[$rCntr][$value[3]],
                                 $aElements[$rCntr][$value[4]],
                             ];
@@ -334,7 +334,7 @@ 
                             break;
                         case '+':
                             // next variable is only to avoid a long line
-                            $iTemp                   = $this->setArrayValuesAsKey([
+                            $iTemp = $this->setArrayValuesAsKey([
                                 $value[0],
                                 $value[1],
                                 $value[2]
@@ -351,7 +351,7 @@ 
                     }
                     if ($value[0] == '%') {
                         $rowComputed[$key] = ($aElements[$rCntr][$key] * 100);
-                        $dec               -= 2;
+                        $dec -= 2;
                     } else {
                         $rowComputed[$key] = $aElements[$rCntr][$key];
                     }
@@ -363,59 +363,59 @@ 
             $sReturn .= '</tr>';
         }
         if (isset($iStartingPageRecord)) {
-            $pgn     = $this->setPagination($ftrs['limits'][0], $ftrs['limits'][1], $ftrs['limits'][2]);
-            $sReturn .= '<tr>' . $this->setStringIntoTag($pgn, 'th', ['colspan' => $iTableColumns]) . '</tr>';
+            $pgn = $this->setPagination($ftrs['limits'][0], $ftrs['limits'][1], $ftrs['limits'][2]);
+            $sReturn .= '<tr>'.$this->setStringIntoTag($pgn, 'th', ['colspan' => $iTableColumns]).'</tr>';
         }
         $sReturn .= '</tbody></table>';
         if ($ftrs['grouping_cell_type'] == 'tab') {
             if (isset($ftrs['showGroupingCounter'])) {
                 $sReturn .= $this->updateDivTitleName($remindGroupValue, $groupCounter);
             }
-            $sReturn .= '</div><!-- from ' . $remindGroupValue . ' -->';
+            $sReturn .= '</div><!-- from '.$remindGroupValue.' -->';
             if (!isset($ftrs['noGlobalTab'])) {
                 $sReturn .= '</div><!-- from global tab -->';
             }
         }
         if (isset($ftrs['actions']['checkbox'])) {
             if (strpos($_REQUEST['view'], 'multiEdit') === false) {
-                $sReturn .= '<a href="#" onclick="javascript:checking(\'' . $checkboxFormId
-                    . '\',\'' . $checkboxName . '\',true);">Check All</a>&nbsp;&nbsp;'
-                    . '<a href="#" onclick="javascript:checking(\'' . $checkboxFormId
-                    . '\',\'' . $checkboxName . '\',false);">Uncheck All</a>&nbsp;&nbsp;'
-                    . '<input type="hidden" name="action" value="multiEdit_' . $checkboxNameS . '" />';
+                $sReturn .= '<a href="#" onclick="javascript:checking(\''.$checkboxFormId
+                    . '\',\''.$checkboxName.'\',true);">Check All</a>&nbsp;&nbsp;'
+                    . '<a href="#" onclick="javascript:checking(\''.$checkboxFormId
+                    . '\',\''.$checkboxName.'\',false);">Uncheck All</a>&nbsp;&nbsp;'
+                    . '<input type="hidden" name="action" value="multiEdit_'.$checkboxNameS.'" />';
                 if (isset($ftrs['hiddenInput'])) {
                     if (is_array($ftrs['hiddenInput'])) {
                         foreach ($ftrs['hiddenInput'] as $valueF) {
-                            $sReturn .= '<input type="hidden" name="' . $valueF
-                                . '" value="' . $_REQUEST[$valueF] . '" />';
+                            $sReturn .= '<input type="hidden" name="'.$valueF
+                                . '" value="'.$_REQUEST[$valueF].'" />';
                         }
                     } else {
-                        $sReturn .= '<input type="hidden" name="' . $ftrs['hiddenInput']
-                            . '" value="' . $_REQUEST[$ftrs['hiddenInput']] . '" />';
+                        $sReturn .= '<input type="hidden" name="'.$ftrs['hiddenInput']
+                            . '" value="'.$_REQUEST[$ftrs['hiddenInput']].'" />';
                     }
                 }
-                $sReturn .= '<input style="margin: 0 3em 0 3em;" type="submit" ' . 'value="Edit selected" />';
+                $sReturn .= '<input style="margin: 0 3em 0 3em;" type="submit" '.'value="Edit selected" />';
             }
             $sReturn .= '</form>';
         }
         if (isset($ftrs['actions']['checkbox_inlineEdit'])) {
-            $sReturn .= '<a href="#" onclick="javascript:checking(\'' . $checkboxFormId
-                . '\',\'' . $checkboxName . '\',true);">Check All</a>&nbsp;&nbsp;'
-                . '<a href="#" onclick="javascript:checking(\'' . $checkboxFormId
-                . '\',\'' . $checkboxName . '\',false);">Uncheck All</a>&nbsp;&nbsp;';
+            $sReturn .= '<a href="#" onclick="javascript:checking(\''.$checkboxFormId
+                . '\',\''.$checkboxName.'\',true);">Check All</a>&nbsp;&nbsp;'
+                . '<a href="#" onclick="javascript:checking(\''.$checkboxFormId
+                . '\',\''.$checkboxName.'\',false);">Uncheck All</a>&nbsp;&nbsp;';
             if (isset($ftrs['visibleInput'])) {
                 $sReturn .= $ftrs['visibleInput'];
             }
-            $sReturn .= '<input type="hidden" name="view" value="save_' . $checkboxNameS . '" />';
+            $sReturn .= '<input type="hidden" name="view" value="save_'.$checkboxNameS.'" />';
             if (isset($ftrs['hiddenInput'])) {
                 if (is_array($ftrs['hiddenInput'])) {
                     foreach ($ftrs['hiddenInput'] as $valueF) {
-                        $sReturn .= '<input type="hidden" name="' . $valueF
-                            . '" value="' . $_REQUEST[$valueF] . '" />';
+                        $sReturn .= '<input type="hidden" name="'.$valueF
+                            . '" value="'.$_REQUEST[$valueF].'" />';
                     }
                 } else {
-                    $sReturn .= '<input type="hidden" name="' . $ftrs['hiddenInput']
-                        . '" value="' . $_REQUEST[$ftrs['hiddenInput']] . '" />';
+                    $sReturn .= '<input type="hidden" name="'.$ftrs['hiddenInput']
+                        . '" value="'.$_REQUEST[$ftrs['hiddenInput']].'" />';
                 }
             }
             $sReturn .= '<input style="margin: 0 3em 0 3em;" type="submit" value="Store the modification" />';
@@ -435,12 +435,12 @@ 
     {
         return $this->setStringIntoTag('&nbsp;', 'span', [
                 'onclick' => implode('', [
-                    'javascript:NewCssCal(\'' . $controlName,
+                    'javascript:NewCssCal(\''.$controlName,
                     '\',\'yyyyMMdd\',\'dropdown\',false,\'24\',false);',
                 ]),
                 'class'   => 'fa fa-calendar',
-                'id'      => $controlName . '_picker',
-                'style'   => 'cursor:pointer;' . $additionalStyle,
+                'id'      => $controlName.'_picker',
+                'style'   => 'cursor:pointer;'.$additionalStyle,
         ]);
     }
 
@@ -455,30 +455,30 @@ 
     {
         return $this->setStringIntoTag('&nbsp;', 'span', [
                 'onclick' => implode('', [
-                    'javascript:NewCssCal(\'' . $controlName,
+                    'javascript:NewCssCal(\''.$controlName,
                     '\',\'yyyyMMdd\',\'dropdown\',true,\'24\',true);',
                 ]),
                 'class'   => 'fa fa-calendar',
-                'id'      => $controlName . '_picker',
-                'style'   => 'cursor:pointer;' . $additionalStyle,
+                'id'      => $controlName.'_picker',
+                'style'   => 'cursor:pointer;'.$additionalStyle,
         ]);
     }
 
     private function setDynamicActionToSpecialCell($val, $aElements, $inP)
     {
         $aArgumemts   = [];
-        $aArgumemts[] = $this->tCmnSuperGlobals->getScriptName() . '?' . $inP['aPrefix'] . $inP['aKey'] . '=' . $val[0];
+        $aArgumemts[] = $this->tCmnSuperGlobals->getScriptName().'?'.$inP['aPrefix'].$inP['aKey'].'='.$val[0];
         $iActArgs     = count($val[1]);
         for ($counter = 0; $counter < $iActArgs; $counter++) {
-            $aArgumemts[] = $val[1][$counter] . '=' . $aElements[$inP['rCounter']][$val[1][$counter]];
+            $aArgumemts[] = $val[1][$counter].'='.$aElements[$inP['rCounter']][$val[1][$counter]];
         }
-        $id = $inP['key'] . $inP['rCounter'];
+        $id = $inP['key'].$inP['rCounter'];
         if (isset($inP['Features']['NoAjaxEditing'])) {
-            return '<a href="' . implode('&amp;', $aArgumemts) . '" id="' . $id . '"><i class="'
-                . $inP['vIcon'] . '">&nbsp;</i></a>';
+            return '<a href="'.implode('&amp;', $aArgumemts).'" id="'.$id.'"><i class="'
+                . $inP['vIcon'].'">&nbsp;</i></a>';
         }
-        return '<a href="#" onclick="javascript:loadAE(\'' . implode('&amp;', $aArgumemts) . '\');"'
-            . ' id="' . $id . '"><i class="' . $inP['vIcon'] . '">&nbsp;</i></a>';
+        return '<a href="#" onclick="javascript:loadAE(\''.implode('&amp;', $aArgumemts).'\');"'
+            . ' id="'.$id.'"><i class="'.$inP['vIcon'].'">&nbsp;</i></a>';
     }
 
     /**
@@ -493,7 +493,7 @@ 
         if (!is_null($sHK) && (in_array('noHeader', $sHK))) {
             return '';
         }
-        return $this->setFooterCommonInjected($footerInjected) . '</body></html>';
+        return $this->setFooterCommonInjected($footerInjected).'</body></html>';
     }
 
     protected function setFooterCommonInjected($footerInjected = null)
@@ -526,11 +526,11 @@ 
                 'lang'     => '<html lang="en-US">',
                 'head'     => '<head>',
                 'charset'  => '<meta charset="utf-8" />',
-                'viewport' => '<meta name="viewport" content="' . implode(', ', [
+                'viewport' => '<meta name="viewport" content="'.implode(', ', [
                     'width=device-width',
                     'height=device-height',
                     'initial-scale=1',
-                ]) . '" />',
+                ]).'" />',
             ];
             if (!is_null($headerFeatures)) {
                 if (is_array($headerFeatures)) {
@@ -558,11 +558,11 @@ 
                                 break;
                             case 'lang':
                                 $fixedHeaderElements['lang'] = '<html lang="'
-                                    . filter_var($value, FILTER_SANITIZE_STRING) . '">';
+                                    . filter_var($value, FILTER_SANITIZE_STRING).'">';
                                 break;
                             case 'title':
-                                $aFeatures[]                 = '<title>'
-                                    . filter_var($value, FILTER_SANITIZE_STRING) . '</title>';
+                                $aFeatures[] = '<title>'
+                                    . filter_var($value, FILTER_SANITIZE_STRING).'</title>';
                                 break;
                         }
                     }
@@ -575,7 +575,7 @@ 
                         . '</head>'
                         . '<body>'
                         . '<p style="background-color:red;color:#FFF;">The parameter sent to '
-                        . __FUNCTION__ . ' must be an array</p>'
+                        . __FUNCTION__.' must be an array</p>'
                         . $this->setFooterCommon();
                     throw new \Exception($sReturn);
                 }
@@ -603,10 +603,10 @@ 
                 if (isset($features['column_formatting'][$key])) {
                     switch ($features['column_formatting'][$key]) {
                         case '@':
-                            $sReturn .= 'style="text-align:left;">' . $value;
+                            $sReturn .= 'style="text-align:left;">'.$value;
                             break;
                         case 'right':
-                            $sReturn .= 'style="text-align:right;">' . $value;
+                            $sReturn .= 'style="text-align:right;">'.$value;
                             break;
                         default:
                             $sReturn .= '???';
@@ -620,12 +620,12 @@ 
                         if ((strpos($value, '-') !== false) && (strlen($value) == 10)) {
                             if (preg_match("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})", $value, $regs)) {
                                 $outputet = true;
-                                $sReturn  .= 'style="text-align:right;width: 10px;">'
-                                    . $regs[3] . '.' . $regs[2] . '.' . $regs[1];
+                                $sReturn .= 'style="text-align:right;width: 10px;">'
+                                    . $regs[3].'.'.$regs[2].'.'.$regs[1];
                             }
                         }
                         if (!$outputet) {
-                            $sReturn .= 'style="text-align:left;">' . $value;
+                            $sReturn .= 'style="text-align:left;">'.$value;
                         }
                     }
                 }
@@ -651,11 +651,11 @@ 
     {
         $styleToReturn = 'style="text-align: right;">';
         if (substr($value, 0, 1) === '0') {
-            return $styleToReturn . $value;
+            return $styleToReturn.$value;
         }
         $decimals = $this->setTableCellDecimals($key, $features);
         $nDc      = ['MinFractionDigits' => $decimals, 'MaxFractionDigits' => $decimals];
-        return $styleToReturn . $this->setNumberFormat($value, $nDc);
+        return $styleToReturn.$this->setNumberFormat($value, $nDc);
     }
 
     /**
@@ -691,7 +691,7 @@ 
         $this->handleLanguageIntoSession();
         return '<div class="upperRightBox">'
             . '<div style="text-align:right;">'
-            . '<span class="flag-icon flag-icon-' . strtolower(substr($this->tCmnSession->get('lang'), -2))
+            . '<span class="flag-icon flag-icon-'.strtolower(substr($this->tCmnSession->get('lang'), -2))
             . '" style="margin-right:2px;">&nbsp;</span>'
             . $aAvailableLanguages[$this->tCmnSession->get('lang')]
             . '</div><!-- default Language -->'
@@ -704,17 +704,17 @@ 
         $linkWithoutLanguage = '';
         $alR                 = $this->tCmnSuperGlobals->query->all();
         if (count($alR) > 0) {
-            $linkWithoutLanguage = $this->setArrayToStringForUrl('&amp;', $alR, ['lang']) . '&amp;';
+            $linkWithoutLanguage = $this->setArrayToStringForUrl('&amp;', $alR, ['lang']).'&amp;';
         }
         $sReturn = [];
         foreach ($aAvailableLanguages as $key => $value) {
             if ($this->tCmnSession->get('lang') !== $key) {
-                $sReturn[] = '<a href="?' . $linkWithoutLanguage . 'lang=' . $key . '" style="display:block;">'
-                    . '<span class="flag-icon flag-icon-' . strtolower(substr($key, -2))
-                    . '" style="margin-right:2px;">&nbsp;</span>' . $value . '</a>';
+                $sReturn[] = '<a href="?'.$linkWithoutLanguage.'lang='.$key.'" style="display:block;">'
+                    . '<span class="flag-icon flag-icon-'.strtolower(substr($key, -2))
+                    . '" style="margin-right:2px;">&nbsp;</span>'.$value.'</a>';
             }
         }
-        return '<div id="visibleOnHover">' . implode('', $sReturn) . '</div><!-- visibleOnHover end -->';
+        return '<div id="visibleOnHover">'.implode('', $sReturn).'</div><!-- visibleOnHover end -->';
     }
 
 }

source/MySQLiByDanielGPnumbers.php

Spacing +9 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
     protected function getFieldOutputEnumSetReadOnly($val, $adnlThings)
     {
         $inputFeatures = [
-            'name'     => $val['COLUMN_NAME'] . $adnlThings['suffix'],
+            'name'     => $val['COLUMN_NAME'].$adnlThings['suffix'],
             'id'       => $val['COLUMN_NAME'],
             'readonly' => 'readonly',
             'class'    => 'input_readonly',
@@ -128,7 +128,7 @@ 
      */
     protected function setFieldLabel($details, $features, $fieldLabel)
     {
-        $aLabel = ['for' => $details['COLUMN_NAME'], 'id' => $details['COLUMN_NAME'] . '_label'];
+        $aLabel = ['for' => $details['COLUMN_NAME'], 'id' => $details['COLUMN_NAME'].'_label'];
         if (isset($features['disabled'])) {
             if (in_array($details['COLUMN_NAME'], $features['disabled'])) {
                 $aLabel = array_merge($aLabel, ['style' => 'color: grey;']);
@@ -186,7 +186,7 @@ 
 
     private function setFldLmtsExact($dTp, $cTp)
     {
-        $xct     = [
+        $xct = [
             'bigint'    => ['l' => -9223372036854775808, 'L' => 999999999999, 's' => 21, 'sUS' => 20],
             'int'       => ['l' => -2147483648, 'L' => 2147483647, 's' => 11, 'sUS' => 10],
             'mediumint' => ['l' => -8388608, 'L' => 8388607, 's' => 9, 'sUS' => 8],
@@ -214,16 +214,16 @@ 
     {
         $btn   = [];
         $btn[] = '<input type="submit" id="submit" style="margin-left:220px;" value="'
-            . $this->lclMsgCmn('i18n_Form_ButtonSave') . '" />';
+            . $this->lclMsgCmn('i18n_Form_ButtonSave').'" />';
         if (isset($feat['insertAndUpdate'])) {
             $btn[] = '<input type="hidden" id="insertAndUpdate" name="insertAndUpdate" value="insertAndUpdate" />';
         }
         if ($hiddenInfo != []) {
             foreach ($hiddenInfo as $key => $value) {
-                $btn[] = '<input type="hidden" id="' . $key . '" name="' . $key . '" value="' . $value . '" />';
+                $btn[] = '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />';
             }
         }
-        return '<div>' . implode('', $btn) . '</div>';
+        return '<div>'.implode('', $btn).'</div>';
     }
 
     /**
@@ -238,7 +238,7 @@ 
             $elC = [$prm['NoOfRows'], $rMap[$prm['returnType']]['r'][0], $rMap[$prm['returnType']]['r'][1]];
             if (filter_var($elC[0], FILTER_VALIDATE_INT, ['min_range' => $elC[1], 'max_range' => $elC[2]]) === false) {
                 $suffix2 = (string) $rMap[$prm['returnType']][2];
-                $msg     = $this->lclMsgCmn('i18n_MySQL_QueryResultExpected' . $suffix2);
+                $msg     = $this->lclMsgCmn('i18n_MySQL_QueryResultExpected'.$suffix2);
                 return [false, sprintf($msg, $prm['NoOfColumns'])];
             }
             $elR = [$prm['NoOfColumns'], $rMap[$prm['returnType']]['c'][0], $rMap[$prm['returnType']]['c'][1]];
@@ -246,10 +246,10 @@ 
                 return [true, ''];
             }
             $suffix1 = (string) $rMap[$prm['returnType']][1];
-            $msg     = $this->lclMsgCmn('i18n_MySQL_QueryResultExpected' . $suffix1);
+            $msg     = $this->lclMsgCmn('i18n_MySQL_QueryResultExpected'.$suffix1);
             return [false, sprintf($msg, $prm['NoOfColumns'])];
         }
-        return [false, $prm['returnType'] . ' is not defined!'];
+        return [false, $prm['returnType'].' is not defined!'];
     }
 
     private function setMySQLqueryValidationMap()

source/MySQLiByDanielGPtypes.php

Spacing +4 added lines, -4 removed lines

@@ -68,11 +68,11 @@ 
      */
     private function listOfMySQLqueryLanguageType($qType)
     {
-        $keyForReturn = 'Type ' . $qType . ' stands for';
+        $keyForReturn = 'Type '.$qType.' stands for';
         $vMap         = ['DCL', 'DDL', 'DML', 'DQL', 'DTL'];
         if (in_array($qType, $vMap)) {
             $valForReturn = $this->readTypeFromJsonFile('MySQLiLanguageTypes')[$qType];
-            return [$keyForReturn => $valForReturn[0] . ' (' . $valForReturn[1] . ')'];
+            return [$keyForReturn => $valForReturn[0].' ('.$valForReturn[1].')'];
         }
         return [$keyForReturn => 'unknown'];
     }
@@ -102,10 +102,10 @@ 
      */
     private function readTypeFromJsonFile($fileBaseName)
     {
-        $fName = __DIR__ . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . $fileBaseName . '.min.json';
+        $fName = __DIR__.DIRECTORY_SEPARATOR.'json'.DIRECTORY_SEPARATOR.$fileBaseName.'.min.json';
         $fJson = fopen($fName, 'r');
         if ($fJson === false) {
-            throw new \Exception('Unable to read file ' . $fName);
+            throw new \Exception('Unable to read file '.$fName);
         }
         $jSonContent = fread($fJson, filesize($fName));
         fclose($fJson);

source/DomPaginationByDanielGP.php

Spacing +11 added lines, -11 removed lines

@@ -85,7 +85,7 @@ 
                 'class'    => 'input_readonly',
                 'value'    => $sDefaultValue,
             ];
-            return $this->setStringIntoShortTag('input', $inputFeatures) . $aElements[$sDefaultValue];
+            return $this->setStringIntoShortTag('input', $inputFeatures).$aElements[$sDefaultValue];
         }
         return $this->setArrayToSelectNotReadOnly($aElements, $sDefaultValue, $selectName, $featArray);
     }
@@ -122,21 +122,21 @@ 
         $sReturn             = null;
         $iRecPrPg            = min($inRecPrPg, $iAllRec);
         $iStartingPageRecord = $this->setStartingPageRecord($iCrtPgNo, $iRecPrPg, $iAllRec, $bKpFlPg);
-        $sReturn             .= '<span style="float:left;font-size:smaller;margin-top:1px; margin-right:1px;">'
+        $sReturn .= '<span style="float:left;font-size:smaller;margin-top:1px; margin-right:1px;">'
             . $this->setStringIntoTag($iAllRec, 'b')
             . $this->lclMsgCmn('i18n_RecordsAvailableNowDisplaying')
             . $this->setStringIntoTag(($iStartingPageRecord + 1), 'b')
-            . ' - ' . $this->setStringIntoTag(min($iAllRec, ($iStartingPageRecord + $iRecPrPg)), 'b')
+            . ' - '.$this->setStringIntoTag(min($iAllRec, ($iStartingPageRecord + $iRecPrPg)), 'b')
             . ' </span>';
         switch ($iCrtPgNo) {
             case 'first':
-                $iCrtPgNo = ceil(($iStartingPageRecord + 1 ) / $iRecPrPg);
+                $iCrtPgNo = ceil(($iStartingPageRecord + 1) / $iRecPrPg);
                 break;
             case 'last':
                 $iCrtPgNo = ceil($iAllRec / $iRecPrPg);
                 break;
         }
-        $sReturn              .= '<span style="float:right;font-size:smaller;margin-top:1px; margin-right:1px;">';
+        $sReturn .= '<span style="float:right;font-size:smaller;margin-top:1px; margin-right:1px;">';
         $iNumberOfPages       = ceil($iAllRec / $iRecPrPg);
         $sAdditionalArguments = '';
         if (isset($_GET)) {
@@ -150,7 +150,7 @@ 
         }
         if ($iCrtPgNo != 1) {
             $sReturn .= $this->setStringIntoTag($this->lclMsgCmn('i18n_Previous'), 'a', [
-                'href'  => ('?page=' . ($iCrtPgNo - 1 ) . $sAdditionalArguments ),
+                'href'  => ('?page='.($iCrtPgNo - 1).$sAdditionalArguments),
                 'class' => 'pagination'
             ]);
         } else {
@@ -162,7 +162,7 @@ 
         for ($counter = 1; $counter <= $iNumberOfPages; $counter++) {
             $pages2display[$counter] = $counter;
         }
-        $sReturn .= '<span class="pagination"><form method="get" action="' . $_SERVER['SCRIPT_NAME'] . '">';
+        $sReturn .= '<span class="pagination"><form method="get" action="'.$_SERVER['SCRIPT_NAME'].'">';
         $sReturn .= $this->setArrayToSelect($pages2display, @$_REQUEST['page']
             , 'page', ['size' => 1, 'autosubmit', 'id_no' => mt_rand()]);
         if (isset($_GET)) {
@@ -172,7 +172,7 @@ 
                         foreach ($value as $value2) {
                             $sReturn .= $this->setStringIntoShortTag('input', [
                                 'type'  => 'hidden',
-                                'name'  => $key . '[]',
+                                'name'  => $key.'[]',
                                 'value' => $value2,
                             ]);
                         }
@@ -189,7 +189,7 @@ 
         $sReturn .= '</form></span>';
         if ($iCrtPgNo != $iNumberOfPages) {
             $sReturn .= $this->setStringIntoTag($this->lclMsgCmn('i18n_Next'), 'a', [
-                'href'  => ('?page=' . ($iCrtPgNo + 1 ) . $sAdditionalArguments ),
+                'href'  => ('?page='.($iCrtPgNo + 1).$sAdditionalArguments),
                 'class' => 'pagination',
             ]);
         } else {
@@ -215,7 +215,7 @@ 
         , $iAllRecords, $bKeepFullPage = true)
     {
         if (isset($_REQUEST['page'])) {
-            $iStartingPageRecord = ($_REQUEST['page'] - 1 ) * $iRecordsPerPage;
+            $iStartingPageRecord = ($_REQUEST['page'] - 1) * $iRecordsPerPage;
         } else {
             switch ($sDefaultPageNo) {
                 case 'last':
@@ -227,7 +227,7 @@ 
                     break;
             }
         }
-        if (($bKeepFullPage ) && (($iStartingPageRecord + $iRecordsPerPage ) > $iAllRecords)) {
+        if (($bKeepFullPage) && (($iStartingPageRecord + $iRecordsPerPage) > $iAllRecords)) {
             $iStartingPageRecord = $iAllRecords - $iRecordsPerPage;
         }
         return max(0, $iStartingPageRecord);

source/DomDynamicSelectByDanielGP.php

Spacing +11 added lines, -11 removed lines

@@ -99,7 +99,7 @@ 
             $sReturn[] = 'submit();';
         }
         if ($sReturn != []) {
-            return ' onchange="javascript:' . implode('', $sReturn) . '"';
+            return ' onchange="javascript:'.implode('', $sReturn).'"';
         }
         return '';
     }
@@ -116,7 +116,7 @@ 
         ];
         if (array_key_exists($identifier, $featArray)) {
             if (is_null($translation[$identifier])) {
-                return ' ' . $identifier . '="' . $featArray[$identifier] . '"';
+                return ' '.$identifier.'="'.$featArray[$identifier].'"';
             }
             return $translation[$identifier];
         }
@@ -141,15 +141,15 @@ 
             $ftArray = [];
         }
         $featArray = $this->normalizeFeatureArray($ftArray);
-        return '<select name="' . $selectName . '" '
-            . 'id="' . $this->buildSelectId($selectName, $featArray) . '" '
-            . 'size="' . $this->calculateSelectOptionsSize($aElements, $featArray) . '"'
+        return '<select name="'.$selectName.'" '
+            . 'id="'.$this->buildSelectId($selectName, $featArray).'" '
+            . 'size="'.$this->calculateSelectOptionsSize($aElements, $featArray).'"'
             . $this->eventOnChange($featArray)
             . $this->featureArraySimpleTranslated($featArray, 'disabled')
             . $this->featureArraySimpleTranslated($featArray, 'hidden')
             . $this->featureArraySimpleTranslated($featArray, 'multiselect')
             . $this->featureArraySimpleTranslated($featArray, 'style')
-            . '>' . $this->setOptionsForSelect($aElements, $sDefaultValue, $featArray) . '</select>';
+            . '>'.$this->setOptionsForSelect($aElements, $sDefaultValue, $featArray).'</select>';
     }
 
     private function setOptionGroupEnd($crtGroup, $featArray)
@@ -170,7 +170,7 @@ 
             if ($crtGroup != $tempString) {
                 $sReturn[] = $this->setOptionGroupEnd($crtGroup, $featArray);
                 $crtGroup  = $tempString;
-                $sReturn[] = '<optgroup label="' . str_replace($featArray['grouping'], '', $crtGroup) . '">';
+                $sReturn[] = '<optgroup label="'.str_replace($featArray['grouping'], '', $crtGroup).'">';
             }
         }
         return ['crtGroup' => $crtGroup, 'groupFooterHeader' => implode('', $sReturn)];
@@ -207,12 +207,12 @@ 
             $aFH       = $this->setOptionGroupFooterHeader($featArray, $value, $crtGroup);
             $crtGroup  = $aFH['crtGroup'];
             $sReturn[] = $aFH['groupFooterHeader']
-                . '<option value="' . $key . '"' . $this->setOptionSelected($key, $sDefaultValue)
-                . $this->featureArraySimpleTranslated($featArray, 'styleForOption') . '>'
-                . str_replace(['&', $crtGroup], ['&amp;', ''], $value) . '</option>';
+                . '<option value="'.$key.'"'.$this->setOptionSelected($key, $sDefaultValue)
+                . $this->featureArraySimpleTranslated($featArray, 'styleForOption').'>'
+                . str_replace(['&', $crtGroup], ['&amp;', ''], $value).'</option>';
         }
         $sReturn[] = $this->setOptionGroupEnd($crtGroup, $featArray);
-        return $this->featureArraySimpleTranslated($featArray, 'include_null') . implode('', $sReturn);
+        return $this->featureArraySimpleTranslated($featArray, 'include_null').implode('', $sReturn);
     }
 
 }

source/MySQLiAdvancedOutput.php

Spacing +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
         }
         $vlSlct    = explode(',', $this->getFieldValue($val));
         $slctOptns = $this->getSetOrEnum2Array($tblSrc, $val['COLUMN_NAME']);
-        return $this->setArrayToSelect($slctOptns, $vlSlct, $val['COLUMN_NAME'] . $adnlThings['suffix'], $inAdtnl);
+        return $this->setArrayToSelect($slctOptns, $vlSlct, $val['COLUMN_NAME'].$adnlThings['suffix'], $inAdtnl);
     }
 
     /**
@@ -105,7 +105,7 @@ 
         if ($iar !== []) {
             $inAdtnl = array_merge($inAdtnl, $iar);
         }
-        return '<b>' . $this->getFieldValue($value) . '</b>' . $this->setStringIntoShortTag('input', $inAdtnl);
+        return '<b>'.$this->getFieldValue($value).'</b>'.$this->setStringIntoShortTag('input', $inAdtnl);
     }
 
     /**
@@ -118,8 +118,8 @@ 
      */
     private function getFieldOutputNumericNonFK($fkArray, $value, $iar = [])
     {
-        $query         = $this->sQueryGenericSelectKeyValue([
-            '`' . $value['COLUMN_NAME'] . '`',
+        $query = $this->sQueryGenericSelectKeyValue([
+            '`'.$value['COLUMN_NAME'].'`',
             $fkArray[$value['COLUMN_NAME']][2],
             $fkArray[$value['COLUMN_NAME']][0],
         ]);
@@ -260,7 +260,7 @@ 
                 if ($val[$cnm[0]] == $oCol) {
                     $vlQ        = array_merge($val, ['LIMIT' => 2]);
                     $tFd        = $this->setMySQLquery2Server($this->getForeignKeysQuery($vlQ), $cnm[1])['result'];
-                    $tgtFld     = '`' . ($tFd[0][$cnm[0]] == $val[$cnm[0]] ? $tFd[1][$cnm[0]] : $tFd[0][$cnm[0]]) . '`';
+                    $tgtFld     = '`'.($tFd[0][$cnm[0]] == $val[$cnm[0]] ? $tFd[1][$cnm[0]] : $tFd[0][$cnm[0]]).'`';
                     $aRt[$oCol] = [$this->glueDbTb($val[$cnm[2]], $val[$cnm[3]]), $val[$cnm[2]], $tgtFld];
                 }
             }
@@ -311,7 +311,7 @@ 
                 $inM = $this->setStringIntoTag($mCN[$dtl['COLUMN_NAME']], 'span', ['style' => 'font-style:italic;']);
             }
         }
-        $lbl = '<span class="fake_label">' . $this->getFieldNameForDisplay($dtl) . '</span>';
+        $lbl = '<span class="fake_label">'.$this->getFieldNameForDisplay($dtl).'</span>';
         return ['label' => $lbl, 'input' => $inM];
     }
 
@@ -327,7 +327,7 @@ 
         } elseif (in_array($dtls['DATA_TYPE'], ['date', 'datetime', 'time', 'timestamp', 'year'])) {
             $sReturn = $this->setNeededFieldSingleType($tblName, $dtls, $iar);
         }
-        return $this->getFieldCompletionType($dtls) . $sReturn;
+        return $this->getFieldCompletionType($dtls).$sReturn;
     }
 
     private function setNeededFieldSingleType($tblName, $dtls, $iar)

source/MySQLiByDanielGPqueries.php

Spacing +32 added lines, -32 removed lines

@@ -48,7 +48,7 @@ 
     private function correctTableWithQuotesAsFieldPrefix($referenceTable)
     {
         if ($referenceTable != '') {
-            return '`' . str_replace('`', '', $referenceTable) . '`.';
+            return '`'.str_replace('`', '', $referenceTable).'`.';
         }
         return '';
     }
@@ -81,7 +81,7 @@ 
     private function sGlueFilterValIntoWhereStr($filterValue)
     {
         if (is_array($filterValue)) {
-            return 'IN ("' . implode('", "', $filterValue) . '")';
+            return 'IN ("'.implode('", "', $filterValue).'")';
         }
         return $this->sGlueFilterValueIntoWhereStringFinal($filterValue);
     }
@@ -94,13 +94,13 @@ 
             'NOT NULL|NULL',
         ];
         if (in_array($filterValue, explode('|', $kFields[0]))) {
-            return '= ' . $filterValue;
+            return '= '.$filterValue;
         } elseif (in_array($filterValue, explode('|', $kFields[1]))) {
             return $filterValue;
         } elseif (in_array($filterValue, explode('|', $kFields[2]))) {
-            return 'IS ' . $filterValue;
+            return 'IS '.$filterValue;
         }
-        return '= "' . $filterValue . '"';
+        return '= "'.$filterValue.'"';
     }
 
     /**
@@ -111,7 +111,7 @@ 
      */
     private function sGlueFiltersIntoWhereArrayFilter($filters)
     {
-        return '(' . implode(') AND (', $filters) . ')';
+        return '('.implode(') AND (', $filters).')';
     }
 
     /**
@@ -129,7 +129,7 @@ 
         $fltr = [];
         unset($filterArray['LIMIT']);
         foreach ($filterArray as $key => $value) {
-            $fltr[] = '`' . $tableToApplyFilterTo . '`.`' . $key . '` ' . $this->sGlueFilterValIntoWhereStr($value);
+            $fltr[] = '`'.$tableToApplyFilterTo.'`.`'.$key.'` '.$this->sGlueFilterValIntoWhereStr($value);
         }
         return $this->sManageDynamicFiltersFinal($fltr);
     }
@@ -138,7 +138,7 @@ 
     {
         if (count($filters) > 0) {
             $sReturn = ['WHERE', $this->sGlueFiltersIntoWhereArrayFilter($filters)];
-            return implode(' ', $sReturn) . ' ';
+            return implode(' ', $sReturn).' ';
         }
         return '';
     }
@@ -159,13 +159,13 @@ 
         $filterArray = (is_array($filterArray) ? $filterArray : ['' => '']);
         return 'SELECT '
             . '`C`.`TABLE_SCHEMA`, '
-            . $this->sQueryMySqlColumnsColumns() . ' '
+            . $this->sQueryMySqlColumnsColumns().' '
             . 'FROM `information_schema`.`COLUMNS` `C` '
-            . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON ((' . implode(') AND (', [
+            . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON (('.implode(') AND (', [
                 '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`',
                 '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`',
                 '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`',
-            ]) . ')) '
+            ]).')) '
             . $this->sManageDynamicFilters($filterArray, 'C')
             . 'GROUP BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`COLUMN_NAME` '
             . 'ORDER BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`ORDINAL_POSITION` '
@@ -192,20 +192,20 @@ 
     {
         return 'SELECT '
             . '`KCU`.`CONSTRAINT_SCHEMA`, '
-            . $this->sQueryMySqlIndexesColumns() . ' '
+            . $this->sQueryMySqlIndexesColumns().' '
             . 'FROM `information_schema`.`KEY_COLUMN_USAGE` `KCU` '
-            . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON ((' . implode(') AND (', [
+            . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON (('.implode(') AND (', [
                 '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`',
                 '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`',
                 '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`',
-            ]) . ')) '
-            . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON ((' . implode(') AND (', [
+            ]).')) '
+            . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON (('.implode(') AND (', [
                 '`KCU`.`CONSTRAINT_SCHEMA` = `RC`.`CONSTRAINT_SCHEMA`',
                 '`KCU`.`CONSTRAINT_NAME` = `RC`.`CONSTRAINT_NAME`',
-            ]) . ')) '
+            ]).')) '
             . $this->sManageDynamicFilters($filterArray, 'KCU')
             . 'ORDER BY `KCU`.`TABLE_SCHEMA`, `KCU`.`TABLE_NAME`'
-            . $this->xtraSoring($filterArray, 'COLUMN_NAME') . ';';
+            . $this->xtraSoring($filterArray, 'COLUMN_NAME').';';
     }
 
     private function sQueryMySqlIndexesColumns()
@@ -221,23 +221,23 @@ 
     {
         $tblAls  = substr($tblName, 0, 1);
         $colName = (is_null($adtnlCol) ? $tblName : $adtnlFltr);
-        return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`' . $tblName . '` `' . $tblAls . '` '
-            . 'WHERE (`' . $tblAls . '`.`' . $lnkDbCol . '` = `S`.`SCHEMA_NAME`)'
-            . (!is_null($adtnlCol) ? ' AND (`' . $tblAls . '`.`' . $adtnlCol . '` = "' . $adtnlFltr . '")' : '')
-            . ') AS `' . ucwords(strtolower($colName)) . '`';
+        return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`'.$tblName.'` `'.$tblAls.'` '
+            . 'WHERE (`'.$tblAls.'`.`'.$lnkDbCol.'` = `S`.`SCHEMA_NAME`)'
+            . (!is_null($adtnlCol) ? ' AND (`'.$tblAls.'`.`'.$adtnlCol.'` = "'.$adtnlFltr.'")' : '')
+            . ') AS `'.ucwords(strtolower($colName)).'`';
     }
 
     protected function sQueryMySqlStatistics($filterArray = null)
     {
         return 'SELECT '
             . '`S`.`SCHEMA_NAME`, '
-            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE') . ', '
-            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW') . ', '
-            . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA') . ', '
-            . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA') . ', '
-            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function') . ', '
-            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure') . ', '
-            . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA') . ' '
+            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE').', '
+            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW').', '
+            . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA').', '
+            . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA').', '
+            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function').', '
+            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure').', '
+            . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA').' '
             . 'FROM `information_schema`.`SCHEMATA` `S` '
             . 'WHERE (`S`.`SCHEMA_NAME` NOT IN ("information_schema", "mysql", "performance_schema", "sys")) '
             . str_replace('WHERE', 'AND', $this->sManageDynamicFilters($filterArray, 'S'))
@@ -258,7 +258,7 @@ 
             . ', `T`.`CREATE_OPTIONS`, `T`.`TABLE_COMMENT` '
             . 'FROM `information_schema`.`TABLES` `T` '
             . $this->sManageDynamicFilters($filterArray, 'T')
-            . $this->xtraSoring($filterArray, 'TABLE_SCHEMA') . ';';
+            . $this->xtraSoring($filterArray, 'TABLE_SCHEMA').';';
     }
 
     /**
@@ -273,8 +273,8 @@ 
     {
         $filters2 = implode(', ', array_diff($value, ['']));
         if ($filters2 != '') {
-            return '(' . $referenceTable . '`' . $key . '` IN ("'
-                . str_replace(',', '","', str_replace(["'", '"'], '', $filters2)) . '"))';
+            return '('.$referenceTable.'`'.$key.'` IN ("'
+                . str_replace(',', '","', str_replace(["'", '"'], '', $filters2)).'"))';
         }
         return '';
     }
@@ -292,7 +292,7 @@ 
         if ((substr($value, 0, 1) == '%') && (substr($value, -1) == '%')) {
             $fTemp = 'LIKE';
         }
-        return '(`' . $key . '` ' . $fTemp . '"' . $value . '")';
+        return '(`'.$key.'` '.$fTemp.'"'.$value.'")';
     }
 
     private function xtraSoring($filterArray, $filterValueToDecide)

source/MySQLiByDanielGPstructures.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
      */
     protected function getFieldNameForDisplay($details)
     {
-        $tableUniqueId = $details['TABLE_SCHEMA'] . '.' . $details['TABLE_NAME'];
+        $tableUniqueId = $details['TABLE_SCHEMA'].'.'.$details['TABLE_NAME'];
         if ($details['COLUMN_COMMENT'] != '') {
             return $details['COLUMN_COMMENT'];
         } elseif (isset($this->advCache['tableStructureLocales'][$tableUniqueId][$details['COLUMN_NAME']])) {
@@ -85,8 +85,8 @@ 
      */
     protected function getFieldOutputTextFK($foreignKeysArray, $value, $iar)
     {
-        $query   = $this->sQueryGenericSelectKeyValue([
-            '`' . $value['COLUMN_NAME'] . '`',
+        $query = $this->sQueryGenericSelectKeyValue([
+            '`'.$value['COLUMN_NAME'].'`',
             $foreignKeysArray[$value['COLUMN_NAME']][2],
             $foreignKeysArray[$value['COLUMN_NAME']][0]
         ]);