Integration of new centralised upload code with files/index.php

These patches are maintained in an publicly accessible Arch repository, see: http://lists.eduforge.org/cgi-bin/archzoom.cgi/[email protected]/moodle--eduforge--1.3.3

Index of arch patches in this commit:

[email protected]/moodle--eduforge--1.3.3--patch-59
    2004-09-15 02:41:00 GMT
    Penny Leach <[email protected]>
    upload/virus integration with course files

Full logs:

Revision: moodle--eduforge--1.3.3--patch-59
Archive: [email protected]
Creator: Penny Leach <[email protected]>
Date: Wed Sep 15 14:41:00 NZST 2004
Standard-date: 2004-09-15 02:41:00 GMT
Modified-files: files/index.php
New-patches: [email protected]/moodle--eduforge--1.3.3--patch-59
Summary: upload/virus integration with course files
Keywords:
This commit is contained in:
mjollnir_
2004-09-15 02:43:40 +00:00
parent 21de6ca1db
commit 3bb4d8440b
+8 -24
View File
@@ -105,31 +105,16 @@
case "upload":
html_header($course, $wdir);
if (!empty($_FILES['userfile'])) {
$userfile = $_FILES['userfile'];
} else {
$save = false;
}
require_once($CFG->dirroot.'/lib/uploadlib.php');
if (!empty($save)) {
if (!is_uploaded_file($userfile['tmp_name']) or $userfile['size'] == 0) {
notify(get_string("uploadnofilefound"));
} else {
$userfile_name = clean_filename($userfile['name']);
if ($userfile_name) {
$newfile = "$basedir$wdir/$userfile_name";
if (move_uploaded_file($userfile['tmp_name'], $newfile)) {
chmod($newfile, 0666);
$a = NULL;
$a->file = "$userfile_name (".$userfile['type'].")";
$a->directory = $wdir;
print_string("uploadedfileto", "", $a);
} else {
notify(get_string("uploadproblem", "", $userfile_name));
}
}
$um = new upload_manager('userfile',false,false,$course,false,0);
$dir = "$basedir$wdir";
if ($um->process_file_uploads($dir)) {
notify(get_string('uploadedfile'));
}
// um will take care of error reporting.
displaydir($wdir);
} else {
$upload_max_filesize = get_max_upload_file_size($CFG->maxbytes); // Restricted by site setting
$filesize = display_size($upload_max_filesize);
@@ -142,11 +127,10 @@
echo "<p>$struploadafile ($strmaxsize) --> <b>$wdir</b>";
echo "<table><tr><td colspan=\"2\">";
echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"index.php\">";
echo " <input type=\"hidden\" name=MAX_FILE_SIZE value=\"$upload_max_filesize\" />";
echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
echo " <input type=\"hidden\" name=\"action\" value=\"upload\" />";
echo " <input name=\"userfile\" type=\"file\" size=\"60\" />";
upload_print_form_fragment(1,array('userfile'),null,false,null,$course->maxbytes,0,false);
echo " </td><tr><td width=\"10\">";
echo " <input type=\"submit\" name=\"save\" value=\"$struploadthisfile\" />";
echo "</form>";