From: toyomoyo Date: Tue, 29 Aug 2006 03:36:31 +0000 (+0000) Subject: replaced isguest with capability calls X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=be07f21b6104a504fdde55759bfdc4f1734bedd2;p=moodle.git replaced isguest with capability calls --- diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index ff8bbec402..f3c6963d9f 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -20,7 +20,7 @@ class assignment_online extends assignment_base { $submission = $this->get_submission(); //Guest can not submit nor edit an assignment (bug: 4604) - if (isguest($USER->id)) { + if (!has_capability('mod/assignment:submit', $context)) { $editable = null; } else { @@ -30,8 +30,8 @@ class assignment_online extends assignment_base { if ($editmode) { //guest can not edit or submit assignment - if (isguest($USER->id)) { - error(get_string('guestnosubmit', 'assignment')); + if (!has_capability('mod/assignment:submit', $context)) { + error(get_string('guestnosubmit', 'assignment')); } $this->view_header(get_string('editmysubmission', 'assignment')); } else { @@ -66,7 +66,7 @@ class assignment_online extends assignment_base { } else { if ($submission) { echo format_text($submission->data1, $submission->data2); - } else if (isguest($USER->id)) { //fix for #4604 + } else if (!has_capability('mod/assignment:submit', $context)) { //fix for #4604 echo '
'. get_string('guestnosubmit', 'assignment').'
'; } else if ($this->isopen()){ //fix for #4206 echo '
'.get_string('emptysubmission', 'assignment').'
'; diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index d3f9d0a4a3..6b776ebed3 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -79,7 +79,7 @@ class assignment_upload extends assignment_base { //display submisison status notify("".get_string('submissionstatus', 'assignment')." ".$submission_status); - if ($submission->data1 != get_string("submissionstatussubmitted", "assignment") && !isguest($USER->id) && $this->isopen() && + if ($submission->data1 != get_string("submissionstatussubmitted", "assignment") && has_capability('mod/assignment:submit', get_context_instance(CONTEXT_MODULE, $this->cm->id)) && $this->isopen() && ((!$this->assignment->var1 && $submission->data1 == get_string("submissionstatusreturned", "assignment")) || // $this->assignment->var1 || !$filecount || @@ -267,9 +267,7 @@ class assignment_upload extends assignment_base { function final_upload() { global $CFG, $USER; - if (isguest($USER->id)) { - error(get_string('guestnoupload','assignment')); - } + require_capability('mod/assignment:submit', get_context_instance(CONTEXT_MODULE, $this->cm->id)); $this->view_header(get_string('upload')); $filecount = $this->count_user_files($USER->id); diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php index dfbbb261a5..d285a7a80b 100644 --- a/mod/assignment/type/uploadsingle/assignment.class.php +++ b/mod/assignment/type/uploadsingle/assignment.class.php @@ -96,11 +96,10 @@ class assignment_uploadsingle extends assignment_base { function upload() { + global $CFG, $USER; - - if (isguest($USER->id)) { - error(get_string('guestnoupload','assignment')); - } + + require_capability('mod/assignment:submit', get_context_instance(CONTEXT_MODULE, $this->cm->id)); $this->view_header(get_string('upload'));