Replace static methods with instance methods

Replaces PhpMyAdmin\Tracking static methods with instance methods. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Mar 31, 2018 · 5f0a790 · 5f0a790
1 parent b6767f4
commit 5f0a790
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 130 deletions.
diff --git a/db_tracking.php b/db_tracking.php
@@ -25,6 +25,8 @@
 $scripts->addFile('vendor/jquery/jquery.tablesorter.js');
 $scripts->addFile('db_tracking.js');
 
+$tracking = new Tracking();
+
 /**
  * If we are not in an Ajax request, then do the common work and show the links etc.
  */
@@ -57,7 +59,7 @@
 
 } elseif (isset($_REQUEST['submit_create_version'])) {
 
-    Tracking::createTrackingForMultipleTables($_REQUEST['selected']);
+    $tracking->createTrackingForMultipleTables($_REQUEST['selected']);
     Message::success(
         sprintf(
             __(
@@ -82,7 +84,7 @@
 
         } elseif ($_REQUEST['submit_mult'] == 'track') {
 
-            echo Tracking::getHtmlForDataDefinitionAndManipulationStatements(
+            echo $tracking->getHtmlForDataDefinitionAndManipulationStatements(
                 'db_tracking.php' . $url_query,
                 0,
                 $GLOBALS['db'],
@@ -129,17 +131,17 @@
 if (is_object($all_tables_result)
     && $GLOBALS['dbi']->numRows($all_tables_result) > 0
 ) {
-    echo Tracking::getHtmlForTrackedTables(
+    echo $tracking->getHtmlForTrackedTables(
         $GLOBALS['db'], $all_tables_result, $url_query, $pmaThemeImage,
         $text_dir, $cfgRelation
     );
 }
 
-$untracked_tables = Tracking::getUntrackedTables($GLOBALS['db']);
+$untracked_tables = $tracking->getUntrackedTables($GLOBALS['db']);
 
 // If untracked tables exist
 if (count($untracked_tables) > 0) {
-    echo Tracking::getHtmlForUntrackedTables(
+    echo $tracking->getHtmlForUntrackedTables(
         $GLOBALS['db'], $untracked_tables, $url_query, $pmaThemeImage, $text_dir
     );
 }