replaced isguest with capability calls

diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index ff8bbec4029fdf6ff6ac4f1773e1dbbbdb78b847..f3c6963d9fc06d74ec62d5f7a14b2c9e762c80e5 100644 (file)
--- 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 '<center>'. get_string('guestnosubmit', 'assignment').'</center>';
                    } else if ($this->isopen()){    //fix for #4206
                        echo '<center>'.get_string('emptysubmission', 'assignment').'</center>';

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index d3f9d0a4a3e1bf92e1a4ac8291c699443e8963b2..6b776ebed31b997191ef3b167431a3dac8afa04b 100644 (file)
--- 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("<b>".get_string('submissionstatus', 'assignment')." </b> ".$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 dfbbb261a5e67cf9c468e50d8496bf2df514ce09..d285a7a80bed337e2e77544fa362e114df63188f 100644 (file)
--- 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'));