danielgp / common-lib

source/CommonCode.php

Spacing +11 added lines, -11 removed lines

@@ -57,7 +57,7 @@ 
             return $this->setArrayToJson($aReturn);
         }
         $aReturn = $this->getContentFromUrlThroughCurlRawArray($fullURL, $features);
-        return '{ ' . $this->packIntoJson($aReturn, 'info') . ', ' . $this->packIntoJson($aReturn, 'response') . ' }';
+        return '{ '.$this->packIntoJson($aReturn, 'info').', '.$this->packIntoJson($aReturn, 'response').' }';
     }
 
     /**
@@ -117,7 +117,7 @@ 
             return '<div>No MySQL connection detected</div>';
         }
         $afRows = $this->mySQLconnection->affected_rows;
-        return '<div>' . sprintf($this->lclMsgCmnNumber('i18n_Record', 'i18n_Records', $afRows), $afRows) . '</div>';
+        return '<div>'.sprintf($this->lclMsgCmnNumber('i18n_Record', 'i18n_Records', $afRows), $afRows).'</div>';
     }
 
     /**
@@ -189,9 +189,9 @@ 
     private function packIntoJson($aReturn, $keyToWorkWith)
     {
         if ($this->isJsonByDanielGP($aReturn[$keyToWorkWith])) {
-            return '"' . $keyToWorkWith . '": ' . $aReturn[$keyToWorkWith];
+            return '"'.$keyToWorkWith.'": '.$aReturn[$keyToWorkWith];
         }
-        return '"' . $keyToWorkWith . '": {' . $aReturn[$keyToWorkWith] . ' }';
+        return '"'.$keyToWorkWith.'": {'.$aReturn[$keyToWorkWith].' }';
     }
 
     /**
@@ -205,7 +205,7 @@ 
     {
         $postingUrl = filter_var($urlToSendTo, FILTER_VALIDATE_URL);
         if ($postingUrl === false) {
-            throw new \Exception('Invalid URL in ' . __FUNCTION__);
+            throw new \Exception('Invalid URL in '.__FUNCTION__);
         }
         if (is_array($params)) {
             $cntFailErrMsg = $this->lclMsgCmn('i18n_Error_FailedToConnect');
@@ -225,7 +225,7 @@ 
         }
         $flPointer = fsockopen($pUrlParts['host'], $postingPort, $erN, $erM, 30);
         if ($flPointer === false) {
-            throw new \Exception($cntFailErrMsg . ': ' . $erN . ' (' . $erM . ')');
+            throw new \Exception($cntFailErrMsg.': '.$erN.' ('.$erM.')');
         }
         fwrite($flPointer, $this->sendBackgroundPrepareData($pUrlParts, $postingString));
         fclose($flPointer);
@@ -235,12 +235,12 @@ 
     {
         $this->initializeSprGlbAndSession();
         $out   = [];
-        $out[] = 'POST ' . $pUrlParts['path'] . ' ' . $this->tCmnSuperGlobals->server->get['SERVER_PROTOCOL'];
-        $out[] = 'Host: ' . $pUrlParts['host'];
-        $out[] = 'User-Agent: ' . $this->getUserAgentByCommonLib();
+        $out[] = 'POST '.$pUrlParts['path'].' '.$this->tCmnSuperGlobals->server->get['SERVER_PROTOCOL'];
+        $out[] = 'Host: '.$pUrlParts['host'];
+        $out[] = 'User-Agent: '.$this->getUserAgentByCommonLib();
         $out[] = 'Content-Type: application/x-www-form-urlencoded';
-        $out[] = 'Content-Length: ' . strlen($postingString);
-        $out[] = 'Connection: Close' . "\r\n";
+        $out[] = 'Content-Length: '.strlen($postingString);
+        $out[] = 'Connection: Close'."\r\n";
         $out[] = $postingString;
         return implode("\r\n", $out);
     }

source/CommonViews.php

Spacing +8 added lines, -8 removed lines

@@ -52,8 +52,8 @@ 
         if ($dtl['COLUMN_NAME'] == 'host') {
             $inVl = gethostbyaddr($this->tCmnRequest->server->get('REMOTE_ADDR'));
             return [
-                'label' => '<label for="' . $dtl['COLUMN_NAME'] . '">Numele calculatorului</label>',
-                'input' => '<input type="text" name="host" size="15" readonly value="' . $inVl . '" />',
+                'label' => '<label for="'.$dtl['COLUMN_NAME'].'">Numele calculatorului</label>',
+                'input' => '<input type="text" name="host" size="15" readonly value="'.$inVl.'" />',
             ];
         }
         $result = $this->setFieldInput($tableSource, $dtl, $features);
@@ -72,7 +72,7 @@ 
     {
         if ($dtl['COLUMN_NAME'] == 'ChoiceId') {
             return '<input type="text" name="ChoiceId" value="'
-                    . $this->tCmnRequest->request->get($dtl['COLUMN_NAME']) . '" />';
+                    . $this->tCmnRequest->request->get($dtl['COLUMN_NAME']).'" />';
         }
         return $this->setNeededFieldByType($tableSource, $dtl, $features);
     }
@@ -100,7 +100,7 @@ 
             }
         }
         $frmFtrs = ['id' => $feat['id'], 'action' => $feat['action'], 'method' => $feat['method']];
-        return $this->setStringIntoTag(implode('', $sReturn) . $this->setFormButtons($feat, $hdnInf), 'form', $frmFtrs)
+        return $this->setStringIntoTag(implode('', $sReturn).$this->setFormButtons($feat, $hdnInf), 'form', $frmFtrs)
                 . $this->setFormJavascriptFinal($feat['id']);
     }
 
@@ -147,10 +147,10 @@ 
     {
         $sReturn = $this->setField($tableSource, $details, $features, $fieldLabel);
         $lmts    = $this->setFieldNumbers($details);
-        return '<div>' . $sReturn['label']
+        return '<div>'.$sReturn['label']
                 . $this->setStringIntoTag($sReturn['input'], 'span', ['class' => 'labell'])
                 . '<span style="font-size:x-small;font-style:italic;">&nbsp;(max. '
-                . $lmts['M'] . (isset($lmts['d']) ? ' w. ' . $lmts['d'] . ' decimals' : '') . ')</span>'
+                . $lmts['M'].(isset($lmts['d']) ? ' w. '.$lmts['d'].' decimals' : '').')</span>'
                 . '</div>';
     }
 
@@ -176,7 +176,7 @@ 
             '$(this).remove();',
             '});',
         ]));
-        return '<div id="DeleteFeedback">' . $sReturn . '</div>' . $finalJavascript;
+        return '<div id="DeleteFeedback">'.$sReturn.'</div>'.$finalJavascript;
     }
 
     /**
@@ -196,7 +196,7 @@ 
             $idFldVal = $this->tCmnSuperGlobals->query->get($idn);
             $this->setMySQLquery2Server($this->sQueryToDeleteSingleIdentifier([$tbl, $idn, $idFldVal]));
             $sReturn  = $this->setFeedbackModern('error', $tMsg['Confirmation'], $tMsg['Failed'])
-                    . '(' . $this->mySQLconnection->error . ')';
+                    . '('.$this->mySQLconnection->error.')';
             if ($this->mySQLconnection->affected_rows > 0) {
                 $sReturn = $this->setFeedbackModern('check', $tMsg['Confirmation'], $tMsg['Success']);
             }

source/MySQLiAdvancedOutput.php

Spacing +8 added lines, -8 removed lines

@@ -65,7 +65,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']])) {
@@ -95,7 +95,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);
     }
 
     /**
@@ -141,7 +141,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);
     }
 
     /**
@@ -154,8 +154,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],
         ]);
@@ -296,7 +296,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];
                 }
             }
@@ -347,7 +347,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];
     }
 
@@ -363,7 +363,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/MySQLiMultipleExecution.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
      */
     protected function glueDbTb($dbName, $tbName)
     {
-        return '`' . $dbName . '`.`' . $tbName . '`';
+        return '`'.$dbName.'`.`'.$tbName.'`';
     }
 
     /**
@@ -154,7 +154,7 @@ 
      */
     private function handleFeaturesSingle($fieldName, $features, $featureKey)
     {
-        $fMap    = [
+        $fMap = [
             'readonly' => ['readonly', 'class', 'input_readonly'],
             'disabled' => ['disabled']
         ];

source/CommonBasic.php

Spacing +4 added lines, -4 removed lines

@@ -73,14 +73,14 @@ 
             'File Group'             => $info->getGroup(),
             'File Inode'             => $info->getInode(),
             'File Link Target'       => ($info->isLink() ? $info->getLinkTarget() : '-'),
-            'File Name'              => $info->getBasename('.' . $info->getExtension()),
+            'File Name'              => $info->getBasename('.'.$info->getExtension()),
             'File Name w. Extension' => $info->getFilename(),
             'File Owner'             => $info->getOwner(),
             'File Path'              => $info->getPath(),
             'Name'                   => $info->getRealPath(),
             'Type'                   => $info->getType(),
         ];
-        $aDetails          = array_merge($aFileBasicDetails, $this->getFileDetailsRawStatistic($info, $fileGiven));
+        $aDetails = array_merge($aFileBasicDetails, $this->getFileDetailsRawStatistic($info, $fileGiven));
         ksort($aDetails);
         return $aDetails;
     }
@@ -127,8 +127,8 @@ 
         $sFiles     = [];
         foreach ($iterator as $file) {
             $relativePathFile = str_replace($sourcePath, '', $file->getRealPath());
-            if (!file_exists($targetPath . $relativePathFile)) {
-                $sFiles[$relativePathFile] = $targetPath . $relativePathFile;
+            if (!file_exists($targetPath.$relativePathFile)) {
+                $sFiles[$relativePathFile] = $targetPath.$relativePathFile;
             }
         }
         return $this->setArrayToJson($sFiles);

source/MySQLiByDanielGP.php

Spacing +3 added lines, -3 removed lines

@@ -88,11 +88,11 @@ 
             'size'      => 10,
             'maxlength' => 10,
             'onfocus'   => implode('', [
-                'javascript:NewCssCal(\'' . $value['COLUMN_NAME'],
+                'javascript:NewCssCal(\''.$value['COLUMN_NAME'],
                 '\',\'yyyyMMdd\',\'dropdown\',false,\'24\',false);',
             ]),
         ];
-        return $this->setStringIntoShortTag('input', $inA) . $this->setCalendarControl($value['COLUMN_NAME']);
+        return $this->setStringIntoShortTag('input', $inA).$this->setCalendarControl($value['COLUMN_NAME']);
     }
 
     /**
@@ -181,7 +181,7 @@ 
                 return [$line[0], $line[1]];
             // intentionally left open
             case 'array_key2_value':
-                return [$line[0] . '@' . $line[1], $line[1]];
+                return [$line[0].'@'.$line[1], $line[1]];
             // intentionally left open
             case 'array_numbered':
                 return [$counter, $line[0]];

source/MySQLiByDanielGPstructures.php

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
     private function correctTableWithQuotesAsFieldPrefix($referenceTable)
     {
         if ($referenceTable != '') {
-            return '`' . str_replace('`', '', $referenceTable) . '`.';
+            return '`'.str_replace('`', '', $referenceTable).'`.';
         }
         return '';
     }
@@ -64,8 +64,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]
         ]);
@@ -280,8 +280,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 '';
     }
@@ -299,7 +299,7 @@ 
         if ((substr($value, 0, 1) == '%') && (substr($value, -1) == '%')) {
             $fTemp = 'LIKE';
         }
-        return '(`' . $key . '` ' . $fTemp . '"' . $value . '")';
+        return '(`'.$key.'` '.$fTemp.'"'.$value.'")';
     }
 
     /**

source/MySQLiByDanielGPqueriesBasic.php

Spacing +7 added lines, -7 removed lines

@@ -54,13 +54,13 @@ 
         $this->sCleanParameters($parameters);
         return implode(' ', [
             'SELECT',
-            $parameters[0] . ', ' . $parameters[1],
+            $parameters[0].', '.$parameters[1],
             'FROM',
             $parameters[2],
             'GROUP BY',
             $parameters[0],
             'ORDER BY',
-            $parameters[1] . ';'
+            $parameters[1].';'
         ]);
     }
 
@@ -74,7 +74,7 @@ 
     {
         $sDBs = 'WHERE '
             . '`SCHEMA_NAME` NOT IN ("'
-            . implode('", "', ['information_schema', 'mysql', 'performance_schema', 'sys']) . '") ';
+            . implode('", "', ['information_schema', 'mysql', 'performance_schema', 'sys']).'") ';
         return 'SELECT '
             . '`SCHEMA_NAME` As `Db`, `DEFAULT_CHARACTER_SET_NAME` AS `DbCharset`, '
             . '`DEFAULT_COLLATION_NAME` AS `DbCollation` '
@@ -128,16 +128,16 @@ 
     {
         $this->sCleanParameters($parameters);
         return 'SELECT * '
-            . 'FROM `' . $parameters[0] . '` '
-            . 'WHERE ' . $parameters[1] . ';';
+            . 'FROM `'.$parameters[0].'` '
+            . 'WHERE '.$parameters[1].';';
     }
 
     protected function sQueryToDeleteSingleIdentifier($parameters)
     {
         $this->sCleanParameters($parameters);
         return 'DELETE '
-            . 'FROM `' . $parameters[0] . '` '
-            . 'WHERE `' . $parameters[1] . '` = "' . $parameters[2] . '";';
+            . 'FROM `'.$parameters[0].'` '
+            . 'WHERE `'.$parameters[1].'` = "'.$parameters[2].'";';
     }
 
 }

source/MySQLiByDanielGPqueries.php

Spacing +28 added lines, -28 removed lines

@@ -66,7 +66,7 @@ 
     private function sGlueFilterValIntoWhereStr($filterValue)
     {
         if (is_array($filterValue)) {
-            return 'IN ("' . implode('", "', $filterValue) . '")';
+            return 'IN ("'.implode('", "', $filterValue).'")';
         }
         return $this->sGlueFilterValueIntoWhereStringFinal($filterValue);
     }
@@ -79,13 +79,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.'"';
     }
 
     /**
@@ -96,7 +96,7 @@ 
      */
     private function sGlueFiltersIntoWhereArrayFilter($filters)
     {
-        return '(' . implode(') AND (', $filters) . ')';
+        return '('.implode(') AND (', $filters).')';
     }
 
     /**
@@ -115,7 +115,7 @@ 
         if (is_array($filterArray)) {
             unset($filterArray['LIMIT']);
             foreach ($filterArray as $key => $value) {
-                $fltr[] = '`' . $tableToApplyFilterTo . '`.`' . $key . '` ' . $this->sGlueFilterValIntoWhereStr($value);
+                $fltr[] = '`'.$tableToApplyFilterTo.'`.`'.$key.'` '.$this->sGlueFilterValIntoWhereStr($value);
             }
         }
         return $this->sManageDynamicFiltersFinal($fltr);
@@ -125,7 +125,7 @@ 
     {
         if (count($filters) > 0) {
             $sReturn = ['WHERE', $this->sGlueFiltersIntoWhereArrayFilter($filters)];
-            return implode(' ', $sReturn) . ' ';
+            return implode(' ', $sReturn).' ';
         }
         return '';
     }
@@ -146,13 +146,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` '
@@ -179,20 +179,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()
@@ -208,23 +208,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'))
@@ -245,7 +245,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').';';
     }
 
     private function xtraSoring($filterArray, $filterValueToDecide)