Cleaned up enrol and unenrol process a bit

diff --git a/course/login.html b/course/enrol.html
similarity index 92%
rename from course/login.html
rename to course/enrol.html
index 47d6083d35a1a134fca46b46fde1f3ba5b3f5661..56bea0685e513f46c799002230af3f7960effbf1 100644 (file)
--- a/course/login.html
+++ b/course/enrol.html
@@ -9,7 +9,7 @@
   </tr>\r
   <tr valign=top> \r
     <td bgcolor="<?=$THEME->cellheading?>"> <CENTER><? formerr($errormsg) ?> </CENTER>\r
-      <form name="form" method="post" action="login.php">\r
+      <form name="form" method="post" action="enrol.php">\r
         <table>\r
           <tr> \r
             <td width=50% align=right><P>Entry Key:</P></td>\r

diff --git a/course/login.php b/course/enrol.php
similarity index 83%
rename from course/login.php
rename to course/enrol.php
index 4bb527755dd74e10544c96aad4167b394dbf7c53..f816cc1d230f7da6a1d8547f3251ebf1e1469e97 100644 (file)
--- a/course/login.php
+++ b/course/enrol.php
@@ -34,7 +34,7 @@
     
         } else {
             $errormsg = "That entry key was incorrect, please try again".
-                        "<BR>(Here's a hint - it starts with \"".substr($actual_password,0,1)."\")";
+                        "<BR>(Here's a hint - it starts with \"".substr($course->password,0,1)."\")";
         }
     }
 
@@ -68,26 +68,9 @@
 
     print_course($course); 
 
-    include("login.html");
+    include("enrol.html");
 
     print_footer();
 
 
-//// FUNCTIONS /////////////////////////////////////////////
-
-function enrol_student_in_course($user, $course) {
-    
-    global $db;
-
-       $timenow = time();
-
-       $rs = $db->Execute("INSERT INTO user_students (user, course, start, end, time) 
-                        VALUES ($user, $course, 0, 0, $timenow)");
-       if ($rs) {
-               return true;
-       } else {
-           return false;
-       }
-}
-
 ?>

diff --git a/course/lib.php b/course/lib.php
index 3c20221f986fa4d8a406b18d856f7c53821804b7..863ec1b9029c623baa166f16d4ab5d82c8df7388 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -280,4 +280,27 @@ function print_recent_activity($course) {
 
 }
 
+
+function unenrol_student_in_course($user, $course) {
+    global $db;
+
+    return $db->Execute("DELETE FROM user_students WHERE user = '$user' AND course = '$course'");
+}
+
+
+
+function enrol_student_in_course($user, $course) {
+    global $db;
+
+       $timenow = time();
+
+       $rs = $db->Execute("INSERT INTO user_students (user, course, start, end, time) 
+                        VALUES ($user, $course, 0, 0, $timenow)");
+       if ($rs) {
+               return true;
+       } else {
+           return false;
+       }
+}
+
 ?>

diff --git a/course/unenrol.php b/course/unenrol.php
new file mode 100644 (file)
index 0000000..58f3029
--- /dev/null
+++ b/course/unenrol.php
@@ -0,0 +1,40 @@
+<?PHP // $Id$
+
+//  Allows a student to "unenrol" from a class
+//  This will not delete any of their data from the course, 
+//  but will remove them from the student list and prevent 
+//  any course email being sent to them.
+
+    require("../config.php");
+    require("lib.php");
+
+    require_variable($id);    //course
+
+    if (! $course = get_record("course", "id", $id) ) {
+        error("That's an invalid course id");
+    }
+
+    require_login($course->id);
+
+    if (isset($confirm)) {
+        if (! unenrol_student_in_course($USER->id, $course->id)) {
+            error("An error occurred while trying to unenrol you.");
+        }
+        add_to_log($course->id, "course", "unenrol", "view.php?id=$course->id", "$USER->id");
+
+        unset($USER->student["$id"]);
+        
+        redirect("$CFG->wwwroot");
+    }
+
+
+    print_header("Unenrol from $course->shortname", "$course->shortname", "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> -> Unenrol"); 
+
+    notice_yesno ("Are you sure you want to remove yourself from this course?", 
+                  "unenrol.php?id=$id&confirm=yes", 
+                  "$HTTP_REFERER");
+
+    print_footer();
+
+
+?>