- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11937-gc8ad66a
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via c8ad66a8ecaae03d5860ecd847ec3c3256a8bee8 (commit) via 99e02c9c0bce638d81be9449c330b25bf231563a (commit) via e5c8a006e414288ff45adf94290754ed14ac8c9e (commit) via f9de43b6ed94e957264b5af056bd28fc7089b3f8 (commit) via 5f1ebddad17069bde5628846a7f420be9bbf90a9 (commit) via e4ecf0557b418ea50434924634aa60414aaa88ae (commit) via 381472d279ee1de79ec70101cabca3f262b16a44 (commit) via 7a0d8eb6fda23d5d5ad891a86adfd649d453517b (commit) via a6881cff8e729b19cad045adb870f6e9e1dfcf9d (commit) via 44bd637a01fa768b9be717d0264d35fd8c6cd9f6 (commit) via f55de275e1b063feee1d53898729c7fca343386e (commit) via 081520fa062a07a8af46c866c236fcb03eafb707 (commit) via 40614381cfda57a7c264bd89870036e1a29cd2d9 (commit) via 4355dda9ee7cb1abed88c14cc895e7f92729e6c6 (commit) via dd6f4ddc68d0cd5e80f5fd3909e13b7d8afab59b (commit) via 660be6e04229f9093de6259c58e1bc46c06d2e83 (commit) from 3638bbd345ffdce387e7367ee2d6f330e5a54e8a (commit) - Log ----------------------------------------------------------------- commit c8ad66a8ecaae03d5860ecd847ec3c3256a8bee8 Merge: 3638bbd345ffdce387e7367ee2d6f330e5a54e8a 99e02c9c0bce638d81be9449c330b25bf231563a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 15:02:51 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 99e02c9c0bce638d81be9449c330b25bf231563a Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 15:01:23 2011 +0200 Translation update done using Pootle. commit e5c8a006e414288ff45adf94290754ed14ac8c9e Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 15:01:11 2011 +0200 Translation update done using Pootle. commit f9de43b6ed94e957264b5af056bd28fc7089b3f8 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 15:00:47 2011 +0200 Translation update done using Pootle. commit 5f1ebddad17069bde5628846a7f420be9bbf90a9 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 15:00:21 2011 +0200 Translation update done using Pootle. commit e4ecf0557b418ea50434924634aa60414aaa88ae Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:59:51 2011 +0200 Translation update done using Pootle. commit 381472d279ee1de79ec70101cabca3f262b16a44 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:59:47 2011 +0200 Translation update done using Pootle. commit 7a0d8eb6fda23d5d5ad891a86adfd649d453517b Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:59:34 2011 +0200 Translation update done using Pootle. commit a6881cff8e729b19cad045adb870f6e9e1dfcf9d Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:59:30 2011 +0200 Translation update done using Pootle. commit 44bd637a01fa768b9be717d0264d35fd8c6cd9f6 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:59:10 2011 +0200 Translation update done using Pootle. commit f55de275e1b063feee1d53898729c7fca343386e Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:58:44 2011 +0200 Translation update done using Pootle. commit 081520fa062a07a8af46c866c236fcb03eafb707 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:58:24 2011 +0200 Translation update done using Pootle. commit 40614381cfda57a7c264bd89870036e1a29cd2d9 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:58:07 2011 +0200 Translation update done using Pootle. commit 4355dda9ee7cb1abed88c14cc895e7f92729e6c6 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jul 25 14:58:01 2011 +0200 Translation update done using Pootle. commit dd6f4ddc68d0cd5e80f5fd3909e13b7d8afab59b Author: Sven Strickroth <email(a)cs-ware.de> Date: Mon Jul 25 14:55:26 2011 +0200 Translation update done using Pootle. commit 660be6e04229f9093de6259c58e1bc46c06d2e83 Author: Sven Strickroth <email(a)cs-ware.de> Date: Mon Jul 25 14:54:33 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 33 ++++++++++++--------------------- po/de.po | 8 ++++---- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/po/cs.po b/po/cs.po index 0af5c53..0fdd605 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-21 15:18+0200\n" +"PO-Revision-Date: 2011-07-25 15:01+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -1205,7 +1205,6 @@ msgid "Pause monitor" msgstr "Přerušit monitor" #: js/messages.php:114 -#, fuzzy #| msgid "general_log and slow_query_log is enabled." msgid "general_log and slow_query_log are enabled." msgstr "general_log a slow_query_log jsou povoleny." @@ -1219,7 +1218,6 @@ msgid "slow_query_log is enabled." msgstr "slow_query_log je povolen." #: js/messages.php:117 -#, fuzzy #| msgid "slow_query_log and general_log is disabled." msgid "slow_query_log and general_log are disabled." msgstr "slow_query_log a general_log jsou zakázány." @@ -1350,10 +1348,9 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Filtr" +msgstr "Filtry" #. l10n: Filter as in "Start Filtering" #: js/messages.php:153 navigation.php:270 @@ -1362,23 +1359,21 @@ msgstr "Filtr" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Filtrovat dotazy podle slova nebo regulárního výrazu:" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" -msgstr "" +msgstr "Sloučit dotazy ignorováním dat ve WHERE" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "Počet vkládaných řádků" +msgstr "Součet sloučených řádků:" #: js/messages.php:157 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Celkem" +msgstr "Celkem:" #: js/messages.php:161 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -1515,10 +1510,9 @@ msgid "Change" msgstr "Změnit" #: js/messages.php:208 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Časový limit běhu skriptu" +msgstr "Doba běhu dotazu" #: js/messages.php:211 msgid "Hide search criteria" @@ -1534,10 +1528,9 @@ msgid "Ignore" msgstr "Ignorovat" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Přidat sloupec" +msgstr "Přidat sloupce" #: js/messages.php:221 msgid "Select referenced key" @@ -6223,10 +6216,9 @@ msgid "" msgstr "Změnit jakákoliv její nastavení kliknutím na odkaz „Nastavení“" #: libraries/import.lib.php:1071 -#, fuzzy #| msgid "Edit its structure by following the \"Structure\" link" msgid "Edit structure by following the \"Structure\" link" -msgstr "Upravit strukturu kliknutím na odkaz „Struktura“" +msgstr "Strukturu upravíte kliknutím na odkaz „Struktura“" #: libraries/import.lib.php:1074 msgid "Go to database" @@ -9929,11 +9921,11 @@ msgstr "Zvolený časový rozsah:" #: server_status.php:1465 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Stáhnout jen příkazy SELECT, INSERT, UPDATE a DELETE" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "Před sloučením odstranit proměnná data v příkazech INSERT" #: server_status.php:1473 msgid "" @@ -9942,10 +9934,9 @@ msgid "" msgstr "" #: server_status.php:1476 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Typ dotazu" +msgstr "Analýza dotazu" #: server_status.php:1512 #, php-format diff --git a/po/de.po b/po/de.po index c69619d..aff9d3f 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-24 21:55+0200\n" -"Last-Translator: <email(a)cs-ware.de>\n" +"PO-Revision-Date: 2011-07-25 14:55+0200\n" +"Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -581,7 +581,7 @@ msgstr "Die Wörter werden durch Leerzeichen (\" \") getrennt." #: db_search.php:298 msgid "Inside tables:" -msgstr "In der / den Tabelle(n):" +msgstr "In der/den Tabelle(n):" #: db_search.php:328 msgid "Inside column:" @@ -9154,7 +9154,7 @@ msgstr "Überwachung" #: server_status.php:629 server_status.php:651 msgid "Refresh rate: " -msgstr "Aktualisierungs-Intervall:" +msgstr "Aktualisierungs-Intervall: " #: server_status.php:672 msgid "Containing the word:" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11921-g3638bbd
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via 3638bbd345ffdce387e7367ee2d6f330e5a54e8a (commit) from 264829a9914c67dcf533c338bd95f8bba2523267 (commit) - Log ----------------------------------------------------------------- commit 3638bbd345ffdce387e7367ee2d6f330e5a54e8a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:46:33 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 2c3e28c..6d9c4bf 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -24,7 +24,7 @@ function PMA_checkLink($url) } else { $valid_starts[] = './Documentation.html'; } - foreach($valid_starts as $val) { + foreach ($valid_starts as $val) { if (substr($url, 0, strlen($val)) == $val) { return true; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11920-g264829a
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via 264829a9914c67dcf533c338bd95f8bba2523267 (commit) from ffe203b09952de76eef527dec4a4c354bf90302e (commit) - Log ----------------------------------------------------------------- commit 264829a9914c67dcf533c338bd95f8bba2523267 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:42:46 2011 +0200 Add documentation to testcases ----------------------------------------------------------------------- Summary of changes: test/libraries/PMA_sanitize_test.php | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index 55d5a77..d6f8556 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -15,12 +15,18 @@ require_once 'libraries/core.lib.php'; class PMA_sanitize_test extends PHPUnit_Framework_TestCase { + /** + * Tests for proper escaping of XSS. + */ public function testXssInHref() { $this->assertEquals('[a@javascript:alert(\'XSS\');@target]link</a>', PMA_sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]')); } + /** + * Tests correct generating of link redirector. + */ public function testLink() { unset($GLOBALS['server']); @@ -29,42 +35,63 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]')); } + /** + * Tests links to documentation. + */ public function testLinkDoc() { $this->assertEquals('<a href="./Documentation.html">doc</a>', PMA_sanitize('[a@./Documentation.html]doc[/a]')); } - public function testLinkDocTarget() + /** + * Tests link target validation. + */ + public function testInvalidTarget() { $this->assertEquals('[a@./Documentation.html@INVALID9]doc</a>', PMA_sanitize('[a@./Documentation.html@INVALID9]doc[/a]')); } + /** + * Tests XSS escaping after valid link. + */ public function testLinkDocXss() { $this->assertEquals('[a@./Documentation.html" onmouseover="alert(foo)"]doc</a>', PMA_sanitize('[a@./Documentation.html" onmouseover="alert(foo)"]doc[/a]')); } + /** + * Tests proper handling of multi link code. + */ public function testLinkAndXssInHref() { $this->assertEquals('<a href="./Documentation.html">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>', PMA_sanitize('[a@./Documentation.html]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]')); } + /** + * Test escaping of HTML tags + */ public function testHtmlTags() { $this->assertEquals('<div onclick="">', PMA_sanitize('<div onclick="">')); } - public function testBbcoe() + /** + * Tests basic BB code. + */ + public function testBBCode() { $this->assertEquals('<strong>strong</strong>', PMA_sanitize('[b]strong[/b]')); } + /** + * Tests output escaping. + */ public function testEscape() { $this->assertEquals('<strong>strong</strong>', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11919-gffe203b
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via ffe203b09952de76eef527dec4a4c354bf90302e (commit) from 765d823bbda19c506567144446e1727990ac78d0 (commit) - Log ----------------------------------------------------------------- commit ffe203b09952de76eef527dec4a4c354bf90302e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:38:05 2011 +0200 Simplify definition of new valid links ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 028149c..2c3e28c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -15,14 +15,19 @@ */ function PMA_checkLink($url) { - if (substr($url, 0, 7) == 'http://') { - return true; - } elseif (substr($url, 0, 8) == 'https://') { - return true; - } elseif (!defined('PMA_SETUP') && substr($url, 0, 20) == './Documentation.html') { - return true; - } elseif (defined('PMA_SETUP') && substr($url, 0, 21) == '../Documentation.html') { - return true; + $valid_starts = array( + 'http://', + 'https://', + ); + if (defined('PMA_SETUP')) { + $valid_starts[] = '../Documentation.html'; + } else { + $valid_starts[] = './Documentation.html'; + } + foreach($valid_starts as $val) { + if (substr($url, 0, strlen($val)) == $val) { + return true; + } } return false; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11918-g765d823
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via 765d823bbda19c506567144446e1727990ac78d0 (commit) from 2cc790bad2e9a0024ff70dca4c6e7c32c1d832f7 (commit) - Log ----------------------------------------------------------------- commit 765d823bbda19c506567144446e1727990ac78d0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:35:52 2011 +0200 Better function names ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 6c7ec45..028149c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -13,7 +13,7 @@ * * @return boolean True if string can be used as link. */ -function PMA_check_link($url) +function PMA_checkLink($url) { if (substr($url, 0, 7) == 'http://') { return true; @@ -34,10 +34,10 @@ function PMA_check_link($url) * * @return string Replaced string */ -function PMA_replace_bb_link($found) +function PMA_replaceBBLink($found) { /* Check for valid link */ - if (! PMA_check_link($found[1])) { + if (! PMA_checkLink($found[1])) { return $found[0]; } /* a-z and _ allowed in target */ @@ -119,7 +119,7 @@ function PMA_sanitize($message, $escape = false, $safe = false) $pattern = '/\[a@([^]"@]*)(@([^]"]*))?\]/'; /* Find and replace all links */ - $message = preg_replace_callback($pattern, 'PMA_replace_bb_link', $message); + $message = preg_replace_callback($pattern, 'PMA_replaceBBLink', $message); /* Possibly escape result */ if ($escape) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11917-g2cc790b
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via 2cc790bad2e9a0024ff70dca4c6e7c32c1d832f7 (commit) from c44b0eacec4e95f0581f1459ed444613548e3019 (commit) - Log ----------------------------------------------------------------- commit 2cc790bad2e9a0024ff70dca4c6e7c32c1d832f7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:34:44 2011 +0200 Coding style ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 604ed62..6c7ec45 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -13,7 +13,8 @@ * * @return boolean True if string can be used as link. */ -function PMA_check_link($url) { +function PMA_check_link($url) +{ if (substr($url, 0, 7) == 'http://') { return true; } elseif (substr($url, 0, 8) == 'https://') { @@ -33,7 +34,8 @@ function PMA_check_link($url) { * * @return string Replaced string */ -function PMA_replace_bb_link($found) { +function PMA_replace_bb_link($found) +{ /* Check for valid link */ if (! PMA_check_link($found[1])) { return $found[0]; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11916-gc44b0ea
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via c44b0eacec4e95f0581f1459ed444613548e3019 (commit) from 26a9bb458129055a49686b227db6f47846de7c31 (commit) - Log ----------------------------------------------------------------- commit c44b0eacec4e95f0581f1459ed444613548e3019 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:32:09 2011 +0200 Fix docblocks ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 86cd13c..604ed62 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -9,9 +9,9 @@ /** * Checks whether given link is valid * - * @param $url string URL to check. + * @param string $url URL to check. * - * @return bool True if string can be used as link. + * @return boolean True if string can be used as link. */ function PMA_check_link($url) { if (substr($url, 0, 7) == 'http://') { @@ -29,7 +29,7 @@ function PMA_check_link($url) { /** * Callback function for replacing [a@link@target] links in bb code. * - * @param $found array preg matches + * @param array $found Array of preg matches * * @return string Replaced string */ @@ -71,8 +71,9 @@ function PMA_replace_bb_link($found) { * * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a> * - * @param string the message - * @param boolean whether to escape html in result + * @param string $message the message + * @param boolean $escape whether to escape html in result + * @param boolean $safe whether string is safe (can keep < and > chars) * * @return string the sanitized message * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11915-g26a9bb4
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via 26a9bb458129055a49686b227db6f47846de7c31 (commit) from d9f91b4f5d876a307d516715883505928888a9ed (commit) - Log ----------------------------------------------------------------- commit 26a9bb458129055a49686b227db6f47846de7c31 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:30:23 2011 +0200 Unset variables which can poison output ----------------------------------------------------------------------- Summary of changes: test/libraries/PMA_sanitize_test.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index e44d4f8..55d5a77 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -23,6 +23,8 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase public function testLink() { + unset($GLOBALS['server']); + unset($GLOBALS['lang']); $this->assertEquals('<a href="./url.php?url=http%3A%2F%2Fwww.phpmyadmin.net%2F" target="target">link</a>', PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]')); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11914-gd9f91b4
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via d9f91b4f5d876a307d516715883505928888a9ed (commit) from 42d704eadb906da01850c02e15e45e1c0246a43e (commit) - Log ----------------------------------------------------------------- commit d9f91b4f5d876a307d516715883505928888a9ed Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:27:07 2011 +0200 Testcase for escaping ----------------------------------------------------------------------- Summary of changes: test/libraries/PMA_sanitize_test.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index 5334162..e44d4f8 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -62,5 +62,11 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase $this->assertEquals('<strong>strong</strong>', PMA_sanitize('[b]strong[/b]')); } + + public function testEscape() + { + $this->assertEquals('<strong>strong</strong>', + PMA_sanitize('[strong]strong[/strong]', true)); + } } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11913-g42d704e
by Michal Čihař 25 Jul '11

25 Jul '11

The branch, master has been updated via 42d704eadb906da01850c02e15e45e1c0246a43e (commit) from c2b530c005105fc0615ee04ebb5c1c550917a8f4 (commit) - Log ----------------------------------------------------------------- commit 42d704eadb906da01850c02e15e45e1c0246a43e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:21:38 2011 +0200 Test case for invalid target ----------------------------------------------------------------------- Summary of changes: test/libraries/PMA_sanitize_test.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index 5d18355..5334162 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -33,6 +33,12 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase PMA_sanitize('[a@./Documentation.html]doc[/a]')); } + public function testLinkDocTarget() + { + $this->assertEquals('[a@./Documentation.html@INVALID9]doc</a>', + PMA_sanitize('[a@./Documentation.html@INVALID9]doc[/a]')); + } + public function testLinkDocXss() { $this->assertEquals('[a@./Documentation.html" onmouseover="alert(foo)"]doc</a>', hooks/post-receive -- phpMyAdmin

1 0