mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Ooops. The following-HTTP-standard absolute-path redirect thing didn't work with URLs that begin / (i.e. it couldn't redirect to /moodle/whatever although it was fine redirecting to http://thing/moodle or to plain old whatever/something.) Fixed.

Browse Source
This commit is contained in:
sam_marshall 2006-09-22 10:48:37 +00:00
parent f5aa20162c
commit ecfdc901fc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/weblib.php
View File

@ -4665,10 +4665,17 @@ function redirect($url, $message='', $delay=-1) {
// paths - but still, might as well do it properly.)
// This code turns relative into absolute.
if(!preg_match('/^[a-z]+:/',$url)) {
// Add in the host etc. (from wwwroot) to the current folder
// from SCRIPT_NAME, then add the new target onto the end.
$url=preg_replace('/^(.*?[^:\/])\/.*$/','$1',$CFG->wwwroot).
rtrim(dirname($_SERVER['SCRIPT_NAME']),'/\\').'/'.$url;
// Get host name http://www.wherever.com
$hostpart=preg_replace('/^(.*?[^:\/])\/.*$/','$1',$CFG->wwwroot);
if(preg_match('/^\//',$url)) {
// URLs beginning with / are relative to web server root so
// we just add them in
$url=$hostpart.$url;
} else {
// URLs not beginning with / are relative to path of current
// script, so add that on.
$url=$hostpart.rtrim(dirname($_SERVER['SCRIPT_NAME']),'/\\').'/'.$url;
}
// Replace all ..s
while(true) {
$newurl=preg_replace('/\/[^\/]*\/\.\.\//','/',$url);