From 6991fe762b0a841ea4d2a49a87404c1c24e657b6 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 17 Nov 2015 21:40:50 +1100
Subject: [PATCH] Use own dbi instance, Use templating

---
 .../controllers/ServerVariablesController.php | 30 +++++++------------
 .../server/variables/link_template.phtml      | 13 ++++++++
 2 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 templates/server/variables/link_template.phtml

diff --git a/libraries/controllers/ServerVariablesController.php b/libraries/controllers/ServerVariablesController.php
index 2e084e852c..ddc2765530 100644
--- a/libraries/controllers/ServerVariablesController.php
+++ b/libraries/controllers/ServerVariablesController.php
@@ -10,6 +10,7 @@
 namespace PMA\libraries\controllers;
 
 use PMA\libraries\Message;
+use PMA\libraries\Template;
 use PMA\libraries\Util;
 
 /**
@@ -57,17 +58,17 @@ class ServerVariablesController extends Controller
         /**
          * Sends the queries and buffers the results
          */
-        $serverVarsResult = $GLOBALS['dbi']->tryQuery('SHOW SESSION VARIABLES;');
+        $serverVarsResult = $this->dbi->tryQuery('SHOW SESSION VARIABLES;');
 
         if ($serverVarsResult !== false) {
 
             $serverVarsSession = array();
-            while ($arr = $GLOBALS['dbi']->fetchRow($serverVarsResult)) {
+            while ($arr = $this->dbi->fetchRow($serverVarsResult)) {
                 $serverVarsSession[$arr[0]] = $arr[1];
             }
-            $GLOBALS['dbi']->freeResult($serverVarsResult);
+            $this->dbi->freeResult($serverVarsResult);
 
-            $serverVars = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
+            $serverVars = $this->dbi->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
 
             /**
              * Link templates
@@ -110,7 +111,7 @@ class ServerVariablesController extends Controller
         header('Content-Type: text/html; charset=UTF-8');
         // Do not use double quotes inside the query to avoid a problem
         // when server is running in ANSI_QUOTES sql_mode
-        $varValue = $GLOBALS['dbi']->fetchSingleRow(
+        $varValue = $this->dbi->fetchSingleRow(
             'SHOW GLOBAL VARIABLES WHERE Variable_name=\''
             . Util::sqlAddSlashes($_REQUEST['varName']) . '\';',
             'NUM'
@@ -174,12 +175,12 @@ class ServerVariablesController extends Controller
         }
 
         if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])
-            && $GLOBALS['dbi']->query(
+            && $this->dbi->query(
                 'SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value
             )
         ) {
             // Some values are rounded down etc.
-            $varValue = $GLOBALS['dbi']->fetchSingleRow(
+            $varValue = $this->dbi->fetchSingleRow(
                 'SHOW GLOBAL VARIABLES WHERE Variable_name="'
                 . Util::sqlAddSlashes($_REQUEST['varName'])
                 . '";', 'NUM'
@@ -234,17 +235,8 @@ class ServerVariablesController extends Controller
     private function _getHtmlForLinkTemplates()
     {
         $url = 'server_variables.php' . PMA_URL_getCommon();
-        $output  = '<a style="display: none;" href="'
-            . $url . '" class="ajax saveLink">';
-        $output .= Util::getIcon('b_save.png', __('Save')) . '</a> ';
-        $output .= '<a style="display: none;" href="#" class="cancelLink">';
-        $output .= Util::getIcon('b_close.png', __('Cancel')) . '</a> ';
-        $output .= Util::getImage(
-            'b_help.png',
-            __('Documentation'),
-            array('style' => 'display:none', 'id' => 'docImage')
-        );
-        return $output;
+        return Template::get('server/variables/link_template')
+            ->render(array('url' => $url));
     }
 
     /**
@@ -349,7 +341,7 @@ class ServerVariablesController extends Controller
             $output .= '</td>';
 
             $output .= '<td class="var-value value'
-                . ($GLOBALS['dbi']->isSuperuser() ? ' editable' : '') . '">&nbsp;'
+                . ($this->dbi->isSuperuser() ? ' editable' : '') . '">&nbsp;'
                 . $this->_formatVariable($name, $value, $variable_doc_links)
                 . '</td>'
                 . '</tr>';
diff --git a/templates/server/variables/link_template.phtml b/templates/server/variables/link_template.phtml
new file mode 100644
index 0000000000..ab7bbd2add
--- /dev/null
+++ b/templates/server/variables/link_template.phtml
@@ -0,0 +1,13 @@
+<a style="display: none;" href="<?php echo $url; ?>" class="ajax saveLink">
+    <?php echo \PMA\libraries\Util::getIcon('b_save.png', __('Save')); ?>
+</a>
+<a style="display: none;" href="#" class="cancelLink">
+    <?php echo \PMA\libraries\Util::getIcon('b_close.png', __('Cancel')); ?>
+</a>
+<?php
+echo \PMA\libraries\Util::getImage(
+    'b_help.png',
+    __('Documentation'),
+    array('style' => 'display:none', 'id' => 'docImage')
+);
+?>
\ No newline at end of file