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

Integration of new centralised upload code with user profile, and group profile, as well as an enhancement to upload class to be configured to be silent.

Browse Source 
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-66
    2004-09-16 00:03:41 GMT
    Penny Leach <[email protected]>
    changes to upload class to be silent if we want it to be, integration with editing user profile and group profile (which meant changes in lib/gdlib.php as well as course/group-edit and group.php and user/edit.html and edit.php


Full logs:

Revision: moodle--eduforge--1.3.3--patch-66
Archive: [email protected]
Creator: Penny Leach <[email protected]>
Date: Thu Sep 16 12:03:41 NZST 2004
Standard-date: 2004-09-16 00:03:41 GMT
Modified-files: course/group-edit.html course/group.php
    lib/gdlib.php lib/uploadlib.php user/edit.html
    user/edit.php
New-patches: [email protected]/moodle--eduforge--1.3.3--patch-66
Summary: changes to upload class to be silent if we want it to be, integration with editing user profile and group profile (which meant changes in lib/gdlib.php as well as course/group-edit and group.php and user/edit.html and edit.php
Keywords:
This commit is contained in:
mjollnir_
2004-09-16 00:16:48 +00:00
parent 46c5446e34
commit 81d425b43c
6 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/uploadlib.php
+33 -5
View File
@@ -10,6 +10,7 @@ class upload_manager {
var $status; // keep track of if we're ok (errors for each file are kept in $files['whatever']['uploadlog']
var $course; // the course this file has been uploaded for (for logging and virus notifications)
var $inputname; // if we're only getting one file.
var $notify; // if we're given silent=true in the constructor, this gets built up to hold info about the process.
/**
* Constructor, sets up configuration stuff so we know how to act.
@@ -19,9 +20,10 @@ class upload_manager {
* @param $handlecollisions - whether to use handle_filename_collision() or not. (optional, defaults to false)
* @param $course - the course the files are being uploaded for (for logging and virus notifications)
* @param $recoverifmultiple - if we come across a virus, or if a file doesn't validate or whatever, do we continue? optional, defaults to true.
* @param $modbytes - max bytes for this module - this and $course->maxbytes are used to get the maxbytes to use (lowest) from get_max_upload_file_size().
* @param $modbytes - max bytes for this module - this and $course->maxbytes are used to get the maxbytes from get_max_upload_file_size().
* @param $silent - whether to notify errors or not.
*/
function upload_manager($inputname='',$deleteothers=false,$handlecollisions=false,$course=null,$recoverifmultiple=false,$modbytes=0) {
function upload_manager($inputname='',$deleteothers=false,$handlecollisions=false,$course=null,$recoverifmultiple=false,$modbytes=0,$silent=false) {
global $CFG;
@@ -29,6 +31,7 @@ class upload_manager {
$this->config->handlecollisions = $handlecollisions;
$this->config->recoverifmultiple = $recoverifmultiple;
$this->config->maxbytes = get_max_upload_file_size($CFG->maxbytes,$course->maxbytes,$modbytes);
$this->config->silent = $silent;
$this->files = array();
$this->status = false;
$this->course = $course;
@@ -58,12 +61,22 @@ class upload_manager {
if (!$this->config->recoverifmultiple && count($this->files) > 1) {
$a->name = $this->files[$name]['originalname'];
$a->problem = $this->files[$name]['uploadlog'];
notify(get_string('uploadfailednotrecovering','moodle',$a));
if (!$this->config->silent) {
notify(get_string('uploadfailednotrecovering','moodle',$a));
}
else {
$this->notify .= "<br />".get_string('uploadfailednotrecovering','moodle',$a);
}
$this->status = false;
return false;
}
else if (count($this->files) == 1) {
notify($this->files[$name]['uploadlog']);
if (!$this->config->silent) {
notify($this->files[$name]['uploadlog']);
}
else {
$this->notify .= "<br />".$this->files[$name]['uploadlog'];
}
$this->status = false;
return false;
}
@@ -200,7 +213,12 @@ class upload_manager {
}
}
if ($deletedsomething) {
notify(get_string('uploadoldfilesdeleted'));
if (!$this->config->silent) {
notify(get_string('uploadoldfilesdeleted'));
}
else {
$this->notify .= "<br />".get_string('uploadoldfilesdeleted');
}
}
}
@@ -309,6 +327,16 @@ class upload_manager {
return false;
}
/**
* If we're only handling one file (if input name was given in the constructor) this will return the full path to the saved file.
*/
function get_new_filepath() {
if (!empty($this->inputname) && count($this->files) == 1) {
return $this->files[$this->inputname]['fullpath'];
}
return false;
}
/**
* If we're only handling one file (if inputname was given in the constructor) this will return the ORIGINAL filename of the file.
*/