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

Merge branch 'QA_4_2' into QA_4_3

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-11-25 09:15:08 +05:30
commit 0fda8293f4
3 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
4.2.13.0 (not yet released)
- bug #4604 Query history not being deleted
- bug #4057 db/table query string parameters no longer work
- bug #4605 Unseen messages in tracking
4.2.12.0 (2014-11-20)
- bug #4574 Blank/white page when JavaScript disabled

53
libraries/tracking.lib.php
View File

@ -954,19 +954,21 @@ function PMA_getHtmlForIndex($index, $style)
*
* @param array &$data tracked data
*
* @return void
* @return string HTML for the message
*/
function PMA_deleteTrackingReportRows(&$data)
{
$html = '';
if (isset($_REQUEST['delete_ddlog'])) {
// Delete ddlog row data
PMA_handleDeleteDataDefinitionsLog($data);
$html .= PMA_handleDeleteDataDefinitionsLog($data);
}
if (isset($_REQUEST['delete_dmlog'])) {
// Delete dmlog row data
PMA_handleDeleteDataManipulationLog($data);
$html .= PMA_handleDeleteDataManipulationLog($data);
}
return $html;
}
/**
@ -974,10 +976,11 @@ function PMA_deleteTrackingReportRows(&$data)
*
* @param array &$data tracked data
*
* @return void
* @return string HTML for the message
*/
function PMA_handleDeleteDataDefinitionsLog(&$data)
{
$html = '';
$delete_id = $_REQUEST['delete_ddlog'];
// Only in case of valable id
@ -995,8 +998,9 @@ function PMA_handleDeleteDataDefinitionsLog(&$data)
} else {
$msg = PMA_Message::rawError(__('Query error'));
}
$msg->display();
$html .= $msg->getDisplay();
}
return $html;
}
/**
@ -1004,10 +1008,11 @@ function PMA_handleDeleteDataDefinitionsLog(&$data)
*
* @param array &$data tracked data
*
* @return void
* @return string HTML for the message
*/
function PMA_handleDeleteDataManipulationLog(&$data)
{
$html = '';
$delete_id = $_REQUEST['delete_dmlog'];
// Only in case of valable id
@ -1025,8 +1030,9 @@ function PMA_handleDeleteDataManipulationLog(&$data)
} else {
$msg = PMA_Message::rawError(__('Query error'));
}
$msg->display();
$html .= $msg->getDisplay();
}
return $html;
}
/**
@ -1034,10 +1040,11 @@ function PMA_handleDeleteDataManipulationLog(&$data)
*
* @param array $entries entries
*
* @return void
* @return string HTML SQL query form
*/
function PMA_exportAsSQLDump($entries)
{
$html = '';
$new_query = "# "
. __(
'You can execute the dump by creating and using a temporary database. '
@ -1056,18 +1063,19 @@ function PMA_exportAsSQLDump($entries)
$msg = PMA_Message::success(
__('SQL statements exported. Please copy the dump or execute it.')
);
$msg->display();
$html .= $msg->getDisplay();
$db_temp = $GLOBALS['db'];
$table_temp = $GLOBALS['table'];
$GLOBALS['db'] = $GLOBALS['table'] = '';
include_once './libraries/sql_query_form.lib.php';
PMA_getHtmlForSqlQueryForm($new_query, 'sql');
$html .= PMA_getHtmlForSqlQueryForm($new_query, 'sql');
$GLOBALS['db'] = $db_temp;
$GLOBALS['table'] = $table_temp;
return $html;
}
/**
@ -1083,8 +1091,6 @@ function PMA_exportAsSQLExecution($entries)
foreach ($entries as $entry) {
$sql_result = $GLOBALS['dbi']->query("/*NOTRACK*/\n" . $entry['statement']);
}
$msg = PMA_Message::success(__('SQL statements executed.'));
$msg->display();
return $sql_result;
}
@ -1123,10 +1129,11 @@ function PMA_exportAsFileDownload($entries)
/**
* Function to activate tracking
*
* @return void
* @return string HTML for the success message
*/
function PMA_activateTracking()
{
$html = '';
$activated = PMA_Tracker::activateTracking(
$GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version']
);
@ -1138,17 +1145,20 @@ function PMA_activateTracking()
htmlspecialchars($_REQUEST['version'])
)
);
$msg->display();
$html .= $msg->getDisplay();
}
return $html;
}
/**
* Function to deactivate tracking
*
* @return void
* @return string HTML of the success message
*/
function PMA_deactivateTracking()
{
$html = '';
$deactivated = PMA_Tracker::deactivateTracking(
$GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version']
);
@ -1160,8 +1170,10 @@ function PMA_deactivateTracking()
htmlspecialchars($_REQUEST['version'])
)
);
$msg->display();
$html .= $msg->getDisplay();
}
return $html;
}
/**
@ -1213,10 +1225,11 @@ function PMA_getTrackingSet()
/**
* Function to create the tracking version
*
* @return void
* @return string HTML of the success message
*/
function PMA_createTrackingVersion()
{
$html = '';
$tracking_set = PMA_getTrackingSet();
$versionCreated = PMA_Tracker::createVersion(
@ -1234,8 +1247,10 @@ function PMA_createTrackingVersion()
htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
)
);
$msg->display();
$html .= $msg->getDisplay();
}
return $html;
}
/**

12
tbl_tracking.php
View File

@ -71,27 +71,29 @@ $html = '<br />';
// Create tracking version
if (isset($_REQUEST['submit_create_version'])) {
PMA_createTrackingVersion();
$html .= PMA_createTrackingVersion();
}
// Deactivate tracking
if (isset($_REQUEST['submit_deactivate_now'])) {
PMA_deactivateTracking();
$html .= PMA_deactivateTracking();
}
// Activate tracking
if (isset($_REQUEST['submit_activate_now'])) {
PMA_activateTracking();
$html .= PMA_activateTracking();
}
// Export as SQL execution
if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'execution') {
$sql_result = PMA_exportAsSQLExecution($entries);
$msg = PMA_Message::success(__('SQL statements executed.'));
$html .= $msg->getDisplay();
}
// Export as SQL dump
if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') {
PMA_exportAsSQLDump($entries);
$html .= PMA_exportAsSQLDump($entries);
}
/*
@ -108,7 +110,7 @@ if (isset($_REQUEST['snapshot'])) {
if (isset($_REQUEST['report'])
&& (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))
) {
PMA_deleteTrackingReportRows($data);
$html .= PMA_deleteTrackingReportRows($data);
}
if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {