|
From: <gus...@us...> - 2004-01-11 14:08:10
|
Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv10816
Modified Files:
aimpage.php config.html deleteserver.php editgrade.php lib.php
mod.html pdfgen.php saveconfig.php servers.php setseed.php
subjectpage.php view.php
Log Message:
brought tables in line with Moodle coding guidlines
Index: aimpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** aimpage.php 16 Nov 2003 18:38:23 -0000 1.19
--- aimpage.php 11 Jan 2004 14:08:06 -0000 1.20
***************
*** 50,57 ****
}
}
! if (!$subject = get_record("math_assignment_subject", "course", $course->id)) {
error(get_string("noaccess", "math_assignment"));
}
! if (!$server = get_record("math_assignment_server", "id", $subject->server)) {
error(get_string("noaccess", "math_assignment"));
}
--- 50,57 ----
}
}
! if (!$subject = get_record("math_assignment_subjects", "course", $course->id)) {
error(get_string("noaccess", "math_assignment"));
}
! if (!$server = get_record("math_assignment_servers", "id", $subject->server)) {
error(get_string("noaccess", "math_assignment"));
}
***************
*** 119,124 ****
else { // Do Quiz
// get student seed if appropriate
! if (record_exists("math_assignment_seed", "assignment", $math_assignment->id)) {
! if (!$seeddata = get_record("math_assignment_seed", "assignment", $math_assignment->id, "student", $USER->id)) {
// no seed has been assigned to student yet, so ask
// Print the page header
--- 119,124 ----
else { // Do Quiz
// get student seed if appropriate
! if (record_exists("math_assignment_seeds", "assignment", $math_assignment->id)) {
! if (!$seeddata = get_record("math_assignment_seeds", "assignment", $math_assignment->id, "userid", $USER->id)) {
// no seed has been assigned to student yet, so ask
// Print the page header
Index: config.html
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/config.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.html 25 Sep 2003 22:14:09 -0000 1.6
--- config.html 11 Jan 2004 14:08:06 -0000 1.7
***************
*** 84,88 ****
// get aim server
$options = array();
! if ($servers = get_records("math_assignment_server", "", "", "name ASC")) {
foreach ($servers as $server) {
$options[$server->id] = $server->name;
--- 84,88 ----
// get aim server
$options = array();
! if ($servers = get_records("math_assignment_servers", "", "", "name ASC")) {
foreach ($servers as $server) {
$options[$server->id] = $server->name;
***************
*** 91,95 ****
foreach ($courses as $course) {
! if (!$subject = get_record("math_assignment_subject", "course", $course->id)) {
$subject->name = "";
$subject->server = 0;
--- 91,95 ----
foreach ($courses as $course) {
! if (!$subject = get_record("math_assignment_subjects", "course", $course->id)) {
$subject->name = "";
$subject->server = 0;
***************
*** 133,137 ****
$courseids = "$course->id";
}
! $db->Execute("DELETE FROM `{$CFG->prefix}math_assignment_subject` WHERE `course` NOT IN ($courseids)");
?>
--- 133,137 ----
$courseids = "$course->id";
}
! $db->Execute("DELETE FROM `{$CFG->prefix}math_assignment_subjects` WHERE `course` NOT IN ($courseids)");
?>
Index: deleteserver.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/deleteserver.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** deleteserver.php 23 Sep 2003 17:53:10 -0000 1.2
--- deleteserver.php 11 Jan 2004 14:08:06 -0000 1.3
***************
*** 20,33 ****
if ($newserver && $newserver != $id) {
// change subjects using this server to use new server
! if (!$db->Execute("UPDATE `{$CFG->prefix}math_assignment_subject` SET `server` = $newserver WHERE `server` = $id"))
error(get_string("failed", "math_assignment"), "servers.php");
}
else {
// delete subjects for this server
! if (!delete_records("math_assignment_subject", "server", $id))
error(get_string("failed", "math_assignment"), "servers.php");
}
// delete the server
! if (!delete_records("math_assignment_server", "id", $id)) {
error(get_string("failed", "math_assignment"), "servers.php");
}
--- 20,33 ----
if ($newserver && $newserver != $id) {
// change subjects using this server to use new server
! if (!$db->Execute("UPDATE `{$CFG->prefix}math_assignment_subjects` SET `server` = $newserver WHERE `server` = $id"))
error(get_string("failed", "math_assignment"), "servers.php");
}
else {
// delete subjects for this server
! if (!delete_records("math_assignment_subjects", "server", $id))
error(get_string("failed", "math_assignment"), "servers.php");
}
// delete the server
! if (!delete_records("math_assignment_servers", "id", $id)) {
error(get_string("failed", "math_assignment"), "servers.php");
}
***************
*** 37,39 ****
redirect("servers.php", get_string("changessaved"), 1);
! ?>
\ No newline at end of file
--- 37,39 ----
redirect("servers.php", get_string("changessaved"), 1);
! ?>
Index: editgrade.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/editgrade.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editgrade.php 16 Nov 2003 18:38:23 -0000 1.4
--- editgrade.php 11 Jan 2004 14:08:06 -0000 1.5
***************
*** 35,39 ****
if ($resetseed) {
! delete_records("math_assignment_seed", "student", $userid, "assignment", $math_assignment->id);
}
--- 35,39 ----
if ($resetseed) {
! delete_records("math_assignment_seeds", "userid", $userid, "assignment", $math_assignment->id);
}
***************
*** 156,160 ****
<?php
! if ($seedinfo = get_field("math_assignment_seed", "seed", "assignment", $id, "student", $userid)) {
?>
<tr valign="top">
--- 156,160 ----
<?php
! if ($seedinfo = get_field("math_assignment_seeds", "seed", "assignment", $id, "userid", $userid)) {
?>
<tr valign="top">
Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** lib.php 11 Jan 2004 13:15:33 -0000 1.44
--- lib.php 11 Jan 2004 14:08:06 -0000 1.45
***************
*** 524,529 ****
/// returns an array with all the quiz names
! $subject = get_record("math_assignment_subject", "course", $course);
! $server = get_record("math_assignment_server", "id", $subject->server);
$postdata = "";
--- 524,529 ----
/// returns an array with all the quiz names
! $subject = get_record("math_assignment_subjects", "course", $course);
! $server = get_record("math_assignment_servers", "id", $subject->server);
$postdata = "";
***************
*** 549,555 ****
}
! if (!$subject = get_record("math_assignment_subject", "course", $math_assignment->course))
return false;
! if (!$server = get_record("math_assignment_server", "id", $subject->server))
return false;
--- 549,555 ----
}
! if (!$subject = get_record("math_assignment_subjects", "course", $math_assignment->course))
return false;
! if (!$server = get_record("math_assignment_servers", "id", $subject->server))
return false;
***************
*** 590,599 ****
if (is_null($subject)) {
! if (!$subject = get_record("math_assignment_subject", "course", $math_assignment->course))
return false;
$server = null;
}
if (is_null($server)) {
! if (!$server = get_record("math_assignment_server", "id", $subject->server))
return false;
}
--- 590,599 ----
if (is_null($subject)) {
! if (!$subject = get_record("math_assignment_subjects", "course", $math_assignment->course))
return false;
$server = null;
}
if (is_null($server)) {
! if (!$server = get_record("math_assignment_servers", "id", $subject->server))
return false;
}
***************
*** 1084,1093 ****
// 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";
--- 1084,1093 ----
// if ($showaim && $math_assignment->aimquiz) {
// // lookup subject
! // if (! $subject = get_record("math_assignment_subjects", "course", $course->id)) {
// $subject->server = 0;
// $subject->name = "Unknown";
// }
// // lookup server
! // if (! $server = get_record("math_assignment_servers", "id", $subject->server)) {
// $server->name = "Unknown";
// $server->address = "unknown";
Index: mod.html
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/mod.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mod.html 31 Oct 2003 14:05:59 -0000 1.25
--- mod.html 11 Jan 2004 14:08:06 -0000 1.26
***************
*** 54,58 ****
// get aimsubject from database
! if (!$aimsubject = get_field("math_assignment_subject", "name", "course", $form->course))
$aimsubject = "";
--- 54,58 ----
// get aimsubject from database
! if (!$aimsubject = get_field("math_assignment_subjects", "name", "course", $form->course))
$aimsubject = "";
Index: pdfgen.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/pdfgen.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** pdfgen.php 16 Nov 2003 18:38:23 -0000 1.24
--- pdfgen.php 11 Jan 2004 14:08:06 -0000 1.25
***************
*** 43,50 ****
if ($math_assignment->aimquiz) {
! if (!$subject = get_record("math_assignment_subject", "course", $course->id)) {
error(get_string("noaccess", "math_assignment"));
}
! if (!$server = get_record("math_assignment_server", "id", $subject->server)) {
error(get_string("noaccess", "math_assignment"));
}
--- 43,50 ----
if ($math_assignment->aimquiz) {
! if (!$subject = get_record("math_assignment_subjects", "course", $course->id)) {
error(get_string("noaccess", "math_assignment"));
}
! if (!$server = get_record("math_assignment_servers", "id", $subject->server)) {
error(get_string("noaccess", "math_assignment"));
}
***************
*** 52,57 ****
// get student seed if appropriate
! if (isstudent($course->id) and record_exists("math_assignment_seed", "assignment", $math_assignment->id)) {
! if (!$seeddata = get_record("math_assignment_seed", "assignment", $math_assignment->id, "student", $USER->id)) {
// no seed has been assigned to student yet, so ask
// Print the page header
--- 52,57 ----
// get student seed if appropriate
! if (isstudent($course->id) and record_exists("math_assignment_seeds", "assignment", $math_assignment->id)) {
! if (!$seeddata = get_record("math_assignment_seeds", "assignment", $math_assignment->id, "userid", $USER->id)) {
// no seed has been assigned to student yet, so ask
// Print the page header
***************
*** 98,109 ****
if ($printcopies > 0) {
$newseed->assignment = $math_assignment->id;
! $newseed->student = NULL;
for ($i = 1; $i <= $printcopies; $i++) {
$newseed->seed = mt_rand (10000000,99999999);
// make sure seed hasn't already been used
! while (get_record("math_assignment_seed", "assignment", $newseed->assignment, "seed", $newseed->seed)) {
$newseed->seed = mt_rand (10000000,99999999);
}
! if (!insert_record("math_assignment_seed", $newseed, $returnid=false)) {
error("Couldn't add $i seed $newseed->seed to database");
}
--- 98,109 ----
if ($printcopies > 0) {
$newseed->assignment = $math_assignment->id;
! $newseed->userid = NULL;
for ($i = 1; $i <= $printcopies; $i++) {
$newseed->seed = mt_rand (10000000,99999999);
// make sure seed hasn't already been used
! while (get_record("math_assignment_seeds", "assignment", $newseed->assignment, "seed", $newseed->seed)) {
$newseed->seed = mt_rand (10000000,99999999);
}
! if (!insert_record("math_assignment_seeds", $newseed, $returnid=false)) {
error("Couldn't add $i seed $newseed->seed to database");
}
Index: saveconfig.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/saveconfig.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** saveconfig.php 26 Sep 2003 11:27:40 -0000 1.4
--- saveconfig.php 11 Jan 2004 14:08:06 -0000 1.5
***************
*** 37,45 ****
if ($subject->server) {
$subject->course = $course;
! if (!$db->Execute("REPLACE `{$CFG->prefix}math_assignment_subject` SET `course` = '$subject->course', `name` = '$subject->name', `server` = '$subject->server', `password` = '$subject->password'"))
$result = false;
}
else
! delete_records("math_assignment_subject", "course", $subject->course);
}
break;
--- 37,45 ----
if ($subject->server) {
$subject->course = $course;
! if (!$db->Execute("REPLACE `{$CFG->prefix}math_assignment_subjects` SET `course` = '$subject->course', `name` = '$subject->name', `server` = '$subject->server', `password` = '$subject->password'"))
$result = false;
}
else
! delete_records("math_assignment_subjects", "course", $subject->course);
}
break;
***************
*** 48,53 ****
if ($subject->server) {
$subject->course = $course;
! if (!insert_record("math_assignment_subject", $subject, false)) {
! if (!update_record("math_assignment_subject", $subject, false))
$result = false;
}
--- 48,53 ----
if ($subject->server) {
$subject->course = $course;
! if (!insert_record("math_assignment_subjects", $subject, false)) {
! if (!update_record("math_assignment_subjects", $subject, false))
$result = false;
}
***************
*** 62,64 ****
redirect("$CFG->wwwroot/$CFG->admin/modules.php", get_string("changessaved"), 1);
! ?>
\ No newline at end of file
--- 62,64 ----
redirect("$CFG->wwwroot/$CFG->admin/modules.php", get_string("changessaved"), 1);
! ?>
Index: servers.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/servers.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** servers.php 23 Sep 2003 17:53:11 -0000 1.4
--- servers.php 11 Jan 2004 14:08:06 -0000 1.5
***************
*** 39,43 ****
echo "<form name=\"form\" action=\"deleteserver.php\" method=\"post\">\n";
echo "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
! if ($server = get_record("math_assignment_server", "id", $id))
echo "<p align=\"center\">$server->name ($server->address)</p>";
if ($depends = get_server_depends($server, false)) {
--- 39,43 ----
echo "<form name=\"form\" action=\"deleteserver.php\" method=\"post\">\n";
echo "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
! if ($server = get_record("math_assignment_servers", "id", $id))
echo "<p align=\"center\">$server->name ($server->address)</p>";
if ($depends = get_server_depends($server, false)) {
***************
*** 54,58 ****
echo "<p align=\"center\"><b>" . get_string("replacementserver", "math_assignment") . " :</b> ";
$options = array();
! if ($servers = get_records("math_assignment_server", "", "", "name ASC")) {
foreach ($servers as $server) {
if ($server->id != $id)
--- 54,58 ----
echo "<p align=\"center\"><b>" . get_string("replacementserver", "math_assignment") . " :</b> ";
$options = array();
! if ($servers = get_records("math_assignment_servers", "", "", "name ASC")) {
foreach ($servers as $server) {
if ($server->id != $id)
***************
*** 80,84 ****
if (!math_assignment_check_name($name) || !math_assignment_check_name($address))
error(get_string("invalid", "math_assignment"), "servers.php");
! if (!update_record("math_assignment_server", $server))
error(get_string("failed", "math_assignment"), "servers.php");
}
--- 80,84 ----
if (!math_assignment_check_name($name) || !math_assignment_check_name($address))
error(get_string("invalid", "math_assignment"), "servers.php");
! if (!update_record("math_assignment_servers", $server))
error(get_string("failed", "math_assignment"), "servers.php");
}
***************
*** 89,93 ****
if (!math_assignment_check_name($name) || !math_assignment_check_name($address))
error(get_string("invalid", "math_assignment"), "servers.php");
! if (!insert_record("math_assignment_server", $server))
error(get_string("failed", "math_assignment"), "servers.php");
}
--- 89,93 ----
if (!math_assignment_check_name($name) || !math_assignment_check_name($address))
error(get_string("invalid", "math_assignment"), "servers.php");
! if (!insert_record("math_assignment_servers", $server))
error(get_string("failed", "math_assignment"), "servers.php");
}
***************
*** 121,125 ****
if (isset($id)) {
! if (!$server = get_record("math_assignment_server", "id", $id)) {
$server->name = "";
$server->address = "";
--- 121,125 ----
if (isset($id)) {
! if (!$server = get_record("math_assignment_servers", "id", $id)) {
$server->name = "";
$server->address = "";
***************
*** 127,131 ****
}
}
! else if ($servers = get_records("math_assignment_server", "", "", "name ASC")) {
$table->head = array($strname, $straddress, $strpassword, $strdepends, $stredit, $strdelete);
$table->width = array("*", "*", "*", "*", "*", "*");
--- 127,131 ----
}
}
! else if ($servers = get_records("math_assignment_servers", "", "", "name ASC")) {
$table->head = array($strname, $straddress, $strpassword, $strdepends, $stredit, $strdelete);
$table->width = array("*", "*", "*", "*", "*", "*");
***************
*** 194,199 ****
if ($justcount)
! return count_records("math_assignment_subject", "server", $server->id);
! return get_records_sql("SELECT s.course, c.shortname, c.fullname, s.name FROM {$CFG->prefix}math_assignment_subject s, {$CFG->prefix}course c WHERE c.id = s.course AND s.server = $server->id");
}
--- 194,199 ----
if ($justcount)
! return count_records("math_assignment_subjects", "server", $server->id);
! return get_records_sql("SELECT s.course, c.shortname, c.fullname, s.name FROM {$CFG->prefix}math_assignment_subjects s, {$CFG->prefix}course c WHERE c.id = s.course AND s.server = $server->id");
}
Index: setseed.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/setseed.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** setseed.php 16 Nov 2003 18:38:23 -0000 1.5
--- setseed.php 11 Jan 2004 14:08:06 -0000 1.6
***************
*** 22,30 ****
}
! if (! $subject = get_record("math_assignment_subject", "course", $math_assignment->course)) {
error("AiM subject is misconfigured");
}
! if (! $server = get_record("math_assignment_server", "id", $subject->server)) {
error("AiM subject is misconfigured");
}
--- 22,30 ----
}
! if (! $subject = get_record("math_assignment_subjects", "course", $math_assignment->course)) {
error("AiM subject is misconfigured");
}
! if (! $server = get_record("math_assignment_servers", "id", $subject->server)) {
error("AiM subject is misconfigured");
}
***************
*** 59,82 ****
$sheetid = mt_rand (10000000,99999999);
// make sure seed hasn't already been used
! while (get_record("math_assignment_seed", "assignment", $assignment, "seed", $sheetid)) {
$sheetid = mt_rand (10000000,99999999);
}
$seeddata->seed = $sheetid;
! $seeddata->student = $student;
$seeddata->assignment = $assignment;
! if (!insert_record("math_assignment_seed", $seeddata, $returnid=false)) {
error("Couldn't add seed $newseed->seed to database");
}
}
else { // check if given sheetid is valid
! if (record_exists("math_assignment_seed", "assignment", $assignment, "student", $student)) {
error("You already entered an ID for this assignment. The system should not have brought you to this page.");
}
! if (!$seed = get_record("math_assignment_seed", "assignment", $assignment, "seed", $sheetid)) {
// The ID number does not exist
notice(get_string("idinvalid", "math_assignment", $sheetid));
}
// ID number is valid
! if (isset($seed->student)) {
// but this ID number was already entered by a
// different student
--- 59,82 ----
$sheetid = mt_rand (10000000,99999999);
// make sure seed hasn't already been used
! while (get_record("math_assignment_seeds", "assignment", $assignment, "seed", $sheetid)) {
$sheetid = mt_rand (10000000,99999999);
}
$seeddata->seed = $sheetid;
! $seeddata->userid = $student;
$seeddata->assignment = $assignment;
! if (!insert_record("math_assignment_seeds", $seeddata, $returnid=false)) {
error("Couldn't add seed $newseed->seed to database");
}
}
else { // check if given sheetid is valid
! if (record_exists("math_assignment_seeds", "assignment", $assignment, "userid", $student)) {
error("You already entered an ID for this assignment. The system should not have brought you to this page.");
}
! if (!$seed = get_record("math_assignment_seeds", "assignment", $assignment, "seed", $sheetid)) {
// The ID number does not exist
notice(get_string("idinvalid", "math_assignment", $sheetid));
}
// ID number is valid
! if (isset($seed->userid)) {
// but this ID number was already entered by a
// different student
***************
*** 86,90 ****
// Everything is o.k., so assign seed to student
! if (!set_field("math_assignment_seed", "student", $student, "assignment", $assignment, "seed", $sheetid)) {
error("Problem writing to seed database table");
}
--- 86,90 ----
// Everything is o.k., so assign seed to student
! if (!set_field("math_assignment_seeds", "userid", $student, "assignment", $assignment, "seed", $sheetid)) {
error("Problem writing to seed database table");
}
Index: subjectpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/subjectpage.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** subjectpage.php 16 Nov 2003 18:38:23 -0000 1.3
--- subjectpage.php 11 Jan 2004 14:08:06 -0000 1.4
***************
*** 14,22 ****
}
! if (!$subject = get_record("math_assignment_subject", "course", $id)) {
error("This page should not be shown unless a subject has been assigned to the course");
}
! if (!$server = get_record("math_assignment_server", "id", $subject->server)) {
error("The server belonging to his subject is not set up correctly");
}
--- 14,22 ----
}
! if (!$subject = get_record("math_assignment_subjects", "course", $id)) {
error("This page should not be shown unless a subject has been assigned to the course");
}
! if (!$server = get_record("math_assignment_servers", "id", $subject->server)) {
error("The server belonging to his subject is not set up correctly");
}
Index: view.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** view.php 11 Jan 2004 13:21:22 -0000 1.25
--- view.php 11 Jan 2004 14:08:06 -0000 1.26
***************
*** 326,331 ****
if ($isteacher) {
$zonelink = "";
! if ($subject = get_record("math_assignment_subject", "course", $course->id)) {
! if ($server = get_record("math_assignment_server", "id", $subject->server))
$zonelink = $server->password;
}
--- 326,331 ----
if ($isteacher) {
$zonelink = "";
! if ($subject = get_record("math_assignment_subjects", "course", $course->id)) {
! if ($server = get_record("math_assignment_servers", "id", $subject->server))
$zonelink = $server->password;
}
|
