refactor server_variables

1. move functions to separated files
2. render HTML at once
3. refactor function name to PMA_getHtmlForSubPageHeader

1 files changed, 10 insertions, 196 deletions

diff --git a/server_variables.php b/server_variables.php
index 50356392ac..b796c1b064 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -7,6 +7,7 @@
  */
 
 require_once 'libraries/common.inc.php';
+require_once 'libraries/server_variables.lib.php';
 
 $response = PMA_Response::getInstance();
 $header   = $response->getHeader();
@@ -28,85 +29,11 @@ require 'libraries/server_variables_doc.php';
  */
 
 if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
-    $response = PMA_Response::getInstance();
-
     if (isset($_REQUEST['type'])) {
         if ($_REQUEST['type'] === 'getval') {
-            // Send with correct charset
-            header('Content-Type: text/html; charset=UTF-8');
-            $varValue = $GLOBALS['dbi']->fetchSingleRow(
-                'SHOW GLOBAL VARIABLES WHERE Variable_name="'
-                . PMA_Util::sqlAddSlashes($_REQUEST['varName']) . '";',
-                'NUM'
-            );
-            if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3])
-                && $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte'
-            ) {
-                $response->addJSON(
-                    'message',
-                    implode(
-                        ' ', PMA_Util::formatByteDown($varValue[1], 3, 3)
-                    )
-                );
-            } else {
-                $response->addJSON(
-                    'message',
-                    $varValue[1]
-                );
-            }
+            PMA_getAjaxReturnForGetVal();
         } else if ($_REQUEST['type'] === 'setval') {
-            $value = $_REQUEST['varValue'];
-
-            if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3])
-                && $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte'
-                && preg_match(
-                    '/^\s*(\d+(\.\d+)?)\s*(mb|kb|mib|kib|gb|gib)\s*$/i',
-                    $value,
-                    $matches
-                )
-            ) {
-                $exp = array(
-                    'kb' => 1,
-                    'kib' => 1,
-                    'mb' => 2,
-                    'mib' => 2,
-                    'gb' => 3,
-                    'gib' => 3
-                );
-                $value = floatval($matches[1]) * PMA_Util::pow(
-                    1024,
-                    $exp[strtolower($matches[3])]
-                );
-            } else {
-                $value = PMA_Util::sqlAddSlashes($value);
-            }
-
-            if (! is_numeric($value)) {
-                $value="'" . $value . "'";
-            }
-
-            if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])
-                && $GLOBALS['dbi']->query(
-                    'SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value
-                )
-            ) {
-                // Some values are rounded down etc.
-                $varValue = $GLOBALS['dbi']->fetchSingleRow(
-                    'SHOW GLOBAL VARIABLES WHERE Variable_name="'
-                    . PMA_Util::sqlAddSlashes($_REQUEST['varName'])
-                    . '";', 'NUM'
-                );
-                $response->addJSON(
-                    'variable',
-                    PMA_formatVariable($_REQUEST['varName'], $varValue[1])
-                );
-            } else {
-                $response->isSuccess(false);
-                $response->addJSON(
-                    'error',
-                    __('Setting variable failed')
-                );
-            }
+            PMA_getAjaxReturnForSetVal();
         }
         exit;
     }
@@ -115,134 +42,21 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
 /**
  * Displays the sub-page heading
  */
-$output = '<h2>' . PMA_Util::getImage('s_vars.png')
-    . '' . __('Server variables and settings') . "\n"
-    . PMA_Util::showMySQLDocu(
-        'server_system_variables', 'server_system_variables'
-    )
-    . '</h2>' . "\n";
-
-/**
- * Link templates
- */
-$url = htmlspecialchars('server_variables.php?' . PMA_generate_common_url());
-$output .= '<a style="display: none;" href="#" class="editLink">';
-$output .= PMA_Util::getIcon('b_edit.png', __('Edit')) . '</a>';
-$output .= '<a style="display: none;" href="' . $url . '" class="ajax saveLink">';
-$output .= PMA_Util::getIcon('b_save.png', __('Save')) . '</a> ';
-$output .= '<a style="display: none;" href="#" class="cancelLink">';
-$output .= PMA_Util::getIcon('b_close.png', __('Cancel')) . '</a> ';
-$output .= PMA_Util::getImage(
-    'b_help.png',
-    __('Documentation'),
-    array(
-        'style' => 'display:none',
-        'id' => 'docImage'
-    )
+$doc_link = PMA_Util::showMySQLDocu(
+    'server_system_variables', 'server_system_variables'
 );
+$response->addHtml(PMA_getHtmlForSubPageHeader('variables', $doc_link));
 
 /**
- * Sends the queries and buffers the results
+ * Link templates
  */
-$serverVarsSession = $GLOBALS['dbi']->fetchResult('SHOW SESSION VARIABLES;', 0, 1);
-$serverVars = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
-
+$response->addHtml(PMA_getHtmlForLinkTemplates());
 
 /**
  * Displays the page
  */
-$value = ! empty($_REQUEST['filter']) ? htmlspecialchars($_REQUEST['filter']) : '';
-$output .= '<fieldset id="tableFilter">'
-    . '<legend>' . __('Filters') . '</legend>'
-    . '<div class="formelement">'
-    . '<label for="filterText">' .  __('Containing the word:') . '</label>'
-    . '<input name="filterText" type="text" id="filterText"'
-    . ' style="vertical-align: baseline;" value="' . $value . '" />'
-    . '</div>'
-    . '</fieldset>';
-
-$output .= '<div id="serverVariables" class="data filteredData noclick">'
-    . '<div class="var-header var-row">'
-    . '<div class="var-name">' .  __('Variable') . '</div>'
-    . '<div class="var-value valueHeader">'
-    . __('Session value') . ' / ' . __('Global value')
-    . '</div>'
-    . '<div style="clear:both"></div>'
-    . '</div>';
-
-$odd_row = true;
-foreach ($serverVars as $name => $value) {
-    $has_session_value = isset($serverVarsSession[$name])
-        && $serverVarsSession[$name] != $value;
-    $row_class = ($odd_row ? ' odd' : ' even')
-        . ($has_session_value ? ' diffSession' : '');
-
-    $output .= '<div class="var-row' . $row_class . '">'
-        . '<div class="var-name">';
-
-    // To display variable documentation link
-    if (isset($VARIABLE_DOC_LINKS[$name])) {
-        $output .= '<span title="' . htmlspecialchars(str_replace('_', ' ', $name)) . '">';
-        $output .= PMA_Util::showMySQLDocu(
-            $VARIABLE_DOC_LINKS[$name][1],
-            $VARIABLE_DOC_LINKS[$name][1],
-            false,
-            $VARIABLE_DOC_LINKS[$name][2] . '_' . $VARIABLE_DOC_LINKS[$name][0],
-            true
-        );
-        $output .= htmlspecialchars(str_replace('_', ' ', $name));
-        $output .= '</a>';
-        $output .= '</span>';
-    } else {
-        $output .= htmlspecialchars(str_replace('_', ' ', $name));
-    }
-    $output .= '</div>'
-        . '<div class="var-value value' . ($GLOBALS['dbi']->isSuperuser() ? ' editable' : '') . '">&nbsp;'
-        . PMA_formatVariable($name, $value)
-        . '</div>'
-        . '<div style="clear:both"></div>'
-        . '</div>';
-
-    if ($has_session_value) {
-        $output .= '<div class="var-row' . ($odd_row ? ' odd' : ' even') . '">'
-            . '<div class="var-name session">(' . __('Session value') . ')</div>'
-            . '<div class="var-value value">&nbsp;' 
-            . PMA_formatVariable($name, $serverVarsSession[$name]) . '</div>'
-            . '<div style="clear:both"></div>'
-            . '</div>';
-    }
-
-    $odd_row = ! $odd_row;
-}
-$output .= '</div>';
-
-$response->addHtml($output);
-
-/**
- * Format Variable
- *
- * @param string  $name  variable name
- * @param numeric $value variable value
- *
- * @return formatted string
- */
-function PMA_formatVariable($name, $value)
-{
-    global $VARIABLE_DOC_LINKS;
+$response->addHtml(PMA_getHtmlForServerVariables());
 
-    if (is_numeric($value)) {
-        if (isset($VARIABLE_DOC_LINKS[$name][3])
-            && $VARIABLE_DOC_LINKS[$name][3]=='byte'
-        ) {
-            return '<abbr title="'
-                . PMA_Util::formatNumber($value, 0) . '">'
-                . implode(' ', PMA_Util::formatByteDown($value, 3, 3))
-                . '</abbr>';
-        } else {
-            return PMA_Util::formatNumber($value, 0);
-        }
-    }
-    return htmlspecialchars($value);
-}
+exit;
 
 ?>