From 1be4fc7a998e46e7fa19e0fa7e4a9489d60fb4d5 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 1 Jan 2016 12:00:46 -0500
Subject: [PATCH] Refactor duplicated code

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/tracking.lib.php | 42 ++++++++++++--------------------------
 tbl_tracking.php           |  4 ++--
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 43b7ea275f..de734088ab 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -1205,45 +1205,29 @@ function PMA_exportAsFileDownload($entries)
 }
 
 /**
- * Function to activate tracking
+ * Function to activate or deactivate tracking
+ *
+ * @param string $action activate|deactivate
  *
  * @return string HTML for the success message
  */
-function PMA_activateTracking()
+function PMA_changeTracking($action)
 {
     $html = '';
-    $activated = Tracker::activateTracking(
-        $GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version']
-    );
-    if ($activated) {
-        $msg = Message::success(
-            sprintf(
-                __('Tracking for %1$s was activated at version %2$s.'),
-                htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']),
-                htmlspecialchars($_REQUEST['version'])
-            )
-        );
-        $html .= $msg->getDisplay();
+    if ($action == 'activate') {
+        $method = 'activateTracking';
+        $message = __('Tracking for %1$s was activated at version %2$s.');
+    } else {
+        $method = 'deactivateTracking';
+        $message = __('Tracking for %1$s was deactivated at version %2$s.');
     }
-
-    return $html;
-}
-
-/**
- * Function to deactivate tracking
- *
- * @return string HTML of the success message
- */
-function PMA_deactivateTracking()
-{
-    $html = '';
-    $deactivated = Tracker::deactivateTracking(
+    $status = Tracker::$method(
         $GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version']
     );
-    if ($deactivated) {
+    if ($status) {
         $msg = Message::success(
             sprintf(
-                __('Tracking for %1$s was deactivated at version %2$s.'),
+                $message,
                 htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']),
                 htmlspecialchars($_REQUEST['version'])
             )
diff --git a/tbl_tracking.php b/tbl_tracking.php
index fc309a5a2b..f4e23c42c8 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -124,14 +124,14 @@ if (isset($_REQUEST['submit_create_version'])) {
 if (isset($_REQUEST['toggle_activation'])
     && $_REQUEST['toggle_activation'] == 'deactivate_now'
 ) {
-    $html .= PMA_deactivateTracking();
+    $html .= PMA_changeTracking('deactivate');
 }
 
 // Activate tracking
 if (isset($_REQUEST['toggle_activation'])
     && $_REQUEST['toggle_activation'] == 'activate_now'
 ) {
-    $html .= PMA_activateTracking();
+    $html .= PMA_changeTracking('activate');
 }
 
 // Export as SQL execution