tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX #3224 ajshort: Get HTTP::setGetVar() working with variables that contain array indexes

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69700 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-01-05 04:52:01 +00:00
parent d46cde0ae1
commit 63de49eab1
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/HTTP.php
View File

@ -73,15 +73,12 @@ class HTTP {
return $content; return $content;
} }
static function setGetVar($varname, $varvalue, $currentURL = null) { public static function setGetVar($varname, $varvalue, $currentURL = null) {
$currentURL = $currentURL ? $currentURL : $_SERVER['REQUEST_URI']; $scriptbase = $currentURL ? $currentURL : $_SERVER['REQUEST_URI'];
$scriptbase = $currentURL; $scriptbase = str_replace('&', '&', $scriptbase);
$scriptbase = str_replace('&','&',$scriptbase); $scriptbase = preg_replace('/\?' . quotemeta($varname) . '=([^&]*)&/', '?', $scriptbase);
$scriptbase = preg_replace('/([\?&]+)' . quotemeta($varname) . '=([^&]*)/', null, $scriptbase);
$scriptbase = ereg_replace("&$varname=[^&]*",'',$scriptbase);
$scriptbase = ereg_replace("\?$varname=[^&]*&",'?',$scriptbase);
$scriptbase = ereg_replace("\?$varname=[^&]*",'',$scriptbase);
$suffix = ''; $suffix = '';
if(($hashPos = strpos($scriptbase,'#')) !== false) { if(($hashPos = strpos($scriptbase,'#')) !== false) {

29
tests/HTTPTest.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* Tests the {@link HTTP} class
*
* @package sapphire
* @subpackage tests
*/
class HTTPTest extends SapphireTest {
/**
* Tests {@link HTTP::setGetVar()}
*/
public function testSetGetVar() {
$expected = array (
'/?foo=bar' => array('foo', 'bar', '/'),
'/?baz=buz&foo=bar' => array('foo', 'bar', '/?baz=buz'),
'/?buz=baz&foo=baz' => array('foo', 'baz', '/?foo=bar&buz=baz'),
'/?foo=var' => array('foo', 'var', '/?foo=&foo=bar'),
'/?foo[test]=var' => array('foo[test]', 'var', '/?foo[test]=another')
);
foreach($expected as $result => $args) {
$this->assertEquals(
call_user_func_array(array('HTTP', 'setGetVar'), $args), str_replace('&', '&amp;', $result)
);
}
}
}