Merge pull request #505 from xmujay/serverview_refactor

refactor server_status_advisor.php: move functions to server_status_advisor.lib.php

libraries/server_status_advisor.lib.php

@@ -0,0 +1,70 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * functions for displaying server status sub item: advisor
+ *
+ * @usedby  server_status_advisor.php
+ *  
+ * @package PhpMyAdmin
+ */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
+/**
+ * Returns html with Advisor
+ *
+ * @return string
+ */
+function PMA_getHtmlForAdvisor()
+{
+    $output  = '<a href="#openAdvisorInstructions">';
+    $output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
+    $output .= '</a>';
+    $output .= '<div id="statustabs_advisor"></div>';
+    $output .= '<div id="advisorInstructionsDialog" style="display:none;">';
+    $output .= '<p>';
+    $output .= __(
+        'The Advisor system can provide recommendations '
+        . 'on server variables by analyzing the server status variables.'
+    );
+    $output .= '</p>';
+    $output .= '<p>';
+    $output .= __(
+        'Do note however that this system provides recommendations '
+        . 'based on simple calculations and by rule of thumb which may '
+        . 'not necessarily apply to your system.'
+    );
+    $output .= '</p>';
+    $output .= '<p>';
+    $output .= __(
+        'Prior to changing any of the configuration, be sure to know '
+        . 'what you are changing (by reading the documentation) and how '
+        . 'to undo the change. Wrong tuning can have a very negative '
+        . 'effect on performance.'
+    );
+    $output .= '</p>';
+    $output .= '<p>';
+    $output .= __(
+        'The best way to tune your system would be to change only one '
+        . 'setting at a time, observe or benchmark your database, and undo '
+        . 'the change if there was no clearly measurable improvement.'
+    );
+    $output .= '</p>';
+    $output .= '</div>';
+    $output .= '<div id="advisorData" style="display:none;">';
+    $advisor = new Advisor();
+    $output .= htmlspecialchars(
+        json_encode(
+            $advisor->run()
+        )
+    );
+    $output .= '</div>';
+
+    return $output;
+}
+
+?>
+
+

server_status_advisor.php

@@ -9,6 +9,8 @@
 require_once 'libraries/common.inc.php';
 require_once 'libraries/Advisor.class.php';
 require_once 'libraries/ServerStatusData.class.php';
+require_once 'libraries/server_status_advisor.lib.php';
+
 if (PMA_DRIZZLE) {
     $server_master_status = false;
     $server_slave_status = false;
@@ -28,62 +30,10 @@
  */
 $response->addHTML('<div>');
 $response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(PMA_getAdvisorHtml());
+$response->addHTML(PMA_getHtmlForAdvisor());
 $response->addHTML('</div>');
 exit;
 
 
-/**
- * Returns html with Advisor
- *
- * @return string
- */
-function PMA_getAdvisorHtml()
-{
-    $output  = '<a href="#openAdvisorInstructions">';
-    $output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
-    $output .= '</a>';
-    $output .= '<div id="statustabs_advisor"></div>';
-    $output .= '<div id="advisorInstructionsDialog" style="display:none;">';
-    $output .= '<p>';
-    $output .= __(
-        'The Advisor system can provide recommendations '
-        . 'on server variables by analyzing the server status variables.'
-    );
-    $output .= '</p>';
-    $output .= '<p>';
-    $output .= __(
-        'Do note however that this system provides recommendations '
-        . 'based on simple calculations and by rule of thumb which may '
-        . 'not necessarily apply to your system.'
-    );
-    $output .= '</p>';
-    $output .= '<p>';
-    $output .= __(
-        'Prior to changing any of the configuration, be sure to know '
-        . 'what you are changing (by reading the documentation) and how '
-        . 'to undo the change. Wrong tuning can have a very negative '
-        . 'effect on performance.'
-    );
-    $output .= '</p>';
-    $output .= '<p>';
-    $output .= __(
-        'The best way to tune your system would be to change only one '
-        . 'setting at a time, observe or benchmark your database, and undo '
-        . 'the change if there was no clearly measurable improvement.'
-    );
-    $output .= '</p>';
-    $output .= '</div>';
-    $output .= '<div id="advisorData" style="display:none;">';
-    $advisor = new Advisor();
-    $output .= htmlspecialchars(
-        json_encode(
-            $advisor->run()
-        )
-    );
-    $output .= '</div>';
-
-    return $output;
-}
 
 ?>