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

Activate/deactivate tracking with a single parameter

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-02-23 08:45:33 +05:30
parent 05ebf9a3a7
commit a43c9b2df0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/tracking.lib.php
View File

@ -200,17 +200,17 @@ function PMA_getHtmlForActivateDeactivateTracking(
switch($action) {
case 'activate':
$legend = __('Activate tracking for %s');
$hidden = "submit_activate_now";
$value = "activate_now";
$button = __('Activate now');
break;
case 'deactivate':
$legend = __('Deactivate tracking for %s');
$hidden = "submit_deactivate_now";
$value = "deactivate_now";
$button = __('Deactivate now');
break;
default:
$legend = '';
$hidden = '';
$value = '';
$button = '';
}
@ -220,7 +220,7 @@ function PMA_getHtmlForActivateDeactivateTracking(
);
$html .= '</legend>';
$html .= '<input type="hidden" name="version" value="' . $last_version . '" />';
$html .= '<input type="hidden" name="' . $hidden . '" value="1" />';
$html .= '<input type="hidden" name="toggle_activation" value="' . $value . '" />';
$html .= '<input type="submit" value="' . $button . '" />';
$html .= '</fieldset>';
$html .= '</form>';

11
tbl_tracking.php
View File

@ -23,7 +23,8 @@ require './libraries/tbl_common.inc.php';
if (PMA_Tracker::isActive()
&& PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])
&& ! isset($_REQUEST['submit_deactivate_now'])
&& ! (isset($_REQUEST['toggle_activation'])
&& $_REQUEST['toggle_activation'] == 'deactivate_now')
&& ! (isset($_REQUEST['report_export'])
&& $_REQUEST['export_type'] == 'sqldumpfile')
) {
@ -118,12 +119,16 @@ if (isset($_REQUEST['submit_create_version'])) {
}
// Deactivate tracking
if (isset($_REQUEST['submit_deactivate_now'])) {
if (isset($_REQUEST['toggle_activation'])
&& $_REQUEST['toggle_activation'] == 'deactivate_now'
) {
$html .= PMA_deactivateTracking();
}
// Activate tracking
if (isset($_REQUEST['submit_activate_now'])) {
if (isset($_REQUEST['toggle_activation'])
&& $_REQUEST['toggle_activation'] == 'activate_now'
) {
$html .= PMA_activateTracking();
}