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

MDL-16322 - switch calls to print_error to throw exceptions in portfolio callers

Browse Source
This commit is contained in:
mjollnir_ 2008-09-04 10:38:44 +00:00
parent 9f3ef2238d
commit 3bb8a2c75c
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/portfoliolib.php
View File

@ -206,7 +206,7 @@ function portfolio_add_button($callbackclass, $callbackargs, $callbackfile=null,
$a = new StdClass;
$a->cancel = $CFG->wwwroot . '/portfolio/add.php?cancel=1';
$a->finish = $CFG->wwwroot . '/portfolio/add.php?id=' . $SESSION->portfolioexport;
print_error('alreadyexporting', 'portfolio', null, $a);
throw new portfolio_exception('alreadyexporting', 'portfolio', null, $a);
}
if (empty($callbackfile)) {
@ -292,8 +292,7 @@ function portfolio_add_button($callbackclass, $callbackargs, $callbackfile=null,
$linkoutput .= '">' . $addstr .'</a>';
break;
default:
debugging('asdfd');
print_error('invalidaddformat', 'portfolio', '', $format);
debugging(get_string('invalidaddformat', 'portfolio', $format));
}
$output = (in_array($format, array(PORTFOLIO_ADD_FULL_FORM, PORTFOLIO_ADD_ICON_FORM)) ? $formoutput : $linkoutput);
if ($return) {

6
mod/assignment/lib.php
View File

@ -3153,11 +3153,11 @@ class assignment_portfolio_caller extends portfolio_module_caller_base {
global $DB, $CFG;
if (! $this->cm = get_coursemodule_from_id('assignment', $callbackargs['assignmentid'])) {
print_error('invalidcoursemodule');
throw new portfolio_caller_exception('invalidcoursemodule');
}
if (! $assignment = $DB->get_record("assignment", array("id"=>$this->cm->instance))) {
print_error('invalidid', 'assignment');
throw new portfolio_caller_exception('invalidid', 'assignment');
}
$this->assignmentfile = $CFG->dirroot . '/mod/assignment/type/' . $assignment->assignmenttype . '/assignment.class.php';
@ -3165,7 +3165,7 @@ class assignment_portfolio_caller extends portfolio_module_caller_base {
$assignmentclass = "assignment_$assignment->assignmenttype";
$this->assignment= new $assignmentclass($this->cm->id, $assignment, $this->cm);
if (!$this->assignment->portfolio_exportable()) {
print_error('notexportable', 'portfolio', $this->get_return_url());
throw new portfolio_caller_exception('notexportable', 'portfolio', $this->get_return_url());
}
$this->userid = $callbackargs['userid'];
$this->file = (array_key_exists('file', $callbackargs)) ? $callbackargs['file'] : null;

2
mod/forum/lib.php
View File

@ -7206,7 +7206,7 @@ class forum_portfolio_caller extends portfolio_module_caller_base {
throw new portfolio_caller_exception('attachmentsnopost', 'forum');
}
if (!$f = $fs->get_file_by_id($this->attachment)) {
print_error('noattachments', 'forum');
throw new portfolio_caller_exception('noattachments', 'forum');
}
$this->postfiles = array($f);
if (in_array($f->get_mimetype(), array('image/gif', 'image/jpeg', 'image/png'))) {

2
mod/resource/lib.php
View File

@ -715,7 +715,7 @@ class resource_portfolio_caller extends portfolio_module_caller_base {
global $CFG;
global $DB;
if (!array_key_exists('id', $callbackargs) || !$this->cm = get_coursemodule_from_instance('resource', $callbackargs['id'])) {
print_error('invalidid');
throw new portfolio_caller_exception('invalidid');
}
$this->cm->type = $DB->get_field('resource', 'type', array('id' => $this->cm->instance));
$resourceclass = 'resource_'. $this->cm->type;