diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php
index a6d877608e..67bf0c26cc 100644
--- a/libraries/DbSearch.class.php
+++ b/libraries/DbSearch.class.php
@@ -361,7 +361,7 @@ class PMA_DbSearch
                 . __('Delete') . '</a></td>';
         } else {
             $html_output .= '<td>&nbsp;</td>'
-                .'<td>&nbsp;</td>';
+                . '<td>&nbsp;</td>';
         }// end if else
         $html_output .= '</tr>';
         return $html_output;
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index c6fb569831..8973afbc23 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -404,7 +404,7 @@ class PMA_Index
                  . (($this->_choice == $each_index_choice)
                  ? ' selected="selected"'
                  : '')
-                 . '>'. $each_index_choice . '</option>' . "\n";
+                 . '>' . $each_index_choice . '</option>' . "\n";
         }
 
         return $html_options;
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index a6c8a5f6e7..5457647d95 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -381,7 +381,7 @@ class PMA_Theme
     public function getPrintPreview()
     {
         $url_params = array('set_theme' => $this->getId());
-        $url = 'index.php'. PMA_URL_getCommon($url_params);
+        $url = 'index.php' . PMA_URL_getCommon($url_params);
 
         $retval  = '<div class="theme_preview">';
         $retval .= '<h2>';
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 10adc2e107..6a5de43bcc 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -61,7 +61,7 @@ function PMA_Bookmark_getList($db)
         return array();
     }
 
-    $query  = 'SELECT label, id FROM '. PMA_Util::backquote($cfgBookmark['db'])
+    $query  = 'SELECT label, id FROM ' . PMA_Util::backquote($cfgBookmark['db'])
         . '.' . PMA_Util::backquote($cfgBookmark['table'])
         . ' WHERE dbase = \'' . PMA_Util::sqlAddSlashes($db) . '\''
         . ' AND user = \'' . PMA_Util::sqlAddSlashes($cfgBookmark['user']) . '\''
@@ -70,7 +70,7 @@ function PMA_Bookmark_getList($db)
         $query, 'id', 'label', $controllink, PMA_DatabaseInterface::QUERY_STORE
     );
 
-    $query  = 'SELECT label, id FROM '. PMA_Util::backquote($cfgBookmark['db'])
+    $query  = 'SELECT label, id FROM ' . PMA_Util::backquote($cfgBookmark['db'])
         . '.' . PMA_Util::backquote($cfgBookmark['table'])
         . ' WHERE dbase = \'' . PMA_Util::sqlAddSlashes($db) . '\''
         . ' AND user = \'\''
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 425d13c15c..2662719dc9 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -28,7 +28,7 @@ if ($is_create_db_priv) {
     $html .= '<input type="hidden" name="reload" value="1" />';
     $html .= '<input type="text" name="new_db" value="' . $db_to_create
         . '" maxlength="64" class="textfield" id="text_create_db" '
-        . 'required placeholder="'.__('Database name').'"/>';
+        . 'required placeholder="' . __('Database name') . '"/>';
 
     include_once './libraries/mysql_charsets.inc.php';
     $html .= PMA_generateCharsetDropdownBox(
@@ -44,7 +44,7 @@ if ($is_create_db_priv) {
         $html .= '<input type="hidden" name="dbstats" value="1" />';
     }
 
-    $html .= '<input type="submit" value="' . __('Create') .'" id="buttonGo" />';
+    $html .= '<input type="submit" value="' . __('Create') . '" id="buttonGo" />';
     $html .= '</form>';
 } else {
     $html .= '<!-- db creation no privileges message -->';
@@ -58,6 +58,6 @@ if ($is_create_db_priv) {
             '',
             array('hspace' => 2, 'border' => 0, 'align' => 'middle')
         )
-        . '' . __('No Privileges') .'</span>';
+        . '' . __('No Privileges') . '</span>';
 } // end create db form or message
 ?>
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index d3a897a629..49cb47873c 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -291,7 +291,7 @@ function PMA_getHtmlForExportOptionsFormat($export_list)
         __('SQL compatibility mode'), 'mysql', '50027', '14515'
     );
     global $cfg;
-    $html .= '<input type="submit" value="' . __('Go') . '" id="buttonGo" onclick="check_time_out('.$cfg['ExecTimeLimit'].')"/>';
+    $html .= '<input type="submit" value="' . __('Go') . '" id="buttonGo" onclick="check_time_out(' . $cfg['ExecTimeLimit'] . ')"/>';
     $html .= '</div>';
 
     return $html;
@@ -465,7 +465,7 @@ function PMA_getHtmlForExportOptionsOutputFormat($export_type)
     $msg->addParam($trans);
     $doc_url = PMA_Util::getDocuLink('faq', 'faq6-27');
     $msg->addParam(
-        '<a href="'. $doc_url . '" target="documentation">',
+        '<a href="' . $doc_url . '" target="documentation">',
         false
     );
     $msg->addParam('</a>', false);
diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php
index 306e88bca4..bdb8d33ed3 100644
--- a/libraries/gis/pma_gis_linestring.php
+++ b/libraries/gis/pma_gis_linestring.php
@@ -252,7 +252,7 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
                 ? $gis_data[$index]['LINESTRING'][$i]['x'] : $empty)
                 . ' ' . ((isset($gis_data[$index]['LINESTRING'][$i]['y'])
                 && trim($gis_data[$index]['LINESTRING'][$i]['y']) != '')
-                ? $gis_data[$index]['LINESTRING'][$i]['y'] : $empty) .',';
+                ? $gis_data[$index]['LINESTRING'][$i]['y'] : $empty) . ',';
         }
         $wkt = substr($wkt, 0, strlen($wkt) - 1);
         $wkt .= ')';
diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php
index e434e0c26c..0722f7f1a4 100644
--- a/libraries/gis/pma_gis_point.php
+++ b/libraries/gis/pma_gis_point.php
@@ -217,7 +217,7 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
 
         if ($points_arr[0][0] != '' && $points_arr[0][1] != '') {
             $result .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
-                . $this->getPointForOpenLayers($points_arr[0], $srid). ', null, '
+                . $this->getPointForOpenLayers($points_arr[0], $srid) . ', null, '
                 . json_encode($style_options) . '));';
         }
         return $result;
diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php
index 85f0e289bf..20fd75f881 100644
--- a/libraries/gis/pma_gis_visualization.php
+++ b/libraries/gis/pma_gis_visualization.php
@@ -256,7 +256,7 @@ class PMA_GIS_Visualization
 
         // base64 encode
         $encoded = base64_encode($output);
-        return '<img src="data:image/png;base64,'. $encoded .'" />';
+        return '<img src="data:image/png;base64,' . $encoded . '" />';
     }
 
     /**
diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php
index 7a445ab693..c791fd740d 100644
--- a/libraries/navigation/Nodes/Node_Database.class.php
+++ b/libraries/navigation/Nodes/Node_Database.class.php
@@ -302,7 +302,7 @@ class Node_Database extends Node
                 . "." . PMA_Util::backquote($cfgRelation['navigationhiding']);
             $sqlQuery = "SELECT COUNT(*) FROM " . $navTable
                 . " WHERE `username`='"
-                . PMA_Util::sqlAddSlashes($GLOBALS['cfg']['Server']['user']) ."'"
+                . PMA_Util::sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . "'"
                 . " AND `db_name`='" . PMA_Util::sqlAddSlashes($db) . "'";
             $count = $GLOBALS['dbi']->fetchValue(
                 $sqlQuery, 0, 0, $GLOBALS['controllink']
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
index 08ff2b16b7..e127d45c48 100644
--- a/libraries/opendocument.lib.php
+++ b/libraries/opendocument.lib.php
@@ -38,7 +38,7 @@ function PMA_createOpenDocument($mime, $data)
     $zipfile -> addFile($mime, 'mimetype');
     $zipfile -> addFile($data, 'content.xml');
     $zipfile -> addFile(
-        '<?xml version="1.0" encoding="UTF-8"?'. '>'
+        '<?xml version="1.0" encoding="UTF-8"?' . '>'
         . '<office:document-meta '
         . 'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" '
         . 'xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" '
@@ -55,7 +55,7 @@ function PMA_createOpenDocument($mime, $data)
     );
     $zipfile -> addFile(
         '<?xml version="1.0" encoding="UTF-8"?' . '>'
-        . '<office:document-styles '. $GLOBALS['OpenDocumentNS']
+        . '<office:document-styles ' . $GLOBALS['OpenDocumentNS']
         . 'office:version="1.0">'
         . '<office:font-face-decls>'
         . '<style:font-face style:name="Arial Unicode MS"'
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 1ee8d599ca..4cb51ca4c3 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -228,7 +228,7 @@ class AuthenticationCookie extends AuthenticationPlugin
             </div>';
         if (count($GLOBALS['cfg']['Servers']) > 1) {
             echo '<div class="item">
-                <label for="select_server">' . __('Server Choice:') .'</label>
+                <label for="select_server">' . __('Server Choice:') . '</label>
                 <select name="server" id="select_server"';
             if ($GLOBALS['cfg']['AllowArbitraryServer']) {
                 echo ' onchange="document.forms[\'login_form\'].'
diff --git a/libraries/plugins/auth/swekey/swekey.auth.lib.php b/libraries/plugins/auth/swekey/swekey.auth.lib.php
index acf31b1e87..e26137aeea 100644
--- a/libraries/plugins/auth/swekey/swekey.auth.lib.php
+++ b/libraries/plugins/auth/swekey/swekey.auth.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Swekey 
+ * Swekey
  *
  * @package Swekey
  */
@@ -42,7 +42,7 @@ function Swekey_Auth_check()
                 }
             } elseif (preg_match("/^[A-Z_]+=.*$/", $line) != false) {
                 $items = explode("=", $line);
-                $_SESSION['SWEKEY']['CONF_'.trim($items[0])] = trim($items[1]);
+                $_SESSION['SWEKEY']['CONF_' . trim($items[0])] = trim($items[1]);
             }
         }
 
@@ -99,7 +99,7 @@ function Swekey_Auth_error()
     {
         var valids = "<?php
     foreach ($_SESSION['SWEKEY']['VALID_SWEKEYS'] as $key => $value) {
-                echo $key.',';
+                echo $key . ',';
     }
         ?>";
         var connected_keys = Swekey_ListKeyIds().split(",");
@@ -161,7 +161,7 @@ function Swekey_Auth_error()
         if ($pos === false) {
             $pos = strrpos($caFile, '\\'); // windows
         }
-        $caFile = substr($caFile, 0, $pos + 1).'musbe-ca.crt';
+        $caFile = substr($caFile, 0, $pos + 1) . 'musbe-ca.crt';
         //        echo "\n<!-- $caFile -->\n";
         //        if (file_exists($caFile))
         //            echo "<!-- exists -->\n";
@@ -225,7 +225,7 @@ function Swekey_Auth_error()
                 url = url.substr(0, url.indexOf("?"));
             }
             Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>&token=<?php echo $_SESSION[' PMA_token ']; ?>");
-            var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>);
+            var otp = Swekey_GetOtp(key, <?php echo '"' . $_SESSION['SWEKEY']['RND_TOKEN'] . '"';?>);
             window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
         }
         </script>
@@ -257,7 +257,7 @@ function Swekey_login($input_name, $input_go)
         if (empty($_SESSION['SWEKEY']['FORCE_USER'])) {
             echo 'var user = null;';
         } else {
-            echo 'var user = "'.$_SESSION['SWEKEY']['FORCE_USER'].'";';
+            echo 'var user = "' . $_SESSION['SWEKEY']['FORCE_USER'] . '";';
         }
 
         ?>
diff --git a/libraries/plugins/export/ExportMediawiki.class.php b/libraries/plugins/export/ExportMediawiki.class.php
index 7038144b95..200ad98e55 100644
--- a/libraries/plugins/export/ExportMediawiki.class.php
+++ b/libraries/plugins/export/ExportMediawiki.class.php
@@ -227,7 +227,7 @@ class ExportMediawiki extends ExportPlugin
                 $output .= "! style=\"background:#ffffff\" | "
                     . $this->_exportCRLF();
                 for ($i = 0; $i < $row_cnt; ++$i) {
-                    $output .= " | " . $columns[$i]['Field']. $this->_exportCRLF();
+                    $output .= " | " . $columns[$i]['Field'] . $this->_exportCRLF();
                 }
             }
 
@@ -283,7 +283,7 @@ class ExportMediawiki extends ExportPlugin
     ) {
         // Print data comment
         $output = $this->_exportComment(
-            "Table data for ". PMA_Util::backquote($table)
+            "Table data for " . PMA_Util::backquote($table)
         );
 
         // Begin the table construction
diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php
index f3d40d2680..d5fcda715f 100644
--- a/libraries/plugins/export/ExportOds.class.php
+++ b/libraries/plugins/export/ExportOds.class.php
@@ -110,7 +110,7 @@ class ExportOds extends ExportPlugin
                 . $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
             . '<office:automatic-styles>'
                 . '<number:date-style style:name="N37"'
-                    .' number:automatic-order="true">'
+                    . ' number:automatic-order="true">'
                 . '<number:month number:style="long"/>'
                 . '<number:text>/</number:text>'
                 . '<number:day number:style="long"/>'
diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
index 11519435a9..035ca44a67 100644
--- a/libraries/plugins/export/ExportSql.class.php
+++ b/libraries/plugins/export/ExportSql.class.php
@@ -693,7 +693,7 @@ class ExportSql extends ExportPlugin
                 . '/*!40101 SET @OLD_CHARACTER_SET_RESULTS='
                 . '@@CHARACTER_SET_RESULTS */;' . $crlf
                 . '/*!40101 SET @OLD_COLLATION_CONNECTION='
-                . '@@COLLATION_CONNECTION */;'. $crlf
+                . '@@COLLATION_CONNECTION */;' . $crlf
                 . '/*!40101 SET NAMES ' . $set_names . ' */;' . $crlf . $crlf;
         }
 
@@ -1358,7 +1358,7 @@ class ExportSql extends ExportPlugin
             $schema_create .= $this->_possibleCRLF()
             . $this->_exportComment()
             . $this->_exportComment(
-                __('MIME TYPES FOR TABLE'). ' '
+                __('MIME TYPES FOR TABLE') . ' '
                 . PMA_Util::backquote($table, $sql_backquotes) . ':'
             );
             @reset($mime_map);
@@ -1464,7 +1464,7 @@ class ExportSql extends ExportPlugin
         switch($export_mode) {
         case 'create_table':
             $dump .= $this->_exportComment(
-                __('Table structure for table') . ' '. $formatted_table_name
+                __('Table structure for table') . ' ' . $formatted_table_name
             );
             $dump .= $this->_exportComment();
             $dump .= $this->getTableDef($db, $table, $crlf, $error_url, $dates);
@@ -1697,7 +1697,7 @@ class ExportSql extends ExportPlugin
                     || $GLOBALS['sql_insert_syntax'] == 'both'
                 ) {
                     $fields        = implode(', ', $field_set);
-                    $schema_insert = $sql_command . $insert_delayed .' INTO '
+                    $schema_insert = $sql_command . $insert_delayed . ' INTO '
                         . PMA_Util::backquoteCompat(
                             $table,
                             $compat,
@@ -1706,7 +1706,7 @@ class ExportSql extends ExportPlugin
                         // avoid EOL blank
                         . ' (' . $fields . ') VALUES';
                 } else {
-                    $schema_insert = $sql_command . $insert_delayed .' INTO '
+                    $schema_insert = $sql_command . $insert_delayed . ' INTO '
                         . PMA_Util::backquoteCompat(
                             $table,
                             $compat,
@@ -1757,7 +1757,7 @@ class ExportSql extends ExportPlugin
                             $table,
                             $compat
                         )
-                        . ' ON ;'.$crlf
+                        . ' ON ;' . $crlf
                     )) {
                         return false;
                     }
diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php
index 1e6efa0da3..f658ee7872 100644
--- a/libraries/plugins/export/ExportTexytext.class.php
+++ b/libraries/plugins/export/ExportTexytext.class.php
@@ -495,7 +495,7 @@ class ExportTexytext extends ExportPlugin
 
         switch($export_mode) {
         case 'create_table':
-            $dump .= '== ' . __('Table structure for table') . ' ' .$table . "\n\n";
+            $dump .= '== ' . __('Table structure for table') . ' ' . $table . "\n\n";
             $dump .= $this->getTableDef(
                 $db, $table, $crlf, $error_url, $do_relation, $do_comments,
                 $do_mime, $dates
@@ -505,12 +505,12 @@ class ExportTexytext extends ExportPlugin
             $dump = '';
             $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
             if ($triggers) {
-                $dump .= '== ' . __('Triggers') . ' ' .$table . "\n\n";
+                $dump .= '== ' . __('Triggers') . ' ' . $table . "\n\n";
                 $dump .= $this->getTriggers($db, $table);
             }
             break;
         case 'create_view':
-            $dump .= '== ' . __('Structure for view') . ' ' .$table . "\n\n";
+            $dump .= '== ' . __('Structure for view') . ' ' . $table . "\n\n";
             $dump .= $this->getTableDef(
                 $db, $table, $crlf, $error_url, $do_relation, $do_comments,
                 $do_mime, $dates, true, true
@@ -518,7 +518,7 @@ class ExportTexytext extends ExportPlugin
             break;
         case 'stand_in':
             $dump .=  '== ' . __('Stand-in structure for view')
-                . ' ' .$table . "\n\n";
+                . ' ' . $table . "\n\n";
             // export a stand-in definition to resolve view dependencies
             $dump .= $this->getTableDefStandIn($db, $table, $crlf);
         } // end switch
diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php
index e36b1103e2..713d86ed15 100644
--- a/libraries/plugins/export/ExportXml.class.php
+++ b/libraries/plugins/export/ExportXml.class.php
@@ -219,7 +219,7 @@ class ExportXml extends ExportPlugin
                 $result = $GLOBALS['dbi']->fetchResult(
                     'SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME`'
                     . ' FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME`'
-                    . ' = \''.PMA_Util::sqlAddSlashes($db).'\' LIMIT 1'
+                    . ' = \'' . PMA_Util::sqlAddSlashes($db) . '\' LIMIT 1'
                 );
             }
             $db_collation = $result[0]['DEFAULT_COLLATION_NAME'];
diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php
index 8e067d9d1a..f559ea4cb6 100644
--- a/libraries/plugins/import/ImportCsv.class.php
+++ b/libraries/plugins/import/ImportCsv.class.php
@@ -259,7 +259,7 @@ class ImportCsv extends AbstractImportCsv
                 // Append new data to buffer
                 $buffer .= $data;
                 unset($data);
-                
+
                 // Force a trailing new line at EOF to prevent parsing problems
                 if ($finished && $buffer) {
                     $finalch = substr($buffer, -1);
@@ -268,13 +268,13 @@ class ImportCsv extends AbstractImportCsv
                         && $finalch != "\n"
                     ) {
                         $buffer .= "\n";
-                    } elseif ($csv_new_line != 'auto' 
+                    } elseif ($csv_new_line != 'auto'
                         && $finalch != $csv_new_line
                     ) {
                         $buffer .= $csv_new_line;
                     }
                 }
-                
+
                 // Do not parse string when we're not at the end
                 // and don't have new line inside
                 if (($csv_new_line == 'auto'
@@ -518,13 +518,13 @@ class ImportCsv extends AbstractImportCsv
             ) {
                 // Fill out column names
                 for ($i = 0; $i < $max_cols; ++$i) {
-                    $col_names[] = 'COL '.($i+1);
+                    $col_names[] = 'COL ' . ($i+1);
                 }
             }
 
             if (strlen($db)) {
                 $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES');
-                $tbl_name = 'TABLE '.(count($result) + 1);
+                $tbl_name = 'TABLE ' . (count($result) + 1);
             } else {
                 $tbl_name = 'TBL_NAME';
             }
diff --git a/libraries/plugins/import/ImportMediawiki.class.php b/libraries/plugins/import/ImportMediawiki.class.php
index b7cd3bebe1..2629f5a9e8 100644
--- a/libraries/plugins/import/ImportMediawiki.class.php
+++ b/libraries/plugins/import/ImportMediawiki.class.php
@@ -360,7 +360,7 @@ class ImportMediawiki extends ImportPlugin
         if (empty($table_name)) {
             $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES');
             // todo check if the name below already exists
-            $table_name = 'TABLE '.(count($result) + 1);
+            $table_name = 'TABLE ' . (count($result) + 1);
         }
     }
 
@@ -380,7 +380,7 @@ class ImportMediawiki extends ImportPlugin
             // If they are not set, generic names will be given (COL 1, COL 2, etc)
             $num_cols = count($table_row);
             for ($i = 0; $i < $num_cols; ++ $i) {
-                $table_headers [$i] = 'COL '. ($i + 1);
+                $table_headers [$i] = 'COL ' . ($i + 1);
             }
         }
     }
diff --git a/libraries/plugins/import/ImportShp.class.php b/libraries/plugins/import/ImportShp.class.php
index 7a4c0c8375..e65e050248 100644
--- a/libraries/plugins/import/ImportShp.class.php
+++ b/libraries/plugins/import/ImportShp.class.php
@@ -270,7 +270,7 @@ class ImportShp extends ImportPlugin
         // Set table name based on the number of tables
         if (strlen($db)) {
             $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES');
-            $table_name = 'TABLE '.(count($result) + 1);
+            $table_name = 'TABLE ' . (count($result) + 1);
         } else {
             $table_name = 'TBL_NAME';
         }
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 7cb6b83eb9..b64898e3ad 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -353,9 +353,9 @@ class PMA_User_Schema
                 echo '</td>';
 
                 echo '<td>';
-                echo '<input type="checkbox" id="id_c_table_' . $i .'" '
+                echo '<input type="checkbox" id="id_c_table_' . $i . '" '
                     . 'name="c_table_' . $i . '[delete]" value="y" />';
-                echo '<label for="id_c_table_' . $i .'">'
+                echo '<label for="id_c_table_' . $i . '">'
                     . __('Delete') . '</label>';
                 echo '</td>';
 
@@ -384,7 +384,7 @@ class PMA_User_Schema
                 . '" />';
             echo '<input type="checkbox" id="id_with_field_names" '
                 . 'name="with_field_names" '
-                . (isset($with_field_names) ? 'checked="checked"' : ''). ' />';
+                . (isset($with_field_names) ? 'checked="checked"' : '') . ' />';
             echo '<label for="id_with_field_names">'
                 . __('Column names') . '</label><br />';
             echo '<input type="submit" value="' . __('Save') . '" />';
@@ -473,7 +473,7 @@ class PMA_User_Schema
             . '<input type="checkbox" name="show_keys" id="show_keys" />'
             . '<label for="show_keys">' . __('Only show keys') . '</label><br />'
             . '<select name="orientation" id="orientation_opt" class="paper-change">'
-            . '<option value="L">' . __('Landscape'). '</option>'
+            . '<option value="L">' . __('Landscape') . '</option>'
             . '<option value="P">' . __('Portrait') . '</option>'
             . '</select>'
             . '<label for="orientation_opt">' . __('Orientation') . '</label>'
@@ -575,7 +575,7 @@ class PMA_User_Schema
             $drag_y = $temp_sh_page['y'];
 
             echo '<div id="table_' . $i . '" '
-                . 'data-number="' . $i .'" '
+                . 'data-number="' . $i . '" '
                 . 'data-x="' . $drag_x . '" '
                 . 'data-y="' . $drag_y . '" '
                 . 'class="pdflayout_table"'
diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php
index 671cc026ef..2a88f162a0 100644
--- a/libraries/server_user_groups.lib.php
+++ b/libraries/server_user_groups.lib.php
@@ -227,7 +227,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
     $html_output .= '<legend>' . __('User group menu assignments')
         . '&nbsp;&nbsp;&nbsp;'
         . '<input type="checkbox" class="checkall_box" title="Check All">'
-        . '<label for="addUsersForm_checkall">' . __('Check All') .'</label>'
+        . '<label for="addUsersForm_checkall">' . __('Check All') . '</label>'
         . '</legend>';
 
     if ($userGroup == null) {
diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php
index 72db3738c2..921830a2eb 100644
--- a/libraries/sysinfo.lib.php
+++ b/libraries/sysinfo.lib.php
@@ -307,7 +307,7 @@ class PMA_SysInfoSunos extends PMA_SysInfo
      */
     private function _kstat($key)
     {
-        if ($m = shell_exec('kstat -p d '.$key)) {
+        if ($m = shell_exec('kstat -p d ' . $key)) {
             list($key, $value) = preg_split("/\t/", trim($m), 2);
             return $value;
         } else {
diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php
index eac9740520..f710581658 100644
--- a/libraries/tbl_gis_visualization.lib.php
+++ b/libraries/tbl_gis_visualization.lib.php
@@ -82,7 +82,7 @@ function PMA_GIS_modifyQuery($sql_query, $visualizationSettings)
         if (isset($visualizationSettings['labelColumn'])
             && $visualizationSettings['labelColumn'] != ''
         ) {
-            $modified_query .= '`' . $visualizationSettings['labelColumn'] .'`, ';
+            $modified_query .= '`' . $visualizationSettings['labelColumn'] . '`, ';
         }
 
         // Wrap the spatial column with 'ASTEXT()' function and add it
diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php
index 7c11281ce9..6082c57414 100644
--- a/libraries/tbl_relation.lib.php
+++ b/libraries/tbl_relation.lib.php
@@ -211,7 +211,7 @@ function PMA_getHtmlForCommonFormRows($columns, $cfgRelation, $tbl_storage_engin
     $saved_row_cnt  = count($save_row);
 
     $html_output = '<fieldset>'
-        . '<legend>' . __('Relations'). '</legend>'
+        . '<legend>' . __('Relations') . '</legend>'
         . '<table id="relationalTable">';
 
     $html_output .= PMA_getHtmlForCommonFormTableHeaders(
@@ -394,7 +394,7 @@ function PMA_getHtmlForDisplayFieldInfos($db, $table, $save_row)
             $html_output .= ' selected="selected"';
         }
         $html_output .= '>' . htmlspecialchars($row['Field'])
-            . '</option>'. "\n";
+            . '</option>' . "\n";
     } // end while
 
     $html_output .= '</select>'
diff --git a/libraries/tbl_tracking.lib.php b/libraries/tbl_tracking.lib.php
index 5cfa56ab21..2bc42ce60f 100644
--- a/libraries/tbl_tracking.lib.php
+++ b/libraries/tbl_tracking.lib.php
@@ -169,8 +169,8 @@ function PMA_getListOfVersionsOfTable()
     $sql_query = " SELECT * FROM " .
          PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) . "." .
          PMA_Util::backquote($GLOBALS['cfg']['Server']['tracking']) .
-         " WHERE db_name = '" . PMA_Util::sqlAddSlashes($_REQUEST['db']) . "' ".
-         " AND table_name = '" . PMA_Util::sqlAddSlashes($_REQUEST['table']) ."' ".
+         " WHERE db_name = '" . PMA_Util::sqlAddSlashes($_REQUEST['db']) . "' " .
+         " AND table_name = '" . PMA_Util::sqlAddSlashes($_REQUEST['table']) . "' " .
          " ORDER BY version DESC ";
 
     return PMA_queryAsControlUser($sql_query);
@@ -370,7 +370,7 @@ function PMA_getHtmlForTrackingReport($url_query, $data, $url_params,
         . ($selection_schema ? ' selected="selected"' : '') . '>'
         . __('Structure only') . '</option>'
         . '<option value="data"'
-        . ($selection_data ? ' selected="selected"' : ''). '>'
+        . ($selection_data ? ' selected="selected"' : '') . '>'
         . __('Data only') . '</option>'
         . '<option value="schema_and_data"'
         . ($selection_both ? ' selected="selected"' : '') . '>'
@@ -448,10 +448,10 @@ function PMA_getHtmlForTrackingReport($url_query, $data, $url_params,
         . PMA_escapeJsString(
             __('This option will replace your table and contained data.')
         )
-        .'\')">' . __('SQL execution') . '</option>' . '</select>';
+        . '\')">' . __('SQL execution') . '</option>' . '</select>';
 
     $str_export2 = '<input type="hidden" name="report_export" value="1" />'
-                 . '<input type="submit" value="' . __('Go') .'" />';
+                 . '<input type="submit" value="' . __('Go') . '" />';
     $html .= '</form>';
     $html .= '<form class="disableAjax" method="post" action="tbl_tracking.php'
         . PMA_URL_getCommon(