diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index ef027f94d9..c4d71f6100 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -33,7 +33,7 @@ function PMA_getHtmlForHiddenInputs($import_type, $db, $table)
         $html .= PMA_URL_getHiddenInputs($db, $table, 1);
     }
     $html .= '    <input type="hidden" name="import_type" value="'
-        . $import_type . '" />'."\n";
+        . $import_type . '" />' . "\n";
 
     return $html;
 }
@@ -483,7 +483,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
     $html .= '			complete = response.complete; ';
 
     $html .= '			if (total==0 && complete==0 && percent==0) { ';
-    $img_tag = '<img src="'. $GLOBALS['pmaThemeImage'] . 'ajax_clock_small.gif"';
+    $img_tag = '<img src="' . $GLOBALS['pmaThemeImage'] . 'ajax_clock_small.gif"';
     $html .= '				$("#upload_form_status_info").html(\''
         . $img_tag . ' width="16" height="16" alt="ajax clock" /> '
         . $promot_str . '\'); ';
@@ -507,7 +507,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
         . '<div class="upload_progress_bar_outer"><div class="percentage">'
         . '</div><div id="status" class="upload_progress_bar_inner">'
         . '<div class="percentage"></div></div></div><div>'
-        . '<img src="'. $GLOBALS['pmaThemeImage']
+        . '<img src="' . $GLOBALS['pmaThemeImage']
         . 'ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> '
         . $upload_str . '</div><div id="statustext"></div></div>\') ';
     $html .= '					.show(); ';
diff --git a/libraries/file_listing.lib.php b/libraries/file_listing.lib.php
index e6abba3f8b..929dfaaea4 100644
--- a/libraries/file_listing.lib.php
+++ b/libraries/file_listing.lib.php
@@ -56,7 +56,7 @@ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '')
     }
     $result = '';
     foreach ($list as $val) {
-        $result .= '<option value="'. htmlspecialchars($val) . '"';
+        $result .= '<option value="' . htmlspecialchars($val) . '"';
         if ($val == $active) {
             $result .= ' selected="selected"';
         }
diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php
index eca3889df8..d703de51d3 100644
--- a/libraries/gis/pma_gis_multipolygon.php
+++ b/libraries/gis/pma_gis_multipolygon.php
@@ -367,7 +367,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
                         ? $data_row[$k][$i][$j]['x'] : $empty)
                         . ' ' . ((isset($data_row[$k][$i][$j]['y'])
                         && trim($data_row[$k][$i][$j]['y']) != '')
-                        ? $data_row[$k][$i][$j]['y'] : $empty) .',';
+                        ? $data_row[$k][$i][$j]['y'] : $empty) . ',';
                 }
                 $wkt = substr($wkt, 0, strlen($wkt) - 1);
                 $wkt .= '),';
diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php
index f78bf6f39d..67b32b0a43 100644
--- a/libraries/gis/pma_gis_polygon.php
+++ b/libraries/gis/pma_gis_polygon.php
@@ -321,7 +321,7 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
                     ? $gis_data[$index]['POLYGON'][$i][$j]['x'] : $empty)
                     . ' ' . ((isset($gis_data[$index]['POLYGON'][$i][$j]['y'])
                     && trim($gis_data[$index]['POLYGON'][$i][$j]['y']) != '')
-                    ? $gis_data[$index]['POLYGON'][$i][$j]['y'] : $empty) .',';
+                    ? $gis_data[$index]['POLYGON'][$i][$j]['y'] : $empty) . ',';
             }
             $wkt = substr($wkt, 0, strlen($wkt) - 1);
             $wkt .= '),';
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index e2312b2d99..a5cf09bfbb 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -777,7 +777,7 @@ function PMA_dispRowForeignData($backup_field, $column_name_appendix,
     $html_output .= '<select name="fields' . $column_name_appendix . '"'
         . ' ' . $unnullify_trigger
         . ' class="textfield"'
-        . ' tabindex="' . ($tabindex + $tabindex_for_value). '"'
+        . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
         . ' id="field_' . $idindex . '_3">';
     $html_output .= PMA_foreignDropdown(
         $foreignData['disp_row'], $foreignData['foreign_field'],
@@ -871,7 +871,7 @@ function PMA_getPmaTypeEnum($column, $backup_field, $column_name_appendix,
     }
     $column_enum_values = $column['values'];
     $html_output .= '<input type="hidden" name="fields_type'
-        . $column_name_appendix. '" value="enum" />';
+        . $column_name_appendix . '" value="enum" />';
     $html_output .= '<input type="hidden" name="fields'
         . $column_name_appendix . '" value="" />';
     $html_output .= "\n" . '            ' . $backup_field . "\n";
@@ -1105,7 +1105,7 @@ function PMA_getBinaryAndBlobColumn(
             $data_size = PMA_Util::formatByteDown(
                 strlen(stripslashes($data)), 3, 1
             );
-            $html_output .= ' ('. $data_size[0] . ' ' . $data_size[1] . ')';
+            $html_output .= ' (' . $data_size[0] . ' ' . $data_size[1] . ')';
             unset($data_size);
         }
         $html_output .= '<input type="hidden" name="fields_type'
@@ -1191,12 +1191,12 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars,
             . 'max="' . $min_max_values[1] . '" ';
     }
     return '<input type="' . $input_type . '"'
-        . ' name="fields'. $column_name_appendix . '"'
+        . ' name="fields' . $column_name_appendix . '"'
         . ' value="' . $special_chars . '" size="' . $fieldsize . '"'
         . ($input_min_max !== false ? ' ' . $input_min_max : '')
         . ($input_type === 'time' ? ' step="1"' : '')
         . ' class="' . $the_class . '" ' . $unnullify_trigger
-        . ' tabindex="' . ($tabindex + $tabindex_for_value). '"'
+        . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
         . ' id="field_' . ($idindex) . '_3" />';
 }
 
@@ -1422,7 +1422,7 @@ function PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url
 
             $html_output .= '<input type="hidden"'
                 . ' name="where_clause[' . $key_id . ']"'
-                . ' value="' . htmlspecialchars(trim($where_clause)) . '" />'. "\n";
+                . ' value="' . htmlspecialchars(trim($where_clause)) . '" />' . "\n";
         }
     }
     $tmp = '<select name="insert_rows" id="insert_rows">' . "\n";
@@ -1612,7 +1612,7 @@ function PMA_getHeadAndFootOfInsertRowTable($url_params)
         $html_output .= PMA_showFunctionFieldsInEditMode($url_params, true);
     }
 
-    $html_output .= '<th>'. __('Null') . '</th>'
+    $html_output .= '<th>' . __('Null') . '</th>'
         . '<th>' . __('Value') . '</th>'
         . '</tr>'
         . '</thead>'
@@ -2414,7 +2414,7 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
 
     $extra_data['isNeedToRecheck'] = true;
 
-    $sql_for_real_value = 'SELECT '. PMA_Util::backquote($table) . '.'
+    $sql_for_real_value = 'SELECT ' . PMA_Util::backquote($table) . '.'
         . PMA_Util::backquote($column_name)
         . ' FROM ' . PMA_Util::backquote($db) . '.'
         . PMA_Util::backquote($table)
@@ -2593,7 +2593,7 @@ function PMA_getHtmlForIgnoreOption($row_id)
     return '<input type="checkbox" checked="checked"'
             . ' name="insert_ignore_' . $row_id . '"'
             . ' id="insert_ignore_' . $row_id . '" />'
-            .'<label for="insert_ignore_' . $row_id . '">'
+            . '<label for="insert_ignore_' . $row_id . '">'
             . __('Ignore')
             . '</label><br />' . "\n";
 }
@@ -2726,7 +2726,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column,
     $unnullify_trigger = $chg_evt_handler
         . "=\"return verificationsAfterFieldChange('"
         . PMA_escapeJsString($column['Field_md5']) . "', '"
-        . PMA_escapeJsString($jsvkey) . "','".$column['pma_type'] . "')\"";
+        . PMA_escapeJsString($jsvkey) . "','" . $column['pma_type'] . "')\"";
 
     // Use an MD5 as an array index to avoid having special characters
     // in the name atttibute (see bug #1746964 )
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 0011286c04..8fd0cacb46 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -61,7 +61,7 @@ function PMA_getHtmlForRenameDatabase($db)
     if (isset($_REQUEST['db_collation'])) {
         $html_output .= '<input type="hidden" name="db_collation" '
             . 'value="' . $_REQUEST['db_collation']
-            .'" />' . "\n";
+            . '" />' . "\n";
     }
     $html_output .= '<input type="hidden" name="what" value="data" />'
         . '<input type="hidden" name="db_rename" value="true" />'
@@ -162,7 +162,7 @@ function PMA_getHtmlForCopyDatabase($db)
 
     if (isset($_REQUEST['db_collation'])) {
         $html_output .= '<input type="hidden" name="db_collation" '
-        . 'value="' . $_REQUEST['db_collation'] .'" />' . "\n";
+        . 'value="' . $_REQUEST['db_collation'] . '" />' . "\n";
     }
     $html_output .= '<input type="hidden" name="db_copy" value="true" />' . "\n"
         . PMA_URL_getHiddenInputs($db);
@@ -927,8 +927,8 @@ function PMA_getHtmlForTableRow($attribute, $label, $val)
 {
     return '<tr>'
         . '<td><label for="' . $attribute . '">' . $label . '</label></td>'
-        . '<td><input type="checkbox" name="'. $attribute .'"'
-        . ' id="' . $attribute .'"'
+        . '<td><input type="checkbox" name="' . $attribute . '"'
+        . ' id="' . $attribute . '"'
         . ' value="1"'
         . ((!empty($val) && $val == 1) ? ' checked="checked"' : '') . '/></td>'
         . '</tr>';
@@ -1009,7 +1009,7 @@ function PMA_getHtmlForCopytable()
     if (count($GLOBALS['pma']->databases) > $GLOBALS['cfg']['MaxDbList']) {
         $html_output .= '<input class="halfWidth" type="text" maxlength="100" '
             . 'size="30" name="target_db" '
-            . 'value="'. htmlspecialchars($GLOBALS['db']) . '"/>';
+            . 'value="' . htmlspecialchars($GLOBALS['db']) . '"/>';
     } else {
         $html_output .= '<select class="halfWidth" name="target_db">'
             . $GLOBALS['pma']->databases->getHtmlOptions(true, false)
@@ -1018,7 +1018,7 @@ function PMA_getHtmlForCopytable()
     $html_output .= '&nbsp;<strong>.</strong>&nbsp;';
     $html_output .= '<input class="halfWidth" type="text" required '
         . 'size="20" name="new_name" onfocus="this.select()" '
-        . 'value="'. htmlspecialchars($GLOBALS['table']) . '"/><br />';
+        . 'value="' . htmlspecialchars($GLOBALS['table']) . '"/><br />';
 
     $choices = array(
             'structure' => __('Structure only'),
@@ -1044,7 +1044,7 @@ function PMA_getHtmlForCopytable()
         $html_output .= '<input type="checkbox" name="add_constraints" '
             . 'value="1" id="checkbox_constraints" />';
         $html_output .= '<label for="checkbox_constraints">'
-            .__('Add constraints') . '</label><br />';
+            . __('Add constraints') . '</label><br />';
     } // endif
 
     if (isset($_COOKIE['pma_switch_to_new'])
@@ -1063,7 +1063,7 @@ function PMA_getHtmlForCopytable()
         . '</fieldset>';
 
     $html_output .= '<fieldset class="tblFooters">'
-        . '<input type="submit" name="submit_copy" value="' .__('Go') . '" />'
+        . '<input type="submit" name="submit_copy" value="' . __('Go') . '" />'
         . '</fieldset>'
         . '</form>'
         . '</div>';
@@ -1222,7 +1222,7 @@ function PMA_getMaintainActionlink($action, $params, $url_params, $link)
     return '<li>'
         . '<a class="maintain_action ajax" '
         . 'href="sql.php'
-        . PMA_URL_getCommon(array_merge($url_params, $params)) .'">'
+        . PMA_URL_getCommon(array_merge($url_params, $params)) . '">'
         . $action
         . '</a>'
         . PMA_Util::showMySQLDocu($link)
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index 335969865c..8d4736aeca 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -223,7 +223,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
         } else {
             $ret .= 'false';
         }
-        $ret .= '" />'. "\n";
+        $ret .= '" />' . "\n";
     }
 
     return $ret;
diff --git a/libraries/plugins/auth/AuthenticationSignon.class.php b/libraries/plugins/auth/AuthenticationSignon.class.php
index faf0a887da..f239acdd56 100644
--- a/libraries/plugins/auth/AuthenticationSignon.class.php
+++ b/libraries/plugins/auth/AuthenticationSignon.class.php
@@ -107,7 +107,7 @@ class AuthenticationSignon extends AuthenticationPlugin
             if (! file_exists($script_name)) {
                 PMA_fatalError(
                     __('Can not find signon authentication script:')
-                    . ' '. $script_name
+                    . ' ' . $script_name
                 );
             }
             include $script_name;
diff --git a/libraries/plugins/export/PMA_ExportPdf.class.php b/libraries/plugins/export/PMA_ExportPdf.class.php
index 641b75e842..0192d33642 100644
--- a/libraries/plugins/export/PMA_ExportPdf.class.php
+++ b/libraries/plugins/export/PMA_ExportPdf.class.php
@@ -205,11 +205,11 @@ class PMA_ExportPdf extends PMA_PDF
                     $l += $this->tablewidths[$col];
                 }
 
-                if (! isset($tmpheight[$row.'-'.$this->page])) {
-                    $tmpheight[$row.'-'.$this->page] = 0;
+                if (! isset($tmpheight[$row . '-' . $this->page])) {
+                    $tmpheight[$row . '-' . $this->page] = 0;
                 }
-                if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
-                    $tmpheight[$row.'-'.$this->page] = $this->GetY();
+                if ($tmpheight[$row . '-' . $this->page] < $this->GetY()) {
+                    $tmpheight[$row . '-' . $this->page] = $this->GetY();
                 }
                 if ($this->page > $maxpage) {
                     $maxpage = $this->page;
@@ -218,7 +218,7 @@ class PMA_ExportPdf extends PMA_PDF
             }
 
             // get the height we were in the last used page
-            $h = $tmpheight[$row.'-'.$maxpage];
+            $h = $tmpheight[$row . '-' . $maxpage];
             // set the "pointer" to the left margin
             $l = $this->lMargin;
             // set the $currpage to the last page
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index 8b2dfdb2a1..abf6b029a8 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -143,10 +143,10 @@ function PMA_getScriptContr()
         if ($row !== false) {
             foreach ($row as $field => $value) {
                 $con['C_NAME'][$i] = '';
-                $con['DTN'][$i]    = urlencode($GLOBALS['db'].".".$val[0]);
+                $con['DTN'][$i]    = urlencode($GLOBALS['db'] . "." . $val[0]);
                 $con['DCN'][$i]    = urlencode($field);
                 $con['STN'][$i]    = urlencode(
-                    $value['foreign_db'].".".$value['foreign_table']
+                    $value['foreign_db'] . "." . $value['foreign_table']
                 );
                 $con['SCN'][$i]    = urlencode($value['foreign_field']);
                 $i++;
@@ -207,7 +207,7 @@ function PMA_getAllKeys($unique_only = false)
             }
             $columns = $index->getColumns();
             foreach ($columns as $column_name => $dummy) {
-                $keys[$schema . '.' .$table . '.' . $column_name] = 1;
+                $keys[$schema . '.' . $table . '.' . $column_name] = 1;
             }
         }
     }
@@ -283,6 +283,9 @@ function PMA_returnUpd($b, $ret)
 
     header("Content-Type: text/xml; charset=utf-8");
     header("Cache-Control: no-cache");
-    die('<root act="relation_upd" return="'.$ret.'" b="'.$b.'" K="'.$K.'"></root>');
+    die(
+        '<root act="relation_upd" return="' . $ret . '" b="'
+        . $b . '" K="' . $K . '"></root>'
+    );
 }
 ?>
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index f49da5375c..ff575e18e5 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -108,7 +108,7 @@ function PMA_getHtmlForMasterConfiguration()
     $html .= __(
         'Now, add the following lines at the end of [mysqld] section'
         . ' in your my.cnf and please restart the MySQL server afterwards.'
-    ). '<br />';
+    ) . '<br />';
     $html .= '<pre id="rep"></pre>';
     $html .= __(
         'Once you restarted MySQL server, please click on Go button. '
@@ -217,12 +217,12 @@ function PMA_getHtmlForSlaveConfiguration(
         $html .= __('Control slave:') . '</a>';
         $html .= ' <div id="slave_control_gui" style="display: none">';
         $html .= '  <ul>';
-        $html .= '   <li><a href="'. $slave_control_full_link . '">';
+        $html .= '   <li><a href="' . $slave_control_full_link . '">';
         $html .= (($server_slave_replication[0]['Slave_IO_Running'] == 'No' ||
                    $server_slave_replication[0]['Slave_SQL_Running'] == 'No')
                  ? __('Full start')
                  : __('Full stop')) . ' </a></li>';
-        $html .= '   <li><a href="'. $slave_control_reset_link . '">';
+        $html .= '   <li><a href="' . $slave_control_reset_link . '">';
         $html .= __('Reset slave') . '</a></li>';
         if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
             $html .= '   <li><a href="' . $slave_control_sql_link . '">';
@@ -451,7 +451,7 @@ function PMA_getHtmlForAddUserInputDiv($label_array, $input_array)
 
     $html .= '    <input ';
     foreach ($input_array as $key=>$value) {
-        $html .= ' ' . $key . '="' . $value. '" ';
+        $html .= ' ' . $key . '="' . $value . '" ';
     }
     $html .= ' />';
     $html .= '  </div>';
@@ -1049,7 +1049,7 @@ function PMA_handleRequestForSlaveSkipError()
 
     $qStop = PMA_Replication_Slave_control("STOP");
     $qSkip = $GLOBALS['dbi']->tryQuery(
-        "SET GLOBAL SQL_SLAVE_SKIP_COUNTER = ".$count.";"
+        "SET GLOBAL SQL_SLAVE_SKIP_COUNTER = " . $count . ";"
     );
     $qStart = PMA_Replication_Slave_control("START");
 
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
index d5a0816ff4..75117b5ab1 100644
--- a/libraries/rte/rte_events.lib.php
+++ b/libraries/rte/rte_events.lib.php
@@ -195,7 +195,7 @@ function PMA_EVN_handleEditor()
                     . "AND EVENT_NAME='"
                     . PMA_Util::sqlAddSlashes($_REQUEST['item_name']) . "'";
                 $query   = "SELECT " . $columns
-                    . " FROM `INFORMATION_SCHEMA`.`EVENTS` WHERE " . $where. ";";
+                    . " FROM `INFORMATION_SCHEMA`.`EVENTS` WHERE " . $where . ";";
                 $event   = $GLOBALS['dbi']->fetchSingleRow($query);
                 $response->addJSON(
                     'name',
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 53662fdf9e..5bceb1a8f6 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -997,7 +997,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "        <input style='width: 49%;' type='button'";
     $retval .= "               name='routine_addparameter'";
     $retval .= "               value='" . __('Add parameter') . "' />";
-    $retval .= "        <input style='width: 49%;".$disableRemoveParam."'";
+    $retval .= "        <input style='width: 49%;" . $disableRemoveParam . "'";
     $retval .= "               type='submit' ";
     $retval .= "               name='routine_removeparameter'";
     $retval .= "               value='" . __('Remove last parameter') . "' />";
@@ -1013,7 +1013,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "<tr class='routine_return_row" . $isfunction_class . "'>";
     $retval .= "    <td>" . __('Return length/values') . "</td>";
     $retval .= "    <td><input type='text' name='item_returnlength'";
-    $retval .= "               value='".$routine['item_returnlength']."' /></td>";
+    $retval .= "               value='" . $routine['item_returnlength'] . "' /></td>";
     $retval .= "    <td class='hide no_len'>---</td>";
     $retval .= "</tr>";
     $retval .= "<tr class='routine_return_row" . $isfunction_class . "'>";
@@ -1055,7 +1055,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "<tr>";
     $retval .= "    <td>" . __('Definer') . "</td>";
     $retval .= "    <td><input type='text' name='item_definer'";
-    $retval .= "               value='".$routine['item_definer']."' /></td>";
+    $retval .= "               value='" . $routine['item_definer'] . "' /></td>";
     $retval .= "</tr>";
     $retval .= "<tr>";
     $retval .= "    <td>" . __('Security type') . "</td>";
@@ -1081,17 +1081,17 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "<tr>";
     $retval .= "    <td>" . __('Comment') . "</td>";
     $retval .= "    <td><input type='text' name='item_comment' maxlength='64'";
-    $retval .= "    value='" . $routine['item_comment']."' /></td>";
+    $retval .= "    value='" . $routine['item_comment'] . "' /></td>";
     $retval .= "</tr>";
     $retval .= "</table>";
     $retval .= "</fieldset>";
     if ($GLOBALS['is_ajax_request']) {
-        $retval .= "<input type='hidden' name='editor_process_".$mode."'";
+        $retval .= "<input type='hidden' name='editor_process_" . $mode . "'";
         $retval .= "       value='true' />";
         $retval .= "<input type='hidden' name='ajax_request' value='true' />";
     } else {
         $retval .= "<fieldset class='tblFooters'>";
-        $retval .= "    <input type='submit' name='editor_process_".$mode."'";
+        $retval .= "    <input type='submit' name='editor_process_" . $mode . "'";
         $retval .= "           value='" . __('Go') . "' />";
         $retval .= "</fieldset>";
     }
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index b6e5eea8b1..8309d08e3d 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -357,7 +357,7 @@ class Table_Stats_Dia
             </dia:attribute>
             <dia:attribute name="obj_bb">
                 <dia:rectangle val="'
-            .($this->x * $factor) . ',' . ($this->y * $factor) . ';9.97,9.2"/>
+            . ($this->x * $factor) . ',' . ($this->y * $factor) . ';9.97,9.2"/>
             </dia:attribute>
             <dia:attribute name="meta">
                 <dia:composite type="dict"/>
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index a68a722ba9..72b5ffc6fa 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -506,7 +506,7 @@ class Table_Stats_Svg
             }
             $svg->printElement(
                 'rect', $this->x, $this->y + $this->currentCell, $this->width,
-                $this->heightCell, null, 'fill:'.$showColor.';stroke:black;'
+                $this->heightCell, null, 'fill:' . $showColor . ';stroke:black;'
             );
             $svg->printElement(
                 'text', $this->x + 5, $this->y + 14 + $this->currentCell,
@@ -804,7 +804,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
     function showOutput()
     {
         global $svg,$db;
-        $svg->showOutput($db.'-'.$this->pageNumber);
+        $svg->showOutput($db . '-' . $this->pageNumber);
     }
 
 
diff --git a/libraries/server_bin_log.lib.php b/libraries/server_bin_log.lib.php
index 922840399a..f2ee0cdd37 100644
--- a/libraries/server_bin_log.lib.php
+++ b/libraries/server_bin_log.lib.php
@@ -189,7 +189,7 @@ function PMA_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars)
     }
     $html .= '<a href="server_binlog.php' . PMA_URL_getCommon($this_url_params)
         . '" title="' . $tempTitle . '">'
-        . '<img src="' .$GLOBALS['pmaThemeImage'] . 's_' . $tempImgMode . 'text.png"'
+        . '<img src="' . $GLOBALS['pmaThemeImage'] . 's_' . $tempImgMode . 'text.png"'
         . 'alt="' . $tempTitle . '" /></a>';
 
     // we do not now how much rows are in the binlog
diff --git a/libraries/server_databases.lib.php b/libraries/server_databases.lib.php
index 7a125c1b0c..393f49a089 100644
--- a/libraries/server_databases.lib.php
+++ b/libraries/server_databases.lib.php
@@ -180,7 +180,7 @@ function PMA_getHtmlForTableFooter(
     $html .= PMA_getHtmlForColumnOrder($column_order, $first_database);
 
     foreach ($replication_types as $type) {
-        if ($GLOBALS["server_" . $type. "_status"]) {
+        if ($GLOBALS["server_" . $type . "_status"]) {
             $html .= '    <th></th>' . "\n";
         }
     }
@@ -393,7 +393,7 @@ function PMA_getHtmlForReplicationType(
         }
 
         if ($GLOBALS["server_{$type}_status"]) {
-            $html .= '    <th>'. $name .'</th>' . "\n";
+            $html .= '    <th>' . $name . '</th>' . "\n";
         }
     }
 
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index 098f31e465..838d490d9d 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -65,7 +65,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
             } else {
                 $selected = '';
             }
-            $retval .= '<option' . $selected . ' value="' . $section_id. '">';
+            $retval .= '<option' . $selected . ' value="' . $section_id . '">';
             $retval .= htmlspecialchars($section_name) . '</option>';
         }
     }
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 9b11007330..ed402e7349 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -118,7 +118,7 @@ function PMA_getHiddenFields($values, $pre = '')
 
     foreach ($values as $name => $value) {
         if (! empty($pre)) {
-            $name = $pre. '[' . $name . ']';
+            $name = $pre . '[' . $name . ']';
         }
 
         if (is_array($value)) {