L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverting commit 1.889 "added another parameter to moodle_url out, out_action and get_query_string so that developer can output url with query string joined by '&' and not '&'. & breaks redirect on IE." It turned out to be unnecessary.

Browse Source
This commit is contained in:
jamiesensei
2007-05-29 06:27:38 +00:00
parent d65cb30f63
commit dc1f768351
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+11 -14
View File
@@ -368,16 +368,13 @@ class moodle_url {
}
function get_query_string($seperator='', $overrideparams = array()){
function get_query_string($overrideparams = array()){
$arr = array();
if ($seperator==''){
$seperator = '&';
}
$params = $overrideparams + $this->params;
foreach ($params as $key => $val){
$arr[] = urlencode($key)."=".urlencode($val);
}
return implode($arr, $seperator);
return implode($arr, "&");
}
/**
* Outputs params as hidden form elements.
@@ -404,14 +401,14 @@ class moodle_url {
* @param array $overrideparams params to add to the output url, these override existing ones with the same name.
* @return string url
*/
function out($seperator='', $noquerystring = false, $overrideparams = array()) {
function out($noquerystring = false, $overrideparams = array()) {
$uri = $this->scheme ? $this->scheme.':'.((strtolower($this->scheme) == 'mailto') ? '':'//'): '';
$uri .= $this->user ? $this->user.($this->pass? ':'.$this->pass:'').'@':'';
$uri .= $this->host ? $this->host : '';
$uri .= $this->port ? ':'.$this->port : '';
$uri .= $this->path ? $this->path : '';
if (!$noquerystring){
$uri .= (count($this->params)||count($overrideparams)) ? '?'.$this->get_query_string($seperator, $overrideparams) : '';
$uri .= (count($this->params)||count($overrideparams)) ? '?'.$this->get_query_string($overrideparams) : '';
}
$uri .= $this->fragment ? '#'.$this->fragment : '';
return $uri;
@@ -422,9 +419,9 @@ class moodle_url {
* @param boolean $noquerystring whether to output page params as a query string in the url.
* @return string url
*/
function out_action($seperator='', $overrideparams = array()) {
function out_action($overrideparams = array()) {
$overrideparams = array('sesskey'=> sesskey()) + $overrideparams;
return $this->out($seperator, false, $overrideparams);
return $this->out(false, $overrideparams);
}
}
@@ -5605,7 +5602,7 @@ function print_paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar='page
if (!is_a($baseurl, 'moodle_url')){
$output .= '&nbsp;(<a href="'. $baseurl . $pagevar .'='. $pagenum .'">'. get_string('previous') .'</a>)&nbsp;';
} else {
$output .= '&nbsp;(<a href="'. $baseurl->out('', false, array($pagevar => $pagenum)).'">'. get_string('previous') .'</a>)&nbsp;';
$output .= '&nbsp;(<a href="'. $baseurl->out(false, array($pagevar => $pagenum)).'">'. get_string('previous') .'</a>)&nbsp;';
}
}
$lastpage = ceil($totalcount / $perpage);
@@ -5614,7 +5611,7 @@ function print_paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar='page
if (!is_a($baseurl, 'moodle_url')){
$output .= '&nbsp;<a href="'. $baseurl . $pagevar .'=0">1</a>&nbsp;...';
} else {
$output .= '&nbsp;<a href="'. $baseurl->out('', false, array($pagevar => 0)).'">1</a>&nbsp;...';
$output .= '&nbsp;<a href="'. $baseurl->out(false, array($pagevar => 0)).'">1</a>&nbsp;...';
}
} else {
$startpage = 0;
@@ -5629,7 +5626,7 @@ function print_paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar='page
if (!is_a($baseurl, 'moodle_url')){
$output .= '&nbsp;&nbsp;<a href="'. $baseurl . $pagevar .'='. $currpage .'">'. $displaypage .'</a>';
} else {
$output .= '&nbsp;&nbsp;<a href="'. $baseurl->out('', false, array($pagevar => $currpage)).'">'. $displaypage .'</a>';
$output .= '&nbsp;&nbsp;<a href="'. $baseurl->out(false, array($pagevar => $currpage)).'">'. $displaypage .'</a>';
}
}
@@ -5641,7 +5638,7 @@ function print_paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar='page
if (!is_a($baseurl, 'moodle_url')){
$output .= '&nbsp;...<a href="'. $baseurl . $pagevar .'='. $lastpageactual .'">'. $lastpage .'</a>&nbsp;';
} else {
$output .= '&nbsp;...<a href="'. $baseurl->out('', false, array($pagevar => $lastpageactual)).'">'. $lastpage .'</a>&nbsp;';
$output .= '&nbsp;...<a href="'. $baseurl->out(false, array($pagevar => $lastpageactual)).'">'. $lastpage .'</a>&nbsp;';
}
}
$pagenum = $page + 1;
@@ -5649,7 +5646,7 @@ function print_paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar='page
if (!is_a($baseurl, 'moodle_url')){
$output .= '&nbsp;&nbsp;(<a href="'. $baseurl . $pagevar .'='. $pagenum .'">'. get_string('next') .'</a>)';
} else {
$output .= '&nbsp;&nbsp;(<a href="'. $baseurl->out('', false, array($pagevar => $pagenum)) .'">'. get_string('next') .'</a>)';
$output .= '&nbsp;&nbsp;(<a href="'. $baseurl->out(false, array($pagevar => $pagenum)) .'">'. get_string('next') .'</a>)';
}
}
$output .= '</div>';