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

MDL-13792 - Fix to prevent urlencoding of '/'

Browse Source
This commit is contained in:
scyrma
2008-04-01 01:55:00 +00:00
parent c612c32231
commit f9085923a2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assignment/type/upload/assignment.class.php
+3 -3
View File
@@ -268,7 +268,7 @@ class assignment_upload extends assignment_base {
foreach ($files as $key => $file) {
require_once($CFG->libdir.'/filelib.php');
$icon = mimeinfo('icon', $file);
$ffurl = "$CFG->wwwroot/file.php?file=". urlencode("/$filearea/$file");
$ffurl = "$CFG->wwwroot/file.php?file=/". urlencode($filearea) .'/'. urlencode($file);
$output .= '<a href="'.$ffurl.'" ><img class="icon" src="'.$CFG->pixpath.'/f/'.$icon.'" alt="'.$icon.'" />'.$file.'</a>&nbsp;';
}
}
@@ -327,7 +327,7 @@ class assignment_upload extends assignment_base {
$icon = mimeinfo('icon', $file);
$ffurl = "$CFG->wwwroot/file.php?file=". urlencode("/$filearea/$file");
$ffurl = "$CFG->wwwroot/file.php?file=/". urlencode($filearea) .'/'. urlencode($file);
$output .= '<a href="'.$ffurl.'" ><img src="'.$CFG->pixpath.'/f/'.$icon.'" class="icon" alt="'.$icon.'" />'.$file.'</a>';
@@ -382,7 +382,7 @@ class assignment_upload extends assignment_base {
$icon = mimeinfo('icon', $file);
$ffurl = "$CFG->wwwroot/file.php?file=". urlencode("/$filearea/$file");
$ffurl = "$CFG->wwwroot/file.php?file=/". urlencode($filearea) .'/'. urlencode($file);
$output .= '<a href="'.$ffurl.'" ><img class="align" src="'.$CFG->pixpath.'/f/'.$icon.'" alt="'.$icon.'" />'.$file.'</a>';
mod/assignment/type/uploadsingle/assignment.class.php
+2 -2
View File
@@ -23,9 +23,9 @@ class assignment_uploadsingle extends assignment_base {
$icon = mimeinfo('icon', $file);
if ($CFG->slasharguments) {
$ffurl = "$CFG->wwwroot/file.php". urlencode("/$filearea/$file");
$ffurl = "$CFG->wwwroot/file.php/". urlencode($filearea) .'/'. urlencode($file);
} else {
$ffurl = "$CFG->wwwroot/file.php?file=". urlencode("/$filearea/$file");
$ffurl = "$CFG->wwwroot/file.php?file=/". urlencode($filearea) .'/'. urlencode($file);
}
//died right here
//require_once($ffurl);