diff --git a/libraries/server_bin_log.lib.php b/libraries/server_bin_log.lib.php
index 5e8db61d93..55e92ef713 100644
--- a/libraries/server_bin_log.lib.php
+++ b/libraries/server_bin_log.lib.php
@@ -16,8 +16,7 @@ if (! defined('PHPMYADMIN')) {
  * Returns the html for log selector.
  *
  * @param Array $binary_log_file_names Binary logs file names
- *
- * @param Array $url_params links parameters
+ * @param Array $url_params            links parameters
  *
  * @return string
  */
@@ -71,8 +70,7 @@ function PMA_getLogSelector($binary_log_file_names, $url_params)
  * Returns the html for binary log information.
  *
  * @param Array $binary_log_file_names Binary logs file names
- *
- * @param Array $url_params links parameters
+ * @param Array $url_params            links parameters
  *
  * @return string
  */
@@ -149,13 +147,10 @@ function PMA_getLogInfo($binary_log_file_names, $url_params)
 /**
  * Returns the html for Navigation Row.
  *
- * @param Array $url_params Links parameters
- *
- * @param int $pos Position to display
- *
- * @param int $num_rows Number of results row
- *
- * @param bool $dontlimitchars Whether limit chars
+ * @param Array $url_params     Links parameters
+ * @param int   $pos            Position to display
+ * @param int   $num_rows       Number of results row
+ * @param bool  $dontlimitchars Whether limit chars
  *
  * @return string
  */
@@ -175,7 +170,7 @@ function PMA_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars)
         if (in_array(
             $GLOBALS['cfg']['TableNavigationLinksMode'],
             array('icons', 'both')
-            )
+        )
         ) {
             $html .= ' title="' . _pgettext('Previous page', 'Previous') . '">';
         } else {
@@ -213,7 +208,7 @@ function PMA_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars)
         if (in_array(
             $GLOBALS['cfg']['TableNavigationLinksMode'],
             array('icons', 'both')
-            )
+        ) 
         ) {
             $html .= ' title="' . _pgettext('Next page', 'Next') . '">';
         } else {
@@ -228,9 +223,8 @@ function PMA_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars)
 /**
  * Returns the html for all binary log items.
  *
- * @param resource $result MySQL Query result
- *
- * @param bool $dontlimitchars Whether limit chars
+ * @param resource $result         MySQL Query result
+ * @param bool     $dontlimitchars Whether limit chars
  *
  * @return string
  */
@@ -239,9 +233,9 @@ function PMA_getAllLogItemInfo($result, $dontlimitchars)
     $html = "";
     $odd_row = true;
     while ($value = $GLOBALS['dbi']->fetchAssoc($result)) {
-        if (! $dontlimitchars
-            && $GLOBALS['PMA_String']::strlen($value['Info']) > $GLOBALS['cfg']['LimitChars']
-        ) {
+        $len_info = $GLOBALS['PMA_String']::strlen($value['Info']);
+        $len_limitChars = $GLOBALS['cfg']['LimitChars'];
+        if (! $dontlimitchars && $len_info > $len_limitChars) {
             $value['Info'] = $GLOBALS['PMA_String']::substr(
                 $value['Info'], 0, $GLOBALS['cfg']['LimitChars']
             ) . '...';
diff --git a/libraries/server_plugins.lib.php b/libraries/server_plugins.lib.php
index 122f7c45fb..5808b3c7aa 100644
--- a/libraries/server_plugins.lib.php
+++ b/libraries/server_plugins.lib.php
@@ -161,18 +161,27 @@ function PMA_getModuleList($modules)
         $odd_row = !$odd_row;
         $html .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">';
         $html .= '<th rowspan="2">' . htmlspecialchars($module_name) . '</th>';
-        $html .= '<td>' . htmlspecialchars($module['info']['module_description']) . '</td>';
-        $html .= '<td>' . htmlspecialchars($module['info']['module_library']) . '</td>';
-        $html .= '<td>' . htmlspecialchars($module['info']['module_version']) . '</td>';
-        $html .= '<td>' . htmlspecialchars($module['info']['module_author']) . '</td>';
-        $html .= '<td>' . htmlspecialchars($module['info']['module_license']) . '</td>';
+        $html .= '<td>' . htmlspecialchars($module['info']['module_description']) 
+            .    '</td>';
+        $html .= '<td>' . htmlspecialchars($module['info']['module_library']) 
+        $html .= '<td>' . htmlspecialchars($module['info']['module_description']) 
+            .    '</td>';
+        $html .= '<td>' . htmlspecialchars($module['info']['module_version']) 
+        $html .= '<td>' . htmlspecialchars($module['info']['module_description']) 
+            .    '</td>';
+        $html .= '<td>' . htmlspecialchars($module['info']['module_author']) 
+        $html .= '<td>' . htmlspecialchars($module['info']['module_description']) 
+            .    '</td>';
+        $html .= '<td>' . htmlspecialchars($module['info']['module_license']) 
+        $html .= '<td>' . htmlspecialchars($module['info']['module_description']) 
+            .    '</td>';
         $html .= '</tr>';
         $html .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">';
         $html .= '<td colspan="5">';
         $html .= '<table>';
         $html .= '<tbody>';
                             
-        foreach ($module['plugins'] as $plugin_type => $plugin_list) {                            
+        foreach ($module['plugins'] as $plugin_type => $plugin_list) {
             $html .= '<tr class="noclick">';
             $html .= '<td><b class="plugin-type">' 
                 . htmlspecialchars($plugin_type) . '</b></td>';
@@ -181,7 +190,8 @@ function PMA_getModuleList($modules)
                 $html .= ($i != 0 ? '<br />' : '') 
                     . htmlspecialchars($plugin_list[$i]['plugin_name']);
                 if (!$plugin_list[$i]['is_active']) {
-                    $html .= ' <small class="attention">' . __('disabled') . '</small>';
+                    $html .= ' <small class="attention">' . __('disabled') 
+                        .    '</small>';
                 }
             }                                      
             $html .= '</td>';
diff --git a/server_collations.php b/server_collations.php
index fb9159bc81..872ceca68b 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -25,14 +25,15 @@ require_once 'libraries/mysql_charsets.inc.php';
 $response = PMA_Response::getInstance();
 
 $response->addHTML(PMA_getSubPageHeader('collations'));
-$response->addHTML(PMA_getHtmlForCharsets(
-                       $mysql_charsets, 
-                       $mysql_collations,
-                       $mysql_charsets_descriptions, 
-                       $mysql_default_collations, 
-                       $mysql_collations_available
-                   )
-                  );
+$response->addHTML(
+    PMA_getHtmlForCharsets(
+        $mysql_charsets, 
+        $mysql_collations,
+        $mysql_charsets_descriptions, 
+        $mysql_default_collations, 
+        $mysql_collations_available
+    )
+);
 
 exit;
 
diff --git a/server_plugins.php b/server_plugins.php
index 0d997ac028..cde4878f7b 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -28,8 +28,9 @@ require 'libraries/server_plugins.lib.php';
 /**
  * Prepare plugin list
  */
-$sql = "SELECT p.plugin_name, p.plugin_type, p.is_active, m.module_name, m.module_library,
-        m.module_version, m.module_author, m.module_description, m.module_license
+$sql = "SELECT p.plugin_name, p.plugin_type, p.is_active, m.module_name, 
+        m.module_library, m.module_version, m.module_author, 
+        m.module_description, m.module_license
     FROM data_dictionary.plugins p
         JOIN data_dictionary.modules m USING (module_name)
     ORDER BY m.module_name, p.plugin_type, p.plugin_name";