diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index a3218bd91..595c9e6ef 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1635,4 +1635,7 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index a6d1ec73f..83a809d4b 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1633,4 +1633,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 0586a0417..a8c1137db 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1638,4 +1638,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 552fb65bd..f2b18275b 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1632,4 +1632,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 512029f11..34a0f975d 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1634,4 +1634,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 1e64503c7..269fca3d7 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 4016bdf39..faf693d31 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 3b0ebf131..f111d8ebe 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1641,4 +1641,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 56a526292..46faa1f7c 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1635,4 +1635,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 5791b1227..1b624b23e 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 3ad5cec96..bce3141fb 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1635,4 +1635,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index edc42f90c..40447f95a 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1621,4 +1621,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 2e3ddb07d..b5c9d2e09 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1634,4 +1634,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 1628274f1..7ceb8ab78 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1636,4 +1636,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 6f038b16b..191b77ebd 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 32dc7d8e5..069c903d3 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1623,4 +1623,7 @@ $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration $strTargetDatabaseHasBeenSynchronized = 'Target database has been synchronized with source database'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index fb3b5f65c..85f3a7b5c 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1632,4 +1632,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 3aa482cb3..2788b465b 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1628,4 +1628,7 @@ $strTargetDatabaseHasBeenSynchronized = 'Target database has been synchronized w $strTrackingIsNotActive = 'Tracking is not active.'; //to translate $strTrackingStatusNotActive = 'not active'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index c1ec2be1e..fd6e84d5e 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -1468,6 +1468,7 @@ $strTotalUC = 'Total'; $strTrackingActivated = 'Tracking of %s.%s is activated.'; $strTrackingActivateNow = 'Activate now'; $strTrackingActivateTrackingFor = 'Activate tracking for %s.%s'; +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingCreateVersion = 'Create version'; $strTrackingCreateVersionOf = 'Create version %s of %s.%s'; $strTrackingDatabaseLog = 'Database Log'; @@ -1481,6 +1482,7 @@ $strTrackingIsActive = 'Tracking is active.'; $strTrackingIsNotActive = 'Tracking is not active.'; $strTrackingMechanism = 'Tracking Mechanism'; $strTrackingReportClose = 'Close'; +$strTrackingReportForTable = 'Tracking report for table `%s`'; $strTrackingReport = 'Tracking report'; $strTrackingShowLogDateUsers = 'Show %s with dates from %s to %s by user %s %s'; $strTrackingShowVersions = 'Show versions'; @@ -1510,6 +1512,7 @@ $strTrackingVersionCreated = 'Version %s is created, tracking for %s.%s is activ $strTrackingVersionDeactivated = 'Tracking for %s.%s , version %s is deactivated.'; $strTrackingVersionSnapshotSQL = 'Version %s snapshot (SQL code)'; $strTrackingVersions = 'Versions'; +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; $strTraditionalChinese = 'Traditional Chinese'; $strTraditionalSpanish = 'Traditional Spanish'; $strTraffic = 'Traffic'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 36e393251..840e08388 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1634,4 +1634,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index dfbf39e3f..642538e6a 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1627,4 +1627,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 6d9e6393e..3d5a55865 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1465,6 +1465,7 @@ $strTotalUC = 'Total'; $strTrackingActivated = 'Le suivi de %s.%s est activé.'; $strTrackingActivateNow = 'Activer maintenant'; $strTrackingActivateTrackingFor = 'Activer le suivi de %s.%s'; +$strTrackingCommentOut = 'Enlevez les deux lignes suivantes si elles sont inutiles.'; $strTrackingCreateVersion = 'Créer une version'; $strTrackingCreateVersionOf = 'Créer la version %s de %s.%s'; $strTrackingDatabaseLog = 'Journal de la base de données'; @@ -1478,6 +1479,7 @@ $strTrackingIsActive = 'Le suivi est actif.'; $strTrackingIsNotActive = 'Le suivi n\'est pas activé.'; $strTrackingMechanism = 'Mécanisme de suivi'; $strTrackingReportClose = 'Fermer'; +$strTrackingReportForTable = 'Rapport de suivi pour la table `%s`'; $strTrackingReport = 'Rapport de suivi'; $strTrackingShowLogDateUsers = 'Montrer %s depuis le %s jusqu\'au %s par l\'utilisateur %s %s'; $strTrackingShowVersions = 'Montrer les versions'; @@ -1507,6 +1509,7 @@ $strTrackingVersionCreated = 'Version %s créée, le suivi pour %s.%s est activ $strTrackingVersionDeactivated = 'Le suivi pour %s.%s , version %s est désactivé.'; $strTrackingVersionSnapshotSQL = 'Instantané de la version %s (code SQL)'; $strTrackingVersions = 'Versions'; +$strTrackingYouCanExecute = 'Vous pouvez exécuter cette exportation en créant une base de données temporaire. Veuillez vous assurer que vous avez les privilèges appropriés à cette opération.'; $strTraditionalChinese = 'chinois traditionnel'; $strTraditionalSpanish = 'espagnol traditionnel'; $strTraffic = 'Trafic'; @@ -1607,7 +1610,4 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; -// To translate: - - ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 3a48f203e..a392b0341 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1615,4 +1615,7 @@ $strSetupServers_ssl_desc = 'Enable SSL for connection to MySQL server'; //to t $strTargetDatabaseHasBeenSynchronized = 'Target database has been synchronized with source database'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 58a1cdd51..b0144916c 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1632,4 +1632,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index e3355dd77..1920092fc 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1632,4 +1632,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 62b28ba3c..c38edfe16 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1634,4 +1634,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 657dc3521..516e3fc63 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1630,4 +1630,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 504eb697d..42ee2a139 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1636,4 +1636,7 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate $strZip = '"zipped"' ; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 4a6461687..858d3279b 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 5366af1fb..d98d19813 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 68e7bf49a..197c96477 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 624be2dfd..6ab378163 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1634,4 +1634,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 9722e5607..12adb0a12 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1631,4 +1631,7 @@ $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate $strXML = 'XML';//to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 8cb993e1b..103043a61 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1634,4 +1634,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 6d8c86d39..983d03b60 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1628,4 +1628,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index f2081c71e..437483ce9 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1635,4 +1635,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 00dfecf4a..0ac31e274 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1648,4 +1648,7 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 68f65d45e..cb9d3580a 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1634,4 +1634,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 434f27d3a..7091afa3b 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1624,4 +1624,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 7b42600d3..6e9ecac35 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1637,4 +1637,7 @@ $strXMLExportViews = 'Export views'; //to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 267ce5fa7..43935db1d 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1620,4 +1620,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 8eacc780e..ddb6a102d 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1638,4 +1638,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index c77c5dac7..00a1a599c 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1628,4 +1628,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index cd3daea00..3a5a0ebfd 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1629,4 +1629,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index c9d4591a2..1a29983a7 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1632,4 +1632,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index a6cac8082..a1889107d 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1632,4 +1632,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index a46ef3e19..5f6dcabee 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1636,4 +1636,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 957f1363c..59492ff7e 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1628,4 +1628,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index bc738144e..d2d052f1a 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1631,4 +1631,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 09794ce6d..71feb8f30 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1623,4 +1623,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 76b61027a..f3469c5bc 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1624,4 +1624,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 0d80121d3..57b0a3eaa 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1628,4 +1628,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 6d6762e90..7e9f62030 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1633,4 +1633,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index e5088eb33..ad3db601b 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1623,4 +1623,7 @@ $strSetupServers_ssl_desc = 'Enable SSL for connection to MySQL server'; //to t $strTargetDatabaseHasBeenSynchronized = 'Target database has been synchronized with source database'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 74b19ffc9..6f549fe45 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1631,4 +1631,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php index 6bfea32cc..bfe18c028 100644 --- a/lang/uzbek_cyrillic-utf-8.inc.php +++ b/lang/uzbek_cyrillic-utf-8.inc.php @@ -1628,4 +1628,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php index 341ed0f76..47849d506 100644 --- a/lang/uzbek_latin-utf-8.inc.php +++ b/lang/uzbek_latin-utf-8.inc.php @@ -1628,4 +1628,7 @@ $strXMLExportTables = 'Export tables'; //to translate $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate +$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate +$strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; //to translate +$strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate ?> diff --git a/tbl_tracking.php b/tbl_tracking.php index 28752151e..c7a0b95e7 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -23,19 +23,19 @@ require_once './libraries/relation.lib.php'; if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { $data = PMA_Tracker::getTrackedData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']); - $selection_schema = ''; - $selection_data = ''; - $selection_both = ''; + $selection_schema = false; + $selection_data = false; + $selection_both = false; - if (!isset($_REQUEST['logtype'])) { + if (! isset($_REQUEST['logtype'])) { $_REQUEST['logtype'] = 'schema_and_data'; } if ($_REQUEST['logtype'] == 'schema') { - $selection_schema = 'selected'; + $selection_schema = true; } elseif($_REQUEST['logtype'] == 'data') { - $selection_data = 'selected'; + $selection_data = true; } else { - $selection_both = 'selected'; + $selection_both = true; } if (! isset($_REQUEST['date_from'])) { $_REQUEST['date_from'] = $data['date_from']; @@ -53,15 +53,27 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { // Prepare export if (isset($_REQUEST['report_export'])) { - // Filtering data definition statements - if ($_REQUEST['logtype'] == 'schema' || $_REQUEST['logtype'] == 'schema_and_data') { + +/** + * Filters tracking entries + * + * @param array the entries to filter + * @param string "from" date + * @param string "to" date + * @param string users + * + * @return array filtered entries + * + */ + function PMA_filter_tracking($data, $filter_ts_from, $filter_ts_to, $filter_users) { + $tmp_entries = array(); $id = 0; - foreach( $data['ddlog'] as $entry ) { + foreach( $data as $entry ) { $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && ( in_array('*', $filter_users) || in_array($entry['username'], $filter_users) ) ) { - $entries[] = array( 'id' => $id, + $tmp_entries[] = array( 'id' => $id, 'timestamp' => $timestamp, 'username' => $entry['username'], 'statement' => $entry['statement'] @@ -69,24 +81,18 @@ if (isset($_REQUEST['report_export'])) { } $id++; } + return($tmp_entries); } - // Filtering data manipulation statments - if ($_REQUEST['logtype'] == 'data' || $_REQUEST['logtype'] == 'schema_and_data') { - $id = 0; - foreach( $data['dmlog'] as $entry ) { - $timestamp = strtotime($entry['date']); + $entries = array(); + // Filtering data definition statements + if ($_REQUEST['logtype'] == 'schema' || $_REQUEST['logtype'] == 'schema_and_data') { + $entries = array_merge($entries, PMA_filter_tracking($data['ddlog'], $filter_ts_from, $filter_ts_to, $filter_users)); + } - if( $timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && - ( in_array('*', $filter_users) or in_array($entry['username'], $filter_users) ) ) { - $entries[] = array( 'id' => $id, - 'timestamp' => $timestamp, - 'username' => $entry['username'], - 'statement' => $entry['statement'] - ); - } - $id++; - } + // Filtering data manipulation statements + if ($_REQUEST['logtype'] == 'data' || $_REQUEST['logtype'] == 'schema_and_data') { + $entries = array_merge($entries, PMA_filter_tracking($data['dmlog'], $filter_ts_from, $filter_ts_to, $filter_users)); } // Sort it @@ -105,7 +111,7 @@ if (isset($_REQUEST['report_export'])) { if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldumpfile') { @ini_set('url_rewriter.tags',''); - $dump = "# Tracking report for table `" . htmlspecialchars($_REQUEST['table']) . "`\n" . + $dump = "# " . sprintf($strTrackingReportForTable, htmlspecialchars($_REQUEST['table'])) . "\n" . "# " . date('Y-m-d H:i:s') . "\n"; foreach($entries as $entry) { $dump .= $entry['statement']; @@ -211,13 +217,12 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'execution' // Export as SQL dump if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') { - $new_query = "# You can execute the dump by creating and using a temporary table. Please ensure that you have the privileges to do that. \n" . - "# Comment out or remove these two lines if you don't need them. \n" . + $new_query = "# " . $strTrackingYouCanExecute . "\n" . + "# " . $strTrackingCommentOut . "\n" . "\n" . "CREATE database IF NOT EXISTS pma_temp_db; \n" . "USE pma_temp_db; \n" . - "\n" . - "/* BEGIN OF SQL DUMP */ \n"; + "\n"; foreach($entries as $entry) { $new_query .= $entry['statement']; @@ -376,29 +381,29 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {

-
+ ' . - '' . - '' . - '' . + '' . + '' . + '' . ''; - $str2 = ''; - $str3 = ''; - $str4 = ''; - $str5 = ''; + $str2 = ''; + $str3 = ''; + $str4 = ''; + $str5 = ''; printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5); /* - * First, list tracked data defintion statements + * First, list tracked data definition statements */ $i = 1; - if ($selection_schema == 'selected' || $selection_both == 'selected') { + if ($selection_schema || $selection_both ) { ?> - +
@@ -444,9 +449,9 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { * Secondly, list tracked data manipulation statements */ - if (($selection_data == 'selected' || $selection_both == 'selected') && count($data['dmlog']) > 0) { + if (($selection_data || $selection_both) && count($data['dmlog']) > 0) { ?> -
#
+
@@ -488,7 +493,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { } ?> - + ' . $strTrackingSQLExecution . '' . ''; - $str_export2 = ''; + $str_export2 = ''; ?> - + @@ -534,16 +539,16 @@ if (PMA_DBI_num_rows($sql_result) > 0) { ' . $entries['db_name'] . ' . ' . $entries['table_name'] . $status . '' . "\n"; + echo '' . "\n"; } ?> @@ -604,8 +609,8 @@ if ($last_version > 0) { } ?> - - + +
#