July 2011 - Git - lists.phpmyadmin.net

[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', PMA_sanitize('[b]strong[/b]')); } + + public function testEscape() + { + $this->assertEquals('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

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

25 Jul '11

The branch, master has been updated via c2b530c005105fc0615ee04ebb5c1c550917a8f4 (commit) from a418fa95b962d77a614a0cbf66626123db4fc87f (commit) - Log ----------------------------------------------------------------- commit c2b530c005105fc0615ee04ebb5c1c550917a8f4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:18:36 2011 +0200 Add another testcase for xss ----------------------------------------------------------------------- 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 d88a82c..5d18355 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 testLinkDocXss() + { + $this->assertEquals('[a@./Documentation.html" onmouseover="alert(foo)"]doc</a>', + PMA_sanitize('[a@./Documentation.html" onmouseover="alert(foo)"]doc[/a]')); + } + public function testLinkAndXssInHref() { $this->assertEquals('<a href="./Documentation.html">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>', hooks/post-receive -- phpMyAdmin

1 0

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

25 Jul '11

The branch, master has been updated via a418fa95b962d77a614a0cbf66626123db4fc87f (commit) via 8d589ed83e27f3d7a466df97bc9726449f3d5ede (commit) via ef4f1717b2a9d97aa346fb5bd2267fb67dddf474 (commit) via 7b6043c6198a0d8e1ef23025ee315e5028c0d271 (commit) via 0c57cb20e23a58736621e5dbab113bda6b690f3e (commit) via 55c6412e6c4a6e1d4555978e8a8d13a4159dc5aa (commit) via a4807a8e7c07b7d2d6d9060af1f569b513b48038 (commit) from 3104583db2e302d2c237e715132f94c3170e350e (commit) - Log ----------------------------------------------------------------- commit a418fa95b962d77a614a0cbf66626123db4fc87f Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:13:03 2011 +0200 Add testcase for combined link and XSS attempt commit 8d589ed83e27f3d7a466df97bc9726449f3d5ede Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:12:22 2011 +0200 Fix matching of tags without target commit ef4f1717b2a9d97aa346fb5bd2267fb67dddf474 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:10:22 2011 +0200 Add testcase for documenation link commit 7b6043c6198a0d8e1ef23025ee315e5028c0d271 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:08:46 2011 +0200 Re-enable test for links commit 0c57cb20e23a58736621e5dbab113bda6b690f3e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 14:05:57 2011 +0200 Use preg_replace_callback for interpreting [a@...] This way we need to evaluate regullar expression only once and can convert all correct links rather than replacing none in case one string is broken. commit 55c6412e6c4a6e1d4555978e8a8d13a4159dc5aa Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 13:56:07 2011 +0200 Add documentation commit a4807a8e7c07b7d2d6d9060af1f569b513b48038 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 13:54:09 2011 +0200 Improve check for valid links ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 88 +++++++++++++++++++++++----------- test/libraries/PMA_sanitize_test.php | 17 +++++- 2 files changed, 74 insertions(+), 31 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index d0d3ba8..86cd13c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -7,6 +7,59 @@ */ /** + * Checks whether given link is valid + * + * @param $url string URL to check. + * + * @return bool True if string can be used as link. + */ +function PMA_check_link($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; + } + return false; +} + +/** + * Callback function for replacing [a@link@target] links in bb code. + * + * @param $found array preg matches + * + * @return string Replaced string + */ +function PMA_replace_bb_link($found) { + /* Check for valid link */ + if (! PMA_check_link($found[1])) { + return $found[0]; + } + /* a-z and _ allowed in target */ + if (! empty($found[3]) && preg_match('/[^a-z_]+/i', $found[3])) { + return $found[0]; + } + + /* Construct target */ + $target = ''; + if (! empty($found[3])) { + $target = ' target="' . $found[3] . '"'; + } + + /* Construct url */ + if (substr($found[1], 0, 4) == 'http') { + $url = PMA_linkURL($found[1]); + } else { + $url = $found[1]; + } + + return '<a href="' . $url . '"' . $target . '>'; +} + +/** * Sanitizes $message, taking into account our special codes * for formatting. * @@ -30,6 +83,7 @@ function PMA_sanitize($message, $escape = false, $safe = false) if (!$safe) { $message = strtr($message, array('<' => '<', '>' => '>')); } + /* Interpret bb code */ $replace_pairs = array( '[i]' => '', // deprecated by em '[/i]' => '', // deprecated by em @@ -50,6 +104,7 @@ function PMA_sanitize($message, $escape = false, $safe = false) '[sup]' => '', '[/sup]' => '', ); + /* Adjust links for setup, which lives in subfolder */ if (defined('PMA_SETUP')) { $replace_pairs['[a(a)Documentation.html'] = '[a@../Documentation.html'; } else { @@ -57,36 +112,13 @@ function PMA_sanitize($message, $escape = false, $safe = false) } $message = strtr($message, $replace_pairs); - $pattern = '/\[a@([^"@]*)(@([^]"]*))?\]/'; + /* Match links in bb code ([a@url@target], where @target is options) */ + $pattern = '/\[a@([^]"@]*)(@([^]"]*))?\]/'; - if (preg_match_all($pattern, $message, $founds, PREG_SET_ORDER)) { - $valid_links = array( - 'http', // default http:// links (and https://) - ); - if (defined('PMA_SETUP')) { - $valid_links[] = '../D'; // ./Documentation - } else { - $valid_links[] = './Do'; // ./Documentation - } - - foreach ($founds as $found) { - // only http... and ./Do... allowed - if (! in_array(substr($found[1], 0, 4), $valid_links)) { - return $message; - } - // a-z and _ allowed in target - if (! empty($found[3]) && preg_match('/[^a-z_]+/i', $found[3])) { - return $message; - } - } - - if (substr($found[1], 0, 4) == 'http') { - $message = preg_replace($pattern, '<a href="' . PMA_linkURL($found[1]) . '" target="\3">', $message); - } else { - $message = preg_replace($pattern, '<a href="\1" target="\3">', $message); - } - } + /* Find and replace all links */ + $message = preg_replace_callback($pattern, 'PMA_replace_bb_link', $message); + /* Possibly escape result */ if ($escape) { $message = htmlspecialchars($message); } diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index 0e7704c..d88a82c 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -10,6 +10,7 @@ * Include to test */ require_once 'libraries/sanitizing.lib.php'; +require_once 'libraries/url_generating.lib.php'; require_once 'libraries/core.lib.php'; class PMA_sanitize_test extends PHPUnit_Framework_TestCase @@ -20,13 +21,23 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase PMA_sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]')); } -/* public function testLink() { - $this->assertEquals('<a href="http://www.phpmyadmin.net/" target="target">link</a>', + $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]')); } -*/ + + public function testLinkDoc() + { + $this->assertEquals('<a href="./Documentation.html">doc</a>', + PMA_sanitize('[a@./Documentation.html]doc[/a]')); + } + + 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]')); + } public function testHtmlTags() { hooks/post-receive -- phpMyAdmin

1 0

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

25 Jul '11

The branch, master has been updated via 3104583db2e302d2c237e715132f94c3170e350e (commit) from 17cd1ebe2ba549b575f47f9a3bba512b8358ea7a (commit) - Log ----------------------------------------------------------------- commit 3104583db2e302d2c237e715132f94c3170e350e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 13:41:21 2011 +0200 Cleanup ----------------------------------------------------------------------- Summary of changes: po/ar.po | 1 - po/be.po | 1 - po/be(a)latin.po | 1 - po/bn.po | 1 - po/ca.po | 1 - po/cy.po | 1 - po/et.po | 1 - po/fi.po | 1 - po/gl.po | 1 - po/he.po | 1 - po/hi.po | 1 - po/hr.po | 1 - po/hu.po | 1 - po/id.po | 1 - po/ka.po | 1 - po/lt.po | 1 - po/lv.po | 1 - po/mk.po | 1 - po/mn.po | 1 - po/nb.po | 1 - po/nl.po | 1 - po/pl.po | 1 - po/pt_BR.po | 1 - po/ro.po | 1 - po/si.po | 1 - po/sk.po | 1 - po/sq.po | 1 - po/sr.po | 1 - po/sr(a)latin.po | 1 - po/th.po | 1 - po/tt.po | 1 - po/ug.po | 1 - po/ur.po | 1 - po/uz.po | 1 - po/uz(a)latin.po | 1 - po/zh_CN.po | 1 - po/zh_TW.po | 1 - 37 files changed, 0 insertions(+), 37 deletions(-) diff --git a/po/ar.po b/po/ar.po index d6022b7..1dc63b5 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11038,7 +11038,6 @@ msgid "Rename view to" msgstr "أعد تسمية العرض الـ" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "حدث" diff --git a/po/be.po b/po/be.po index 9c7e172..28f6ee5 100644 --- a/po/be.po +++ b/po/be.po @@ -11648,7 +11648,6 @@ msgid "Rename view to" msgstr "Перайменаваць табліцу ў" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Абнавіць" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 7c76c91..928983c 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -11615,7 +11615,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Abnavić" diff --git a/po/bn.po b/po/bn.po index cfb42cc..abe4be1 100644 --- a/po/bn.po +++ b/po/bn.po @@ -11503,7 +11503,6 @@ msgid "Rename view to" msgstr "টেবিল রিনেম করুন" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Refresh" diff --git a/po/ca.po b/po/ca.po index d021361..088a75a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11506,7 +11506,6 @@ msgid "Rename view to" msgstr "Reanomena la vista a" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Refresca" diff --git a/po/cy.po b/po/cy.po index cf036eb..d644c83 100644 --- a/po/cy.po +++ b/po/cy.po @@ -11032,7 +11032,6 @@ msgid "Rename view to" msgstr "Ailenwch golwg i" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Adfywio" diff --git a/po/et.po b/po/et.po index 1e2b2af..f8d9780 100644 --- a/po/et.po +++ b/po/et.po @@ -11502,7 +11502,6 @@ msgid "Rename view to" msgstr "Nimeta tabel ümber" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Uuenda" diff --git a/po/fi.po b/po/fi.po index 0114dab..42f819a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11852,7 +11852,6 @@ msgid "Rename view to" msgstr "Nimeä taulu uudelleen" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Päivitä" diff --git a/po/gl.po b/po/gl.po index e0089bb..3b22d3b 100644 --- a/po/gl.po +++ b/po/gl.po @@ -12097,7 +12097,6 @@ msgid "Rename view to" msgstr "Mudar o nome da táboa para" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Refrescar" diff --git a/po/he.po b/po/he.po index 6606499..bcee842 100644 --- a/po/he.po +++ b/po/he.po @@ -11152,7 +11152,6 @@ msgid "Rename view to" msgstr "שינוי שם טבלה אל" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "רענון" diff --git a/po/hi.po b/po/hi.po index 07ba4d8..4b19111 100644 --- a/po/hi.po +++ b/po/hi.po @@ -10935,7 +10935,6 @@ msgid "Rename view to" msgstr "दृश्य का नाम बदलो" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "ताज़ा करना" diff --git a/po/hr.po b/po/hr.po index ce92bb5..9c6623d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11602,7 +11602,6 @@ msgid "Rename view to" msgstr "Preimenuj prikaz u" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Osvježi" diff --git a/po/hu.po b/po/hu.po index 98b5bcc..bf9f033 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11675,7 +11675,6 @@ msgid "Rename view to" msgstr "Nézet átnevezése" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Frissítés" diff --git a/po/id.po b/po/id.po index e076b56..ac23278 100644 --- a/po/id.po +++ b/po/id.po @@ -11251,7 +11251,6 @@ msgid "Rename view to" msgstr "Ubah nama tabel menjadi " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Menyegarkan" diff --git a/po/ka.po b/po/ka.po index 2ee2cfb..f62bc02 100644 --- a/po/ka.po +++ b/po/ka.po @@ -11931,7 +11931,6 @@ msgid "Rename view to" msgstr "Rename table to" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "განახლება" diff --git a/po/lt.po b/po/lt.po index 704c6dc..36a71d5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11345,7 +11345,6 @@ msgid "Rename view to" msgstr "Pervadinti lentelę į" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Atnaujinti" diff --git a/po/lv.po b/po/lv.po index a243ab1..ef3413c 100644 --- a/po/lv.po +++ b/po/lv.po @@ -11262,7 +11262,6 @@ msgid "Rename view to" msgstr "Pārsaukt tabulu uz" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Atjaunot" diff --git a/po/mk.po b/po/mk.po index 4d8a71c..4d158ff 100644 --- a/po/mk.po +++ b/po/mk.po @@ -11327,7 +11327,6 @@ msgid "Rename view to" msgstr "Промени го името на табелата во " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Освежи" diff --git a/po/mn.po b/po/mn.po index 5f15197..031ac32 100644 --- a/po/mn.po +++ b/po/mn.po @@ -11331,7 +11331,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Да.дуудах" diff --git a/po/nb.po b/po/nb.po index 6cf7c3f..b9970ed 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11591,7 +11591,6 @@ msgid "Rename view to" msgstr "Endre tabellens navn" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Oppdater" diff --git a/po/nl.po b/po/nl.po index 2949d4e..3bfb92a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11502,7 +11502,6 @@ msgid "Rename view to" msgstr "Hernoem view naar" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Vernieuw" diff --git a/po/pl.po b/po/pl.po index c226d18..00cc12a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11875,7 +11875,6 @@ msgid "Rename view to" msgstr "Zmień nazwę perspektywy na" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Odśwież" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7c06250..59d5d14 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11380,7 +11380,6 @@ msgstr "Renomear a visão para " #~ msgstr "Agrupar INSERTs na mesma tabela" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Atualizar" diff --git a/po/ro.po b/po/ro.po index 999b8b6..bddba04 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11616,7 +11616,6 @@ msgid "Rename view to" msgstr "Redenumire tabel la" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Reîncarcă" diff --git a/po/si.po b/po/si.po index 9c1c014..3631976 100644 --- a/po/si.po +++ b/po/si.po @@ -11164,7 +11164,6 @@ msgid "Rename view to" msgstr "දසුනේ නම වෙනස් කරන්න" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "අලුත් කරන්න" diff --git a/po/sk.po b/po/sk.po index 66671a0..99677c0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11146,7 +11146,6 @@ msgid "Rename view to" msgstr "Premenovať pohľad na" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Obnoviť" diff --git a/po/sq.po b/po/sq.po index 75e07a4..79c1dca 100644 --- a/po/sq.po +++ b/po/sq.po @@ -11251,7 +11251,6 @@ msgid "Rename view to" msgstr "Riemërto tabelën në" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Rifresko" diff --git a/po/sr.po b/po/sr.po index f45c585..48416bb 100644 --- a/po/sr.po +++ b/po/sr.p8416bb 100644oame view to"කරන්න" "-orge.com [172.29.30.123]��W+Pl#��"�y�W+�z�W+�v#��@w#��y�W+�{�W+褚�W+��W+@w#��W+Pl#�� k#��y�W+6 ��!�!�v#��@w#��xD��W+Pm#��"�y�W+�y�W+�v#��y�W+w#��?��W+�y�W+0��W+�4��W+�9��W+�{�W+xD��W+Pm#�� l#��y�W+�!�!�v#��@w#�� v�W+0n#��"�y�W+�y�W+�v#��y�W+w#��w#��v#��W+�p�@w#��y�W+�{�W+0n#��m#��y�W+GHIJKMNOP�v#��@w#��H�L�W+�o#��"�y�W+�y�W+�v#��0?��W+�y�W+P��W+��)�W+0��W+�4��W+�9��W+�{�W+H�L�W+�o#��n#��y�W+8�L�W+�o#��@n#��y�W+(�L�W+�o#��pn#��y�W+�L�W+�o#��n#��y�W+ �>��W+�y�W+�9��W+ i#��H*�W+�y�W+�4��W+@o#��yH*�W+�y�W+0��W+po#��ZH*�W+�y�W+��)�W+P��W+��)�W+0��W+�T��W+�4��W+�9��W+�{�W+�=(�W+�p#��o#��y�W+#%')*-.035678:<=�v#��@w#��p{��W+r#��"�y�W+8_��W+�y�W+�T��W+�Y��W+�{�W+cf��W+@w#��p{��W+r#��p#��y�W+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�RƗW+�x#��F`]�W+F`]�W+?�×W+@x#��o#��`s#��W+�y�W+褚�W+�y#��B`]�W+�x#��w#��<��W+@w#��B`]�W+Hw#��y�o @@ -11523,7 +11523,6 @@ msgid "Rename view to" msgstr "Промени име табеле у " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Освежи" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 9189ccd..b56197d 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -11511,7 +11511,6 @@ msgid "Rename view to" msgstr "Promeni ime tabele u " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Osveži" diff --git a/po/th.po b/po/th.po index 843fbf0..02be1b2 100644 --- a/po/th.po +++ b/po/th.po @@ -11127,7 +11127,6 @@ msgid "Rename view to" msgstr "เปลี่ยนชื่อตารางเป็น" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "เรียกใหม่" diff --git a/po/tt.po b/po/tt.po index e7c397c..e5bb03d 100644 --- a/po/tt.po +++ b/po/tt.po @@ -11331,7 +11331,6 @@ msgid "Rename view to" msgstr "Tüşämä adın üzgärtü" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Yañart" diff --git a/po/ug.po b/po/ug.po index 226eb9d..391a3f6 100644 --- a/po/ug.po +++ b/po/ug.po @@ -10891,7 +10891,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "يېڭلاش" diff --git a/po/ur.po b/po/ur.po index 9eaf711..744e8ca 100644 --- a/po/ur.po +++ b/po/ur.po @@ -10904,7 +10904,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "تازہ کریں" diff --git a/po/uz.po b/po/uz.po index 78ac713..43965a6 100644 --- a/po/uz.po +++ b/po/uz.po @@ -12115,7 +12115,6 @@ msgid "Rename view to" msgstr "Кўриниш номини ўзгартириш" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Янгилаш" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 9b6ce5d..37764d0 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -12179,7 +12179,6 @@ msgid "Rename view to" msgstr "Ko‘rinish nomini o‘zgartirish" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "Yangilash" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1ab27ce..8a3c6d6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11019,7 +11019,6 @@ msgid "Rename view to" msgstr "将视图改名为" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "刷新" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2829c52..e3f951f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10990,7 +10990,6 @@ msgid "Rename view to" msgstr "將 view改名爲" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate" #~ msgstr "重新整理" hooks/post-receive -- phpMyAdmin

1 0

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

25 Jul '11

The branch, master has been updated via 17cd1ebe2ba549b575f47f9a3bba512b8358ea7a (commit) from c3daf8bc52fde16549e5672061febfa1e03a4ae6 (commit) - Log ----------------------------------------------------------------- commit 17cd1ebe2ba549b575f47f9a3bba512b8358ea7a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 25 12:11:17 2011 +0200 Use single function for bbcode implementation ----------------------------------------------------------------------- Summary of changes: libraries/config/config_functions.lib.php | 30 +--------------------------- libraries/sanitizing.lib.php | 19 +++++++++++++---- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php index 31d4305..7b71748 100644 --- a/libraries/config/config_functions.lib.php +++ b/libraries/config/config_functions.lib.php @@ -17,35 +17,9 @@ */ function PMA_lang($lang_key) { - static $search, $replace; - - // some quick cache'ing - if ($search === null) { - $replace_pairs = array( - '<' => '<', - '>' => '>', - '[em]' => '', - '[/em]' => '', - '[strong]' => '', - '[/strong]' => '', - '[code]' => '<code>', - '[/code]' => '</code>', - '[kbd]' => '<kbd>', - '[/kbd]' => '</kbd>', - '[br]' => ' ', - '[sup]' => '', - '[/sup]' => ''); - if (defined('PMA_SETUP')) { - $replace_pairs['[a(a)Documentation.html'] = '[a@../Documentation.html'; - } - $search = array_keys($replace_pairs); - $replace = array_values($replace_pairs); - } $message = isset($GLOBALS["strConfig$lang_key"]) ? $GLOBALS["strConfig$lang_key"] : $lang_key; - $message = str_replace($search, $replace, $message); - // replace [a@"$1"]$2[/a] with <a href="$1">$2</a> - $message = preg_replace('#\[a@("?)([^\]]+)\1\]([^\[]+)\[/a\]#e', - "PMA_lang_link_replace('$2', '$3')", $message); + + $message = PMA_sanitize($message); if (func_num_args() == 1) { return $message; diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index b308f1c..d0d3ba8 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -50,15 +50,24 @@ function PMA_sanitize($message, $escape = false, $safe = false) '[sup]' => '', '[/sup]' => '', ); + if (defined('PMA_SETUP')) { + $replace_pairs['[a(a)Documentation.html'] = '[a@../Documentation.html'; + } else { + $replace_pairs['[a(a)Documentation.html'] = '[a@./Documentation.html'; + } $message = strtr($message, $replace_pairs); - $pattern = '/\[a@([^"@]*)@([^]"]*)\]/'; + $pattern = '/\[a@([^"@]*)(@([^]"]*))?\]/'; if (preg_match_all($pattern, $message, $founds, PREG_SET_ORDER)) { $valid_links = array( 'http', // default http:// links (and https://) - './Do', // ./Documentation ); + if (defined('PMA_SETUP')) { + $valid_links[] = '../D'; // ./Documentation + } else { + $valid_links[] = './Do'; // ./Documentation + } foreach ($founds as $found) { // only http... and ./Do... allowed @@ -66,15 +75,15 @@ function PMA_sanitize($message, $escape = false, $safe = false) return $message; } // a-z and _ allowed in target - if (! empty($found[2]) && preg_match('/[^a-z_]+/i', $found[2])) { + if (! empty($found[3]) && preg_match('/[^a-z_]+/i', $found[3])) { return $message; } } if (substr($found[1], 0, 4) == 'http') { - $message = preg_replace($pattern, '<a href="' . PMA_linkURL($found[1]) . '" target="\2">', $message); + $message = preg_replace($pattern, '<a href="' . PMA_linkURL($found[1]) . '" target="\3">', $message); } else { - $message = preg_replace($pattern, '<a href="\1" target="\2">', $message); + $message = preg_replace($pattern, '<a href="\1" target="\3">', $message); } } hooks/post-receive -- phpMyAdmin

1 0