From cd6e5b0025fb7835354bc4f9c11ad53d49da9402 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 26 Nov 2015 19:26:26 +1100
Subject: [PATCH] Fix coding style violations

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 .../server/ServerDatabasesController.php      | 37 +++++++++++--------
 .../server/ServerVariablesController.php      |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index a68e9a747d..9c6b11bf6e 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -53,7 +53,7 @@ class ServerDatabasesController extends Controller
      */
     public function indexAction()
     {
-        require_once 'libraries/check_user_privileges.lib.php';
+        include_once 'libraries/check_user_privileges.lib.php';
 
         if (isset($_REQUEST['drop_selected_dbs'])
             && $GLOBALS['is_ajax_request']
@@ -63,17 +63,17 @@ class ServerDatabasesController extends Controller
             return;
         }
 
-        require_once 'libraries/replication.inc.php';
-        require_once 'libraries/mysql_charsets.inc.php';
+        include_once 'libraries/replication.inc.php';
+        include_once 'libraries/mysql_charsets.inc.php';
 
         if (! empty($_POST['new_db'])
-           && $GLOBALS['is_ajax_request']
+            && $GLOBALS['is_ajax_request']
         ) {
             $this->createDatabaseAction();
             return;
         }
 
-        require_once 'libraries/server_common.inc.php';
+        include_once 'libraries/server_common.inc.php';
 
         $header  = $this->response->getHeader();
         $scripts = $header->getScripts();
@@ -251,7 +251,7 @@ class ServerDatabasesController extends Controller
     /**
      * Returns the html for Database List
      *
-     * @param array  $replication_types replication types
+     * @param array $replication_types replication types
      *
      * @return string
      */
@@ -415,8 +415,8 @@ class ServerDatabasesController extends Controller
     /**
      * Returns the html for Database List
      *
-     * @param array  $column_order      column order
-     * @param array  $replication_types replication types
+     * @param array $column_order      column order
+     * @param array $replication_types replication types
      *
      * @return string
      */
@@ -511,9 +511,11 @@ class ServerDatabasesController extends Controller
                 'tr_class' => $tr_class,
                 'url_query' => $url_query,
                 'column_order' => $column_order,
-                'master_replication_status' => $GLOBALS['replication_info']['master']['status'],
+                'master_replication_status'
+                    => $GLOBALS['replication_info']['master']['status'],
                 'master_replication' => $master_replication,
-                'slave_replication_status' => $GLOBALS['replication_info']['slave']['status'],
+                'slave_replication_status'
+                    => $GLOBALS['replication_info']['slave']['status'],
                 'slave_replication' => $slave_replication,
             )
         );
@@ -522,9 +524,9 @@ class ServerDatabasesController extends Controller
     /**
      * Returns the html for table header
      *
-     * @param array  $_url_params    url params
-     * @param array  $column_order   column order
-     * @param array  $first_database database to show
+     * @param array $_url_params    url params
+     * @param array $column_order   column order
+     * @param array $first_database database to show
      *
      * @return string
      */
@@ -536,11 +538,14 @@ class ServerDatabasesController extends Controller
                 '_url_params' => $_url_params,
                 'sort_by' => $this->_sort_by,
                 'sort_order' => $this->_sort_order,
-                'sort_order_text' => ($this->_sort_order == 'asc' ? __('Ascending') : __('Descending')),
+                'sort_order_text' => ($this->_sort_order == 'asc'
+                    ? __('Ascending') : __('Descending')),
                 'column_order' => $column_order,
                 'first_database' => $first_database,
-                'master_replication' => $GLOBALS['replication_info']['master']['status'],
-                'slave_replication' => $GLOBALS['replication_info']['slave']['status'],
+                'master_replication'
+                    => $GLOBALS['replication_info']['master']['status'],
+                'slave_replication'
+                    => $GLOBALS['replication_info']['slave']['status'],
             )
         );
     }
diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php
index 664870d239..df0f28ff3c 100644
--- a/libraries/controllers/server/ServerVariablesController.php
+++ b/libraries/controllers/server/ServerVariablesController.php
@@ -59,7 +59,7 @@ class ServerVariablesController extends Controller
             return;
         }
 
-        require 'libraries/server_common.inc.php';
+        include 'libraries/server_common.inc.php';
 
         $header   = $this->response->getHeader();
         $scripts  = $header->getScripts();