gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor duplicated code

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2016-01-01 12:00:46 -05:00
parent acea807ed8
commit 1be4fc7a99
2 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libraries/tracking.lib.php
View File

@ -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'])
)

4
tbl_tracking.php
View File

@ -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