Manage new-lines and extra whitespaces properly

devenbansod · devenbansod · commit 9d0b1915d61e · 2016-10-11T10:32:21.000+05:30
Signed-off-by: Deven Bansod &lt;devenbansod.bits@gmail.com&gt;
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
@@ -1162,14 +1162,16 @@ function PMA_exportAsFileDownload($entries)
 {
     @ini_set('url_rewriter.tags', '');
 
+    // Replace all multiple whitespaces by a single space
+    $table = htmlspecialchars(preg_replace('/\s+/', ' ', $_REQUEST['table']));
     $dump = "# " . sprintf(
-        __('Tracking report for table `%s`'), htmlspecialchars($_REQUEST['table'])
+        __('Tracking report for table `%s`'), $table
     )
     . "\n" . "# " . date('Y-m-d H:i:s') . "\n";
     foreach ($entries as $entry) {
         $dump .= $entry['statement'];
     }
-    $filename = 'log_' . htmlspecialchars($_REQUEST['table']) . '.sql';
+    $filename = 'log_' . $table . '.sql';
     PMA_Response::getInstance()->disable();
     PMA_downloadHeader(
         $filename,

Original file line number	Diff line number	Diff line change
`@@ -1162,14 +1162,16 @@ function PMA_exportAsFileDownload($entries)`
`1162`	`1162`	`{`
`1163`	`1163`	`@ini_set('url_rewriter.tags', '');`
`1164`	`1164`
	`1165`	`+ // Replace all multiple whitespaces by a single space`
	`1166`	`+ $table = htmlspecialchars(preg_replace('/\s+/', ' ', $_REQUEST['table']));`
`1165`	`1167`	`$dump = "# " . sprintf(`
`1166`		- __('Tracking report for table `%s`'), htmlspecialchars($_REQUEST['table'])
	`1168`	+ __('Tracking report for table `%s`'), $table
`1167`	`1169`	`)`
`1168`	`1170`	`. "\n" . "# " . date('Y-m-d H:i:s') . "\n";`
`1169`	`1171`	`foreach ($entries as $entry) {`
`1170`	`1172`	`$dump .= $entry['statement'];`
`1171`	`1173`	`}`
`1172`		`- $filename = 'log_' . htmlspecialchars($_REQUEST['table']) . '.sql';`
	`1174`	`+ $filename = 'log_' . $table . '.sql';`
`1173`	`1175`	`PMA_Response::getInstance()->disable();`
`1174`	`1176`	`PMA_downloadHeader(`
`1175`	`1177`	`$filename,`