Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv7888/mod/math_assignment
Modified Files:
aimpage.php editgrade.php index.php lib.php pdfgen.php
setseed.php subjectpage.php view.php
Added Files:
seed.html
Log Message:
--- NEW FILE: seed.html ---
<?php
echo "<form action=\"setseed.php\" method=\"GET\">\n";
echo get_string("enterid", "math_assignment");
echo "<input type=\"text\" name=\"sheetid\" size=\"8\" maxlength=\"8\" />\n";
echo "<input type=\"hidden\" name=\"assignment\" value=\"$math_assignment->id\" />\n";
echo "<input type=\"submit\" value=\"Submit\"><br />";
echo "</form>";
echo "<form action=\"setseed.php\" method=\"GET\">\n";
echo get_string("generateid", "math_assignment");
echo "<input type=\"hidden\" name=\"sheetid\" value=\"-1\" />\n";
echo "<input type=\"hidden\" name=\"assignment\" value=\"$math_assignment->id\" />\n";
echo "<input type=\"submit\" value=\"Generate new problems\"><br />";
echo "</form>";
?>
Index: aimpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** aimpage.php 2 Nov 2003 15:45:30 -0000 1.18
--- aimpage.php 16 Nov 2003 18:38:23 -0000 1.19
***************
*** 85,89 ****
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
$postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
- $postdata = math_assignment_add_arg_to_url_data($postdata, "KeepQuestionOrder", "true");
}
else if ($isteacher and strcasecmp($aimaction, "source") == 0) { // load the edit source page
--- 85,88 ----
***************
*** 95,99 ****
else if ($isteacher and strcasecmp($aimaction, "subject") == 0) { // load the edit subject page
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","admin/Subject");
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "ShowHiddenQuizzes");
$postdata = math_assignment_add_arg_to_url_data($postdata, "ShowHiddenQuizzes", "true");
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
--- 94,98 ----
else if ($isteacher and strcasecmp($aimaction, "subject") == 0) { // load the edit subject page
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","admin/Subject");
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "LoadSubjectOptions");
$postdata = math_assignment_add_arg_to_url_data($postdata, "ShowHiddenQuizzes", "true");
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
***************
*** 106,110 ****
else if ($isteacher and strcasecmp($aimaction, "analyse") == 0) { // load the analyse quiz page
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","analyze/Quiz");
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "AnalyzeQuiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
$postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
--- 105,109 ----
else if ($isteacher and strcasecmp($aimaction, "analyse") == 0) { // load the analyse quiz page
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","analyze/Quiz");
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "ReanalyzeQuiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
$postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
***************
*** 310,314 ****
if (isteacher($course->id)) {
if ($adminlinks = math_assignment_get_admin_links($cm, $math_assignment, $server->password, "center")) {
- print_heading(get_string("administration"));
echo $adminlinks;
}
--- 309,312 ----
Index: editgrade.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/editgrade.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editgrade.php 10 Nov 2003 12:15:29 -0000 1.3
--- editgrade.php 16 Nov 2003 18:38:23 -0000 1.4
***************
*** 53,57 ****
unset($err);
if (isset($grade) && isset($comment)) {
- $comment= stripslashes($comment);
$grade = trim($grade);
if ($grade == "-") { // reset override (clear grade)
--- 53,56 ----
***************
*** 70,83 ****
$gradeobj->aimgrade = $grade;
}
! else
$err = 2; // invalid entry
if (!isset($err)) {
$err = math_assignment_update_grades($gradeobj) ? 0 : 1;
! if (!$err)
! redirect("view.php?id=$cm->id", get_string("changessaved") . "\n" . get_string("delaymessage", "math_assignment", format_time($CFG->maxeditingtime)), 2);
}
}
! else
$err = 0;
/// Print the page header
--- 69,88 ----
$gradeobj->aimgrade = $grade;
}
! else if ($grade >= 0 && !$comment) { // comment is required
! $err = 3;
! } else {
$err = 2; // invalid entry
+ }
if (!isset($err)) {
$err = math_assignment_update_grades($gradeobj) ? 0 : 1;
! if (!$err) {
! redirect("view.php?id=$cm->id", get_string("changessaved") . "\n" .
! get_string("delaymessage", "math_assignment", format_time($CFG->maxeditingtime)), 2);
! }
}
}
! else {
$err = 0;
+ }
/// Print the page header
***************
*** 124,132 ****
$strnewgrade = get_string("newgrade", "math_assignment");
$strcomment = get_string("comment", "math_assignment");
!
! if ($err == 1)
notify(get_string("failed", "math_assignment"));
! else if ($err == 2)
notify(get_string("invalid", "math_assignment"));
print_heading_with_help($streditgrade, "editgrade", "math_assignment");
--- 129,142 ----
$strnewgrade = get_string("newgrade", "math_assignment");
$strcomment = get_string("comment", "math_assignment");
! $strseed = get_string("seed", "math_assignment");
! $strseedreset = get_string("seedreset", "math_assignment");
!
! if ($err == 1) {
notify(get_string("failed", "math_assignment"));
! } else if ($err == 2) {
notify(get_string("invalid", "math_assignment"));
+ } else if ($err == 3) {
+ notify(get_string("commentrequired", "math_assignment"));
+ }
print_heading_with_help($streditgrade, "editgrade", "math_assignment");
***************
*** 154,159 ****
echo "$seedinfo ";
! echo " <a href=\"editgrade.php?id=$id&userid=$userid&resetseed=true\">Reset seed</a> ";
! helpbutton ("resetseed", $strresetseed, "math_assignment");
?></p>
</td>
--- 164,169 ----
echo "$seedinfo ";
! echo " <a href=\"editgrade.php?id=$id&userid=$userid&resetseed=true\">$strseedreset</a> ";
! helpbutton ("resetseed", $strseedreset, "math_assignment");
?></p>
</td>
***************
*** 174,178 ****
}
echo " ";
- helpbutton ("editgrade_old", $stroldgrade, "math_assignment");
?></p>
</td>
--- 184,187 ----
***************
*** 182,193 ****
<td align="right"><p><b><?php echo $strnewgrade; ?>:</b></p></td>
<td>
! <input type="text" name="grade" size="20" maxlength="20" value="<?php if ($gradeobj->aimoverride > AIMOVR_RESET) echo max($gradeobj->aimgrade, 0);?>" /> / <?php echo "$math_assignment->aimgrade "; helpbutton ("editgrade_new", $strnewgrade, "math_assignment"); ?>
</td>
</tr>
<tr valign="top">
! <td align="right"><p><b><?php echo $strcomment; ?>:</b></p></td>
<td>
! <textarea name="comment" rows="8" cols="80" wrap="virtual"><?php p($gradeobj->aimcomment); ?></textarea> <?php helpbutton ("editgrade_comment", $strcomment, "math_assignment"); ?>
</td>
</tr>
--- 191,206 ----
<td align="right"><p><b><?php echo $strnewgrade; ?>:</b></p></td>
<td>
! <input type="text" name="grade" size="3" maxlength="20"
! value="<?php if ($gradeobj->aimoverride > AIMOVR_RESET) echo max($gradeobj->aimgrade, 0);?>" />
! / <?php echo "$math_assignment->aimgrade "; ?>
</td>
</tr>
<tr valign="top">
! <td align="right"><p>
! <?php helpbutton ("editgrade_comment", $strcomment, "math_assignment"); ?>
! <b><?php echo $strcomment; ?>:</b></p></td>
<td>
! <textarea name="comment" rows="8" cols="80" wrap="virtual"><?php p($gradeobj->aimcomment); ?></textarea>
</td>
</tr>
Index: index.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php 2 Nov 2003 15:45:30 -0000 1.9
--- index.php 16 Nov 2003 18:38:23 -0000 1.10
***************
*** 40,217 ****
die;
}
- /*
-
- /// Print the list of instances
-
- $timenow = time();
- $strweek = get_string("week");
- $strtopic = get_string("topic");
- $strname = get_string("name");
- $strtimedue = get_string("timedue", "math_assignment");
- $strproblems = get_string("problems", "math_assignment");
- $strsolutions = get_string("solutions", "math_assignment");
- $strviewproblems = get_string("viewproblems", "math_assignment");
- $strviewsolutions = get_string("viewsolutions", "math_assignment");
- $strpaper = get_string("paper", "math_assignment");
- $strcomputer = get_string("computer", "math_assignment");
- $strtotal = get_string("total");
- $strgrade = get_string("grade");
- $stropen = get_string("open", "math_assignment");
-
- if (isteacher($course->id)) {
- $teacher = true;
-
- if ($CFG->math_assignment_aim_display == 0)
- $showaim = false;
- else if ($CFG->math_assignment_aim_display == 1)
- $showaim = isadmin();
- else
- $showaim = true;
-
- if ($showaim) {
- $straimsubject = get_string("aimsubject", "math_assignment");
- $strserver = get_string("aimserver", "math_assignment");
- }
-
- if ($course->format == "weeks") {
- $table->head = array ($strweek, $strname, $strtimedue, $strproblems, $strsolutions);
- $table->align = array ("CENTER", "LEFT","LEFT","LEFT","LEFT");
- $table->width = array (10, "*","*","*","*");
- } else if ($course->format == "topics") {
- $table->head = array ($strtopic, $strname, $strtimedue, $strproblems, $strsolutions);
- $table->align = array ("CENTER", "LEFT","LEFT","LEFT","LEFT");
- $table->width = array (10, "*","*","*","*");
- } else {
- $table->head = array ($strname, $strtimedue, $strproblems, $strsolutions);
- $table->align = array ("LEFT","LEFT","LEFT","LEFT");
- $table->width = array ("*","*","*","*");
- }
- if ($showaim) {
- array_push($table->head, $straimsubject, $strserver);
- array_push($table->align, "LEFT", "LEFT");
- array_push($table->width, "*", "*");
- }
- }
- else {
- $teacher = false;
-
- if ($course->format == "weeks") {
- $table->head = array ($strweek, $strname, $strtimedue, $strproblems, $strsolutions, "$strpaper $strgrade", "$strcomputer $strgrade", "$strtotal $strgrade");
- $table->align = array ("CENTER", "LEFT", "LEFT", "LEFT", "LEFT", "CENTER", "CENTER", "CENTER");
- $table->width = array (10, "*", "*", "*", "*", "*", "*", "*");
- } else if ($course->format == "topics") {
- $table->head = array ($strtopic, $strname, $strtimedue, $strproblems, $strsolutions, "$strpaper $strgrade", "$strcomputer $strgrade", "$strtotal $strgrade");
- $table->align = array ("CENTER", "LEFT", "LEFT", "LEFT", "LEFT", "CENTER", "CENTER", "CENTER");
- $table->width = array (10, "*", "*", "*", "*", "*", "*", "*");
- } else {
- $table->head = array ($strname, $strtimedue, $strproblems, $strsolutions, "$strpaper $strgrade", "$strcomputer $strgrade", "$strtotal $strgrade");
- $table->align = array ("LEFT", "LEFT", "LEFT", "LEFT", "CENTER", "CENTER", "CENTER");
- $table->width = array ("*", "*", "*", "*", "*", "*", "*");
- }
- }
-
- foreach ($math_assignments as $math_assignment) {
- if (!$math_assignment->visible) {
- //Show dimmed if the mod is hidden
- $link = "<a class=\"dimmed\" href=\"view.php?id=$math_assignment->coursemodule\">$math_assignment->name</a>";
- }
- else {
- //Show normal if the mod is visible
- $link = "<a href=\"view.php?id=$math_assignment->coursemodule\">$math_assignment->name</a>";
- }
-
- math_assignment_get_file_urls($math_assignment, $proburl, $solurl);
- $proburl = htmlspecialchars($proburl);
- $solurl = htmlspecialchars($solurl);
- if ($teacher) {
- if ($showaim && $math_assignment->aimquiz) {
- // lookup subject
- if (! $subject = get_record("math_assignment_subject", "course", $course->id)) {
- $subject->server = 0;
- $subject->name = "Unknown";
- }
- // lookup server
- if (! $server = get_record("math_assignment_server", "id", $subject->server)) {
- $server->name = "Unknown";
- $server->address = "unknown";
- }
- }
- if ($course->format == "weeks" or $course->format == "topics") {
- $row = array ($math_assignment->section, $link);
- } else {
- $row = array ($link);
- }
- array_push($row, userdate($math_assignment->timedue, "", 99, false), $proburl ? "<a href=\"$proburl\" target=\"problems\">$strviewproblems</a>" : "", $solurl ? "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>" : "");
- if ($showaim) {
- if ($math_assignment->aimquiz)
- array_push($row, $subject->name, "$server->name ($server->address)");
- else
- array_push($row, "", "");
- }
- $table->data[] = $row;
- }
- else if ($math_assignment->visible) {
- if (!$grade = get_record("math_assignment_grades", "assignment", $math_assignment->id, "userid", $USER->id)) {
- $grade->papergrade = -1;
- $grade->aimgrade = -1;
- $grade->aimoverride = AIMOVR_OFF;
- $grade->aimcomment = "";
- }
- if ($math_assignment->papergrade > 0) {
- if (!$math_assignment->papersheetsreturned) {
- $papergrade = get_string("notpublished", "math_assignment");
- } else if ($grade->papergrade >= 0) {
- $papergrade = "$grade->papergrade / $math_assignment->papergrade";
- } else if ($grade->papergrade = -1) {
- $papergrade = "-- / $math_assignment->papergrade";
- }
- if ($math_assignment->timedue > time()) {
- $papergrade = $stropen;
- }
- }
- else {
- $papergrade = "";
- }
- if ($math_assignment->aimgrade > 0) {
- if ($grade->aimgrade >= 0) {
- $aimgrade = "$grade->aimgrade / $math_assignment->aimgrade";
- } else {
- $aimgrade = "-- / $math_assignment->aimgrade";
- }
- if ($math_assignment->timedue > time()) {
- $aimgrade = $stropen;
- }
- if ($grade->aimoverride > AIMOVR_RESET) {
- $aimgrade .= " (" . get_string("gradeoverride", "math_assignment") . ")";
- }
- }
- else {
- $aimgrade = "";
- }
-
- $totalgrade = math_assignment_total_grade($math_assignment, $grade);
- $maxgrade = $math_assignment->papergrade + $math_assignment->aimgrade;
- $totalgrade = "$totalgrade / $maxgrade";
- // Don't show a total grade if there is an unpublished paper grade
- if ($math_assignment->papergrade > 0 and !$math_assignment->papersheetsreturned) {
- $totalgrade = "";
- }
- if ($course->format == "weeks" or $course->format == "topics")
- $row = array ($math_assignment->section, $link);
- else
- $row = array ($link);
- if ($solurl) {
- if ($timenow > $math_assignment->timedue)
- $solutions = "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>";
- else
- $solutions = "";
- }
- else
- $solutions = "";
- array_push($row, userdate($math_assignment->timedue, "", 99, false), $proburl ? "<a href=\"$proburl\" target=\"problems\">$strviewproblems</a>" : "", $solutions, $papergrade, $aimgrade, $totalgrade);
- $table->data[] = $row;
- }
- }
- */
print_heading($strmath_assignments);
--- 40,43 ----
Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** lib.php 10 Nov 2003 12:15:29 -0000 1.42
--- lib.php 16 Nov 2003 18:38:23 -0000 1.43
***************
*** 359,365 ****
$strviewproblems = get_string("viewproblems", "math_assignment");
$return .= "<a href=\"$proburl\" target=\"problems\">$strviewproblems</a>";
- //$return .= math_assignment_help_button("viewproblems", $strviewproblems, false);
}
! if (($solurl) and ($math_assignment->solutiontime < time())) {
if (isset($return))
$return .= "<br />\n";
--- 359,364 ----
$strviewproblems = get_string("viewproblems", "math_assignment");
$return .= "<a href=\"$proburl\" target=\"problems\">$strviewproblems</a>";
}
! if (($solurl) and ($math_assignment->solutiontime < time()) && isstudent($math_assignment->course)) {
if (isset($return))
$return .= "<br />\n";
***************
*** 370,374 ****
$strviewsolutions = get_string("viewsolutions", "math_assignment");
$return .= "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>";
- //$return .= math_assignment_help_button("viewsolutions", $strviewsolutions, false);
}
else if(($solurl) && isteacher($math_assignment->course)) {
--- 369,372 ----
***************
*** 381,385 ****
$strviewsolutions = get_string("viewsolutions", "math_assignment");
$return .= "<a href=\"$solurl\" target=\"solutions\">$strviewsolutions</a>";
- $return .= math_assignment_help_button("viewsolutionsteacher", $strviewsolutions, false);
}
if (isset($return)) {
--- 379,382 ----
***************
*** 397,405 ****
$filelinks = math_assignment_get_file_links($math_assignment, "");
if ($math_assignment->aimquiz) {
! $return = "<p align=\"$align\">$filelinks";
if ($filelinks)
! $return .= "<br />\n";
// View Quiz
! $return .= "<a href=\"aimpage.php?id=$cm->id\">" . get_string("viewquiz", "math_assignment") . "</a><br />\n";
// Analyse Results
$stranalyseresults = get_string("analyseresults", "math_assignment");
--- 394,403 ----
$filelinks = math_assignment_get_file_links($math_assignment, "");
if ($math_assignment->aimquiz) {
! $return = "<table width=\"100%\" align=\"$align\"><tr><td>";
if ($filelinks)
! $return .= "$filelinks<br />\n";
// View Quiz
! $return .= "<a href=\"aimpage.php?id=$cm->id\">" . get_string("viewquiz", "math_assignment") . "</a></td>\n";
! $return .= "<td align=\"right\"><b>" . get_string("adminlinks", "math_assignment") . "</b><br />";
// Analyse Results
$stranalyseresults = get_string("analyseresults", "math_assignment");
***************
*** 407,415 ****
$return .= math_assignment_help_button("analyze_quiz", $stranalyseresults, false);
$return .= "<br />\n";
- // Try Quiz
- $strtryquiz = get_string("tryquiz", "math_assignment");
- $return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=try\">$strtryquiz</a>";
- $return .= math_assignment_help_button("try_quiz", $strtryquiz, false);
- $return .= "<br />\n";
// Edit Quiz
$streditquiz = get_string("editquiz", "math_assignment");
--- 405,408 ----
***************
*** 417,425 ****
$return .= math_assignment_help_button("admin_quiz", $streditquiz, false);
$return .= "<br />\n";
// Browse Source
/*$strbrowsesource = get_string("browsesource", "math_assignment");
$return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=source\">$strbrowsesource</a>";
$return .= math_assignment_help_button("admin_sourcedir", $strbrowsesource, false);
! $return .= "<br />\n";*/
// Edit Subject
$streditsubject = get_string("editsubject", "math_assignment");
--- 410,423 ----
$return .= math_assignment_help_button("admin_quiz", $streditquiz, false);
$return .= "<br />\n";
+ // Try Quiz
+ $strtryquiz = get_string("tryquiz", "math_assignment");
+ $return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=try\">$strtryquiz</a>";
+ $return .= math_assignment_help_button("try_quiz", $strtryquiz, false);
+ $return .= "<br />\n";
// Browse Source
/*$strbrowsesource = get_string("browsesource", "math_assignment");
$return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=source\">$strbrowsesource</a>";
$return .= math_assignment_help_button("admin_sourcedir", $strbrowsesource, false);
! $return .= "<br />\n";
// Edit Subject
$streditsubject = get_string("editsubject", "math_assignment");
***************
*** 432,441 ****
$return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=zoneadmin\">$strzoneadmin</a>";
$return .= math_assignment_help_button("admin_zoneadmin", $strzoneadmin, false);
! }
}
else if ($filelinks)
! $return = "<p align=\"$align\">$filelinks";
! if (!empty($return))
! $return .= "</p>\n";
return $return;
}
--- 430,439 ----
$return .= "<a href=\"aimpage.php?id=$cm->id&aimaction=zoneadmin\">$strzoneadmin</a>";
$return .= math_assignment_help_button("admin_zoneadmin", $strzoneadmin, false);
! }*/
! $return .= "</td></table>\n";
}
else if ($filelinks)
! $return = "<p align=\"$align\">$filelinks</p>\n";
!
return $return;
}
***************
*** 676,680 ****
$unwanted = array(">Download<",">Browse source<",">Edit home page<",">Download results<",
">Edit register<",">Student details<",">Hide hidden quizzes<",">Hide hidden questions<",
! ">New Quiz<");
$out = str_replace($unwanted,"><",$out);
--- 674,678 ----
$unwanted = array(">Download<",">Browse source<",">Edit home page<",">Download results<",
">Edit register<",">Student details<",">Hide hidden quizzes<",">Hide hidden questions<",
! ">New Quiz<", ">Email<");
$out = str_replace($unwanted,"><",$out);
***************
*** 1072,1081 ****
$link = "<b>$math_assignment->name</b>";
if ($showlinks) {
! $link = "<a href=\"$CFG->wwwroot/mod/math_assignment/view.php?id=$math_assignment->coursemodule\">$link</a>";
! }
! if (!$math_assignment->visible) {
! //Show dimmed if the mod is hidden
! $link = "<span style=\"dimmed\">$link</span>";
}
--- 1070,1079 ----
$link = "<b>$math_assignment->name</b>";
+
+ //Show dimmed if the mod is hidden
+ $hide = ($math_assignment->visible) ? "" : "class=\"dimmed\"";
+
if ($showlinks) {
! $link = "<a href=\"$CFG->wwwroot/mod/math_assignment/view.php?id=$math_assignment->coursemodule\" $hide>$link</a>";
}
Index: pdfgen.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/pdfgen.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pdfgen.php 10 Nov 2003 12:15:29 -0000 1.23
--- pdfgen.php 16 Nov 2003 18:38:23 -0000 1.24
***************
*** 11,14 ****
--- 11,16 ----
optional_variable($seed, 0); // seed to be passed to AiM. 0 means no seed set.
// This may be overruled by the student's saved seed.
+ optional_variable($texmachine, remote); // This determines whether to do the texing
+ // on a remote machine (manor in my case) or the local machine
global $USER;
***************
*** 82,87 ****
$tempfile = substr(md5(microtime()), 0, 6);
}
! $remote = 'ftp://gustav:bek...@ma.../home/gustav/public_html/moodletex/';
! $textopdf = 'http://manor.york.ac.uk/~gustav/moodletex/index.php';
$errlog = "";
--- 84,95 ----
$tempfile = substr(md5(microtime()), 0, 6);
}
!
! if ($texmachine == "remote") {
! $remote = 'ftp://gustav:bek...@ma.../home/gustav/public_html/moodletex/';
! $textopdf = 'http://manor.york.ac.uk/~gustav/moodletex/index.php';
! } else {
! $remote = 'moodletex/';
! $textopdf = 'moodletex/index.php';
! }
$errlog = "";
***************
*** 122,126 ****
// $math_assignment and stores it in $tempfile.pdf
! global $CFG, $remote;
// if there is an aim quiz load it into $data
--- 130,134 ----
// $math_assignment and stores it in $tempfile.pdf
! global $CFG, $remote, $texmachine;
// if there is an aim quiz load it into $data
***************
*** 244,253 ****
fwrite($fp,$latex);
fclose($fp);
- if (!$conn = ftp_connect("manor.york.ac.uk")) echo "couldn't open ftp connection";
- if (!ftp_login($conn, "gustav", "bekieh++")) echo "couldn't log in";
- if (!ftp_site($conn, "chmod 0744 /home/gustav/public_html/moodletex/{$tempfile}.tex")) echo "couldn't chmod";
- ftp_close($conn);
-
return $latex;
--- 252,263 ----
fwrite($fp,$latex);
fclose($fp);
+
+ if ($texmachine == "remote") {
+ if (!$conn = ftp_connect("manor.york.ac.uk")) echo "couldn't open ftp connection";
+ if (!ftp_login($conn, "gustav", "bekieh++")) echo "couldn't log in";
+ if (!ftp_site($conn, "chmod 0744 /home/gustav/public_html/moodletex/{$tempfile}.tex")) echo "couldn't chmod";
+ ftp_close($conn);
+ }
return $latex;
Index: setseed.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/setseed.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** setseed.php 10 Nov 2003 12:15:30 -0000 1.4
--- setseed.php 16 Nov 2003 18:38:23 -0000 1.5
***************
*** 9,12 ****
--- 9,14 ----
require_variable($sheetid);
require_variable($assignment);
+ optional_variable($confirm, ""); // student will be asked for confirmation unless confirm=confirmed
+ optional_variable($forward, $_SERVER["HTTP_REFERER"]); // page to be forwarded to after setting seed.
global $USER;
$student = $USER->id;
***************
*** 46,49 ****
--- 48,60 ----
// generate random seed if sheetid = -1
if ($sheetid == -1) {
+ // first make sure that the students really know what they are doing
+ if (!$confirm == "confirmed") {
+ notice_yesno(get_string("seedwarning","math_assignment"),
+ "setseed.php?sheetid=$sheetid&assignment=$assignment&confirm=confirmed&forward=$forward",
+ "view.php?q=$assignment"
+ );
+ print_footer();
+ die;
+ }
$sheetid = mt_rand (10000000,99999999);
// make sure seed hasn't already been used
***************
*** 105,109 ****
}
! redirect($_SERVER["HTTP_REFERER"]);
?>
--- 116,120 ----
}
! redirect($forward);
?>
Index: subjectpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/subjectpage.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** subjectpage.php 18 Sep 2003 09:48:51 -0000 1.2
--- subjectpage.php 16 Nov 2003 18:38:23 -0000 1.3
***************
*** 25,29 ****
if (!isteacher($id)) {
! errpr("Only teachers should be able to view this page");
}
--- 25,29 ----
if (!isteacher($id)) {
! error("Only teachers should be able to view this page");
}
Index: view.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** view.php 10 Nov 2003 12:15:30 -0000 1.23
--- view.php 16 Nov 2003 18:38:23 -0000 1.24
***************
*** 276,280 ****
$totalmax = $math_assignment->papergrade + $math_assignment->aimgrade;
! if (!isteacher()) {
if (!$inbox) {
print_simple_box_start("center");
--- 276,280 ----
$totalmax = $math_assignment->papergrade + $math_assignment->aimgrade;
! if ($isstudent) {
if (!$inbox) {
print_simple_box_start("center");
|
