From 766466135e0e4dcca26744e72fc277a3d8f05d11 Mon Sep 17 00:00:00 2001
From: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
Date: Fri, 22 Jun 2012 23:38:33 +0530
Subject: Implement class behavior of common.lib.php file

---
 server_databases.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'server_databases.php')

diff --git a/server_databases.php b/server_databases.php
index e95a01f847..5da5a3c9fa 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -13,6 +13,7 @@ $response = PMA_Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server_databases.js');
+$common_functions = PMA_CommonFunctions::getInstance();
 
 require 'libraries/server_common.inc.php';
 if (! PMA_DRIZZLE) {
@@ -128,7 +129,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
  * Displays the sub-page heading
  */
 echo '<h2>' . "\n"
-   . PMA_getImage('s_db.png')
+   . $common_functions->getImage('s_db.png')
    . ($dbstats ? __('Databases statistics') : __('Databases')) . "\n"
    .'</h2>' . "\n";
 
@@ -172,7 +173,10 @@ if ($databases_count > 0) {
         'sort_order' => $sort_order,
     );
 
-    echo PMA_getListNavigator($databases_count, $pos, $_url_params, 'server_databases.php', 'frame_content', $GLOBALS['cfg']['MaxDbList']);
+    echo $common_functions->getListNavigator(
+        $databases_count, $pos, $_url_params, 'server_databases.php',
+        'frame_content', $GLOBALS['cfg']['MaxDbList']
+    );
 
     $_url_params['pos'] = $pos;
 
@@ -188,7 +192,7 @@ if ($databases_count > 0) {
        . ($is_superuser || $cfg['AllowUserDropDatabase'] ? '        <th></th>' . "\n" : '')
        . '    <th><a href="server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
        . '            ' . __('Database') . "\n"
-       . ($sort_by == 'SCHEMA_NAME' ? '                ' . PMA_getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '')
+       . ($sort_by == 'SCHEMA_NAME' ? '                ' . $common_functions->getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '')
        . '        </a></th>' . "\n";
     $table_columns = 3;
     foreach ($column_order as $stat_name => $stat) {
@@ -205,7 +209,7 @@ if ($databases_count > 0) {
             echo '    <th' . $colspan . '>'
                 .'<a href="server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
                 .'            ' . $stat['disp_name'] . "\n"
-                .($sort_by == $stat_name ? '            ' . PMA_getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '')
+                .($sort_by == $stat_name ? '            ' . $common_functions->getImage('s_' . $sort_order . '.png', ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : '')
                 .'        </a></th>' . "\n";
         }
     }
@@ -254,9 +258,9 @@ if ($databases_count > 0) {
     foreach ($column_order as $stat_name => $stat) {
         if (array_key_exists($stat_name, $first_database)) {
             if ($stat['format'] === 'byte') {
-                list($value, $unit) = PMA_formatByteDown($stat['footer'], 3, 1);
+                list($value, $unit) = $common_functions->formatByteDown($stat['footer'], 3, 1);
             } elseif ($stat['format'] === 'number') {
-                $value = PMA_formatNumber($stat['footer'], 0);
+                $value = $common_functions->formatNumber($stat['footer'], 0);
             } else {
                 $value = htmlentities($stat['footer'], 0);
             }
@@ -297,7 +301,7 @@ if ($databases_count > 0) {
            . '<a href="server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
            . '    ' . __('Uncheck All') . '</a>' . "\n"
            . '<i>' . __('With selected:') . '</i>' . "\n";
-        echo PMA_getButtonOrImage('drop_selected_dbs', 'mult_submit' . ($cfg['AjaxEnable'] ? ' ajax' : ''), 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
+        echo $common_functions->getButtonOrImage('drop_selected_dbs', 'mult_submit' . ($cfg['AjaxEnable'] ? ' ajax' : ''), 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
     }
 
     if (empty($dbstats)) {
-- 
cgit v1.2.3