Fixed links in email messages.

diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index 26a4ed316ca7f9668477be6a1fb437325fb5107a..bbd402f9d1138862435c91de5b2fc615f688eeb1 100644 (file)
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -224,6 +224,7 @@
                        $assessment->timecreated = $yearfromnow;
                        $assessment->timegraded = 0;
                        $assessment->timeagreed = 0;
+                       $assessment->resubmission = 0;
                        if (!$assessment->id = insert_record("workshop_assessments", $assessment)) {
                                error("Could not insert workshop assessment!");
                                }

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index a888cf85ce385e3a9b58e560b4950ebe51149343..1115a50f0838b1017ea703e5c6b7b24310755d89 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -101,6 +101,18 @@ function workshop_cron () {
                                echo "Could not find submission $assessment->submissionid\n";
                                continue;
                        }
+                       if (! $workshop = get_record("workshop", "id", $submission->workshopid)) {
+                               echo "Could not find workshop id $submission->workshopid\n";
+                               continue;
+                       }
+            if (! $course = get_record("course", "id", $workshop->course)) {
+                error("Could not find course id $workshop->course");
+                continue;
+            }
+            if (! $cm = get_coursemodule_from_instance("workshop", $workshop->id, $course->id)) {
+                error("Course Module ID was incorrect");
+                continue;
+            }
                        if (! $submissionowner = get_record("user", "id", "$submission->userid")) {
                                echo "Could not find user $submission->userid\n";
                                continue;
@@ -109,10 +121,6 @@ function workshop_cron () {
                                echo "Could not find user $assessment->userid\n";
                                continue;
                        }
-                       if (! $course = get_record("course", "id", "$assessment->course")) {
-                               echo "Could not find course $assessment->course\n";
-                               continue;
-                       }
                        if (! isstudent($course->id, $submissionowner->id) and !isteacher($course->id, 
                         $submissionowner->id)) {
                                continue;  // Not an active participant
@@ -121,11 +129,6 @@ function workshop_cron () {
                         $assessmentowner->id)) {
                                continue;  // Not an active participant
                        }
-                       if (! $workshop = get_coursemodule_from_instance("workshop", $assessment->workshopid, 
-                        $course->id)) {
-                               echo "Could not find course module for workshop id $submission->workshop\n";
-                               continue;
-                       }
        
                        $strworkshops = get_string("modulenameplural", "workshop");
                        $strworkshop  = get_string("modulename", "workshop");
@@ -150,17 +153,17 @@ function workshop_cron () {
                        $posttext .= $msg;
                        // "You can see it in your workshop assignment"
                        $posttext .= get_string("mail3", "workshop").":\n";
-                       $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n";
+                       $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
                        $posttext .= "---------------------------------------------------------------------\n";
                        if ($sendto->mailformat == 1) {  // HTML
                                $posthtml = "<P><FONT FACE=sans-serif>".
                          "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
                          "<A HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</A> ->".
-                         "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
+                         "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A></FONT></P>";
                          $posthtml .= "<HR><FONT FACE=sans-serif>";
                          $posthtml .= "<P>$msg</P>";
                          $posthtml .= "<P>".get_string("mail3", "workshop").
-                                 " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
+                                 " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A>.</P></FONT><HR>";
                        } else {
                          $posthtml = "";
                        }
@@ -190,6 +193,18 @@ function workshop_cron () {
                                echo "Could not find submission $assessment->submissionid\n";
                                continue;
                        }
+                       if (! $workshop = get_record("workshop", "id", $submission->workshopid)) {
+                               echo "Could not find workshop id $submission->workshopid\n";
+                               continue;
+                       }
+            if (! $course = get_record("course", "id", $workshop->course)) {
+                error("Could not find course id $workshop->course");
+                continue;
+            }
+            if (! $cm = get_coursemodule_from_instance("workshop", $workshop->id, $course->id)) {
+                error("Course Module ID was incorrect");
+                continue;
+            }
                        if (! $submissionowner = get_record("user", "id", "$submission->userid")) {
                                echo "Could not find user $submission->userid\n";
                                continue;
@@ -198,10 +213,6 @@ function workshop_cron () {
                                echo "Could not find user $assessment->userid\n";
                                continue;
                        }
-                       if (! $course = get_record("course", "id", "$assessment->course")) {
-                               echo "Could not find course $assessment->course\n";
-                               continue;
-                       }
                        if (! isstudent($course->id, $submissionowner->id) and !isteacher($course->id, 
                         $submissionowner->id)) {
                                continue;  // Not an active participant
@@ -210,17 +221,12 @@ function workshop_cron () {
                         $assessmentowner->id)) {
                                continue;  // Not an active participant
                        }
-                       if (! $workshop = get_coursemodule_from_instance("workshop", $assessment->workshopid, 
-                        $course->id)) {
-                               echo "Could not find course module for workshop id $submission->workshop\n";
-                               continue;
-                       }
        
                        $strworkshops = get_string("modulenameplural", "workshop");
                        $strworkshop  = get_string("modulename", "workshop");
        
                        // it's a resubission assessment, tell the assessment owner to (re)assess
-                       $USER->lang = $assessmentownerowner->lang;
+                       $USER->lang = $assessmentowner->lang;
                        $sendto = $assessmentowner;
                        // "The assignment \"$submission->title\" is a revised piece of work. "
                        $msg = get_string("mail8", "workshop", $submission->title)."\n";
@@ -233,17 +239,17 @@ function workshop_cron () {
                        $posttext .= $msg;
                        // "You can assess it in your workshop assignment"
                        $posttext .= get_string("mail10", "workshop").":\n";
-                       $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n";
+                       $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
                        $posttext .= "---------------------------------------------------------------------\n";
                        if ($sendto->mailformat == 1) {  // HTML
                                $posthtml = "<P><FONT FACE=sans-serif>".
                          "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
                          "<A HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</A> ->".
-                             "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
+                             "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A></FONT></P>";
                            $posthtml .= "<HR><FONT FACE=sans-serif>";
                            $posthtml .= "<P>$msg</P>";
                            $posthtml .= "<P>".get_string("mail3", "workshop").
-                                 " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
+                                 " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A>.</P></FONT><HR>";
                        } 
             else {
                          $posthtml = "";
@@ -278,6 +284,18 @@ function workshop_cron () {
                                echo "Could not find submission $assessment->submissionid\n";
                                continue;
                        }
+                       if (! $workshop = get_record("workshop", "id", $submission->workshopid)) {
+                               echo "Could not find workshop id $submission->workshopid\n";
+                               continue;
+                       }
+            if (! $course = get_record("course", "id", $workshop->course)) {
+                error("Could not find course id $workshop->course");
+                continue;
+            }
+            if (! $cm = get_coursemodule_from_instance("workshop", $workshop->id, $course->id)) {
+                error("Course Module ID was incorrect");
+                continue;
+            }
                        if (! $submissionowner = get_record("user", "id", "$submission->userid")) {
                                echo "Could not find user $submission->userid\n";
                                continue;
@@ -286,10 +304,6 @@ function workshop_cron () {
                                echo "Could not find user $assessment->userid\n";
                                continue;
                        }
-                       if (! $course = get_record("course", "id", "$comment->course")) {
-                               echo "Could not find course $comment->course\n";
-                               continue;
-                       }
                        if (! isstudent($course->id, $submissionowner->id) and !isteacher($course->id, 
                         $submissionowner->id)) {
                                continue;  // Not an active participant
@@ -298,10 +312,6 @@ function workshop_cron () {
                         $assessmentowner->id)) {
                                continue;  // Not an active participant
                        }
-                       if (! $workshop = get_coursemodule_from_instance("workshop", $assessment->workshopid, $course->id)) {
-                               echo "Could not find course module for workshop id $submission->workshop\n";
-                               continue;
-                       }
        
                        $strworkshops = get_string("modulenameplural", "workshop");
                        $strworkshop  = get_string("modulename", "workshop");
@@ -326,17 +336,17 @@ function workshop_cron () {
                                $posttext .= $msg;
                                // "You can see it in your workshop assignment"
                                $posttext .= get_string("mail3", "workshop").":\n";
-                               $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n";
+                               $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
                                $posttext .= "---------------------------------------------------------------------\n";
                                if ($sendto->mailformat == 1) {  // HTML
                                        $posthtml = "<P><FONT FACE=sans-serif>".
                                        "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
                                        "<A HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</A> ->".
-                                       "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
+                                       "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A></FONT></P>";
                                        $posthtml .= "<HR><FONT FACE=sans-serif>";
                                        $posthtml .= "<P>$msg</P>";
                                        $posthtml .= "<P>".get_string("mail3", "workshop").
-                                               " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>
+                                               " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A>
                         .</P></FONT><HR>";
                                        } 
                                else {
@@ -376,17 +386,17 @@ function workshop_cron () {
                                $posttext .= $msg;
                                // "You can see it in your workshop assignment"
                                $posttext .= get_string("mail3", "workshop").":\n";
-                               $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n";
+                               $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
                                $posttext .= "---------------------------------------------------------------------\n";
                                if ($sendto->mailformat == 1) {  // HTML
                                        $posthtml = "<P><FONT FACE=sans-serif>".
                                        "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
                                        "<A HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</A> ->".
-                                       "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
+                                       "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A></FONT></P>";
                                        $posthtml .= "<HR><FONT FACE=sans-serif>";
                                        $posthtml .= "<P>$msg</P>";
                                        $posthtml .= "<P>".get_string("mail3", "workshop").
-                                               " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
+                                               " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A>.</P></FONT><HR>";
                                        } 
                                else {
                                        $posthtml = "";
@@ -421,37 +431,35 @@ function workshop_cron () {
                 continue;
             }
 
+                       if (! $workshop = get_record("workshop", "id", $submission->workshopid)) {
+                               echo "Could not find workshop id $submission->workshopid\n";
+                               continue;
+                       }
+            if (! $course = get_record("course", "id", $workshop->course)) {
+                error("Could not find course id $workshop->course");
+                continue;
+            }
+            if (! $cm = get_coursemodule_from_instance("workshop", $workshop->id, $course->id)) {
+                error("Course Module ID was incorrect");
+                continue;
+            }
                        if (! $submissionowner = get_record("user", "id", "$submission->userid")) {
                 echo "Could not find user $submission->userid\n";
                 continue;
             }
-
                        if (! $assessmentowner = get_record("user", "id", "$assessment->userid")) {
                 echo "Could not find user $assessment->userid\n";
                 continue;
             }
-
-            if (! $course = get_record("course", "id", "$assessment->course")) {
-                echo "Could not find course $assessment->course\n";
-                continue;
-            }
-                       
             if (! isstudent($course->id, $submissionowner->id) and !isteacher($course->id, 
                         $submissionowner->id)) {
                 continue;  // Not an active participant
             }
-
             if (! isstudent($course->id, $assessmentowner->id) and !isteacher($course->id, 
                         $assessmentowner->id)) {
                 continue;  // Not an active participant
             }
 
-            if (! $workshop = get_coursemodule_from_instance("workshop", $assessment->workshopid, 
-                        $course->id)) {
-                echo "Could not find course module for workshop id $submission->workshop\n";
-                continue;
-            }
-
             $strworkshops = get_string("modulenameplural", "workshop");
             $strworkshop  = get_string("modulename", "workshop");
 
@@ -469,17 +477,17 @@ function workshop_cron () {
             $posttext .= $msg;
                        // "You can see it in your workshop assignment"
                        $posttext .= get_string("mail3", "workshop").":\n";
-                       $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n";
+                       $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
             $posttext .= "---------------------------------------------------------------------\n";
             if ($sendto->mailformat == 1) {  // HTML
                                $posthtml = "<P><FONT FACE=sans-serif>".
                                        "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
                                        "<A HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</A> ->".
-                                       "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
+                                       "<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A></FONT></P>";
                                $posthtml .= "<HR><FONT FACE=sans-serif>";
                                $posthtml .= "<P>$msg</P>";
                                $posthtml .= "<P>".get_string("mail3", "workshop").
-                                       " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
+                                       " <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</A>.</P></FONT><HR>";
             } else {
               $posthtml = "";
             }