From d1f124492ff0235ed1b23c26d3da52829b2fbc57 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 4 Aug 2011 19:20:23 +0200 Subject: [PATCH 1/5] fix typo --- test/libraries/common/PMA_extractFieldSpec_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index d87fdbc6c6..ab789f48bc 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -19,7 +19,7 @@ require_once 'libraries/common.lib.php'; class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase { /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ From 46cd0d6afad6ea9f2682420f1aa1c1da65fb6c1f Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 4 Aug 2011 19:24:15 +0200 Subject: [PATCH 2/5] fix typo --- test/libraries/common/PMA_expandUserString_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 4b3e176d6d..c2b4f4d274 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ @@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ From 872ddd034ff325e88caef9b8863bc5fa49734456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 4 Aug 2011 19:43:29 +0200 Subject: [PATCH 3/5] Fix comments --- test/libraries/common/PMA_expandUserString_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index c2b4f4d274..748ddfe9f8 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUMNS output + * Test case for expanding strings * * @dataProvider provider */ @@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUMNS output + * Test case for expanding strings with escaping * * @dataProvider provider */ From 9a938ed9867317474ae4bb63a17270c34040d2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 4 Aug 2011 19:44:22 +0200 Subject: [PATCH 4/5] Fix comments --- file_echo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file_echo.php b/file_echo.php index 58ff86bdb5..37d9a02c67 100644 --- a/file_echo.php +++ b/file_echo.php @@ -28,10 +28,10 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { $valid_match = '/^[^\n\r]*\.' . $extension . '$/'; if (! preg_match($valid_match, $_REQUEST['filename'])) { if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) { - /* Add extension */ + /* Filename is unsafe, discard it */ $filename = 'dowload.' . $extension; } else { - /* Filename is unsafe, discard it */ + /* Add extension */ $filename = $_REQUEST['filename'] . '.' . $extension; } } else { From c8a147c4eed04c4d344aa9e45acce7411d2a5603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 4 Aug 2011 19:44:36 +0200 Subject: [PATCH 5/5] Fix typo --- file_echo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_echo.php b/file_echo.php index 37d9a02c67..5e92cb7d1b 100644 --- a/file_echo.php +++ b/file_echo.php @@ -29,7 +29,7 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { if (! preg_match($valid_match, $_REQUEST['filename'])) { if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) { /* Filename is unsafe, discard it */ - $filename = 'dowload.' . $extension; + $filename = 'download.' . $extension; } else { /* Add extension */ $filename = $_REQUEST['filename'] . '.' . $extension;