bug fix grade record error in forum replies

add course selfenroll option to course enroll form git-svn-id: http://imathas.googlecode.com/svn/trunk@763 c89b4f0b-ac2a-0410-9773-c9071ee4f95d
kreut · Oct 13, 2011 · eb4231f · eb4231f
1 parent a91c43d
commit eb4231f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/actions.php b/actions.php
@@ -265,6 +265,10 @@
 			echo "<html><body>\nError: Guests can't enroll in courses</body></html";
 			exit;
 		}
+		if (isset($_POST['courseselect']) && $_POST['courseselect']>0) {
+			$_POST['cid'] = $_POST['courseselect'];
+			$_POST['ekey'] = '';
+		}
 		if ($_POST['cid']=="" || !is_numeric($_POST['cid'])) {
 			echo "<html><body>\n";
 			echo "Please include Course ID.  <a href=\"forms.php?action=enroll$gb\">Try Again</a>\n";

diff --git a/forms.php b/forms.php
@@ -201,12 +201,29 @@
 	case "enroll":
 		echo '<div id="headerforms" class="pagetitle"><h2>Enroll in a Course</h2></div>';
 		echo "<form method=post action=\"actions.php?action=enroll$gb\">";
-		echo '<span class=form><label for="cid">Course id:</label></span> 
-		<input class=form type=text size=6 id=cid name=cid><br class="form" />
-		<span class=form><label for="ekey">Enrollment key:</label></span> 
-		<input class=form type=text size=10 id="ekey" name="ekey"><br class="form" />
-		<div class=submit><input type=submit value="Sign Up"></div>
-		</form>';
+		if (isset($CFG['GEN']['selfenrolluser'])) {
+			echo '<p>Select the course you\'d like to enroll in</p>';
+			echo '<p><select id="courseselect" name="courseselect" onchange="courseselectupdate(this);">';
+			echo '<option value="0" selected="selected">My teacher gave me a course ID (enter below)</option>';
+			$query = "SELECT imas_courses.id,imas_courses.name FROM imas_courses JOIN imas_teachers ON ";
+			$query .= "imas_courses.id=imas_teachers.courseid WHERE imas_teachers.userid='{$CFG['GEN']['selfenrolluser']}' ORDER by imas_courses.name";
+			$result = mysql_query($query) or die("Query failed : " . mysql_error());
+			while ($row = mysql_fetch_row($result)) {
+				echo '<option value="'.$row[0].'">'.$row[1].'</option>';
+			}
+			echo '</select></p>';
+			echo '<div id="courseinfo">';
+			echo '<script type="text/javascript"> function courseselectupdate(el) { var c = document.getElementById("courseinfo"); ';
+			echo 'if (el.value==0) {c.style.display="";} else {c.style.display="none";}}</script>';
+		} else {
+			echo '<p>If you already know your course ID, you can enter it now.  Otherwise, leave this blank and you can enroll later.</p>';
+		}
+		echo '<span class="form"><label for="cid">Course ID:</label></span><input class="form" type="text" size="20" name="cid"/><br class="form"/>';
+		echo '<span class="form"><label for="ekey">Enrollment Key:</label></span><input class="form" type="text" size="20" name="ekey"/><br class="form"/>';
+		if (isset($CFG['GEN']['selfenrolluser'])) {
+			echo '</div>';
+		}
+		echo '<div class=submit><input type=submit value="Sign Up"></div></form>';
 		break;
 	case "unenroll":
 		if (!isset($_GET['cid'])) { echo "Course ID not specified\n"; break;}

diff --git a/forums/posthandler.php b/forums/posthandler.php
@@ -47,8 +47,11 @@
 					//$query = "UPDATE imas_forum_posts SET points='{$_POST['points']}' WHERE id='{$_GET['replyto']}'";
 					mysql_query($query) or die("Query failed : $query " . mysql_error());
 				} else {
+					$query = "SELECT userid FROM imas_forum_posts WHERE id='{$_GET['replyto']}'";
+					$result = mysql_query($query) or die("Query failed : $query " . mysql_error());
+					$uid = mysql_result($result,0,0);
 					$query = "INSERT INTO imas_grades (gradetype,gradetypeid,userid,refid,score) VALUES ";
-					$query .= "('forum','$forumid','$userid','{$_GET['replyto']}','{$_POST['points']}')";
+					$query .= "('forum','$forumid','$uid','{$_GET['replyto']}','{$_POST['points']}')";
 					mysql_query($query) or die("Query failed : $query " . mysql_error());
 				}
 			}
@@ -123,7 +126,7 @@
 			if ($line['isanon']==1) {echo "checked=1";}
 			echo "></span><br class=form/>";
 		}
-		if ($isteacher && $haspoints) {
+		if ($isteacher && $haspoints && $_GET['modify']=='reply') {
 			echo '<span class="form">Points for message you\'re replying to:</span><span class="formright">';
 			echo '<input type="text" size="4" name="points" value="'.$points.'" /></span><br class="form" />';
 		}
@@ -166,6 +169,7 @@ function printparents($id) {
 			}
 			printparents($_GET['replyto']);
 		}
+		echo '</form>';
 		require("../footer.php");
 		exit;
 	}