October 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20533-g5029300
by Madhura Jayaratne 02 Oct '11

02 Oct '11

The branch, master has been updated via 50293004adc930ee21c0e1136bfd1c85790855fa (commit) from aa4dac81752c6c8d84838f098501fb9770735d73 (commit) - Log ----------------------------------------------------------------- commit 50293004adc930ee21c0e1136bfd1c85790855fa Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 06:58:35 2011 +0530 Fix failing tests ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_showPHPDocu_test.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 09cebbf..6b95d4b 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -20,6 +20,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase function setup() { $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $_SESSION[' PMA_token '] = 'token'; + $GLOBALS['lang'] = 'en'; $GLOBALS['server'] = 99; $GLOBALS['cfg']['ServerDefault'] = 0; } @@ -30,7 +32,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' + $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang + . '%2F' . $target . '&server=99&lang=en&token=token"' . '" target="documentation"><img src="themes/dot.gif" title="' . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>'; @@ -43,7 +46,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' + $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang + . '%2F' . $target . '&server=99&lang=en&token=token"' . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showPHPDocu($target)); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20532-gaa4dac8
by Madhura Jayaratne 01 Oct '11

01 Oct '11

The branch, master has been updated via aa4dac81752c6c8d84838f098501fb9770735d73 (commit) via 383d55ff6dd5d179212ccaaa3b734396694f0c9e (commit) from 7bb14bcea9affb0c43076685f049e45719384d4d (commit) - Log ----------------------------------------------------------------- commit aa4dac81752c6c8d84838f098501fb9770735d73 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 02:10:15 2011 +0530 Defining undefined config commit 383d55ff6dd5d179212ccaaa3b734396694f0c9e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 02:07:36 2011 +0530 Revert 7bb14bcea9affb0c43076685f049e45719384d4d ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_showPHPDocu_test.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 15f8b11..09cebbf 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -11,7 +11,6 @@ /* * Include to test. */ -require_once 'libraries/config.default.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/Theme.class.php'; @@ -21,6 +20,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase function setup() { $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $GLOBALS['server'] = 99; + $GLOBALS['cfg']['ServerDefault'] = 0; } function testShwoPHPDocuReplaceHelpImg() @@ -29,7 +30,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target + $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' . '" target="documentation"><img src="themes/dot.gif" title="' . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>'; @@ -42,7 +43,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target + $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showPHPDocu($target)); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20530-g7bb14bc
by Madhura Jayaratne 01 Oct '11

01 Oct '11

The branch, master has been updated via 7bb14bcea9affb0c43076685f049e45719384d4d (commit) from 9cd4a96902c6f35944e82baacd45707857fa5a3d (commit) - Log ----------------------------------------------------------------- commit 7bb14bcea9affb0c43076685f049e45719384d4d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 01:51:20 2011 +0530 Including undefined config ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_showPHPDocu_test.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 2bf53d0..15f8b11 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -11,6 +11,7 @@ /* * Include to test. */ +require_once 'libraries/config.default.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/Theme.class.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20529-g9cd4a96
by Madhura Jayaratne 01 Oct '11

01 Oct '11

The branch, master has been updated via 9cd4a96902c6f35944e82baacd45707857fa5a3d (commit) via 5a6a74481a341111a4b2e34021753a42a17f908e (commit) from 2f889c0bba879fa4b275e28a2258fd96bfe4884e (commit) - Log ----------------------------------------------------------------- commit 9cd4a96902c6f35944e82baacd45707857fa5a3d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 01:04:32 2011 +0530 Fix failing tests commit 5a6a74481a341111a4b2e34021753a42a17f908e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 00:59:53 2011 +0530 For PMA_linkURL() applied URLs ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 4 +++- test/libraries/common/PMA_showPHPDocu_test.php | 5 +++-- test/libraries/core/PMA_getLinks_test.php | 6 +++++- .../core/PMA_warnMissingExtension_test.php | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index cbac64d..241af1c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -17,6 +17,8 @@ function PMA_checkLink($url) $valid_starts = array( 'http://', 'https://', + 'http%3A%2F%2F', + 'https%3A%2F%2F', ); if (defined('PMA_SETUP')) { $valid_starts[] = '../Documentation.html'; @@ -56,7 +58,7 @@ function PMA_replaceBBLink($found) } /* Construct url */ - if (substr($found[1], 0, 4) == 'http') { + if (preg_match('/^https?:\/\//', $found[1])) { $url = PMA_linkURL($found[1]); } else { $url = $found[1]; diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 0cd576f..2bf53d0 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -11,6 +11,7 @@ /* * Include to test. */ +require_once 'libraries/core.lib.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/Theme.class.php'; @@ -27,7 +28,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target + $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '" target="documentation"><img src="themes/dot.gif" title="' . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>'; @@ -40,7 +41,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '[<a href="http://php.net/manual/' . $lang . '/' . $target + $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showPHPDocu($target)); diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php index 5d96725..2208bc6 100644 --- a/test/libraries/core/PMA_getLinks_test.php +++ b/test/libraries/core/PMA_getLinks_test.php @@ -26,7 +26,11 @@ class PMA_getLinks_test extends PHPUnit_Framework_TestCase public function testPMA_getPHPDocLink() { $lang = _pgettext('PHP documentation language', 'en'); - $this->assertEquals(PMA_getPHPDocLink('function'), 'http://php.net/manual/' . $lang . '/function'); + $this->assertEquals( + PMA_getPHPDocLink('function'), + './url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' + . $lang . '%2Ffunction&server=99&lang=en&token=token' + ); } public function providerLinkURL(){ diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php index 24128e1..522453d 100644 --- a/test/libraries/core/PMA_warnMissingExtension_test.php +++ b/test/libraries/core/PMA_warnMissingExtension_test.php @@ -24,7 +24,7 @@ class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase function testMissingExtentionFatal(){ $ext = 'php_ext'; - $warn = 'The <a href="'.PMA_linkURL(PMA_getPHPDocLink('book.' . $ext . '.php')).'" target="Documentation">'.$ext.'</a> extension is missing. Please check your PHP configuration.'; + $warn = 'The <a href="' . PMA_getPHPDocLink('book.' . $ext . '.php') . '" target="Documentation">'.$ext.'</a> extension is missing. Please check your PHP configuration.'; ob_start(); PMA_warnMissingExtension($ext, true); @@ -38,7 +38,7 @@ class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase $ext = 'php_ext'; $extra = 'Appended Extra String'; - $warn = 'The <a href="'.PMA_linkURL(PMA_getPHPDocLink('book.' . $ext . '.php')).'" target="Documentation">'.$ext.'</a> extension is missing. Please check your PHP configuration.'.' '.$extra; + $warn = 'The <a href="' . PMA_getPHPDocLink('book.' . $ext . '.php') . '" target="Documentation">'.$ext.'</a> extension is missing. Please check your PHP configuration.'.' '.$extra; ob_start(); PMA_warnMissingExtension($ext, true, $extra); hooks/post-receive -- phpMyAdmin

1 0