|
From: <ma...@us...> - 2003-09-22 21:04:06
|
Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv28723/mod/math_assignment
Modified Files:
aimpage.php lib.php pdfgen.php servers.php version.php
Log Message:
Removed 'student password' server setting and updated to gaining access with the subject password.
Index: aimpage.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aimpage.php 20 Sep 2003 19:13:43 -0000 1.10
--- aimpage.php 22 Sep 2003 21:03:54 -0000 1.11
***************
*** 98,105 ****
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
$postdata = math_assignment_add_arg_to_url_data($postdata, "StudentID", $USER->username);
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $server->student_passwd);
$postdata = math_assignment_add_arg_to_url_data($postdata, "FocusLabel", "1");
$postdata = math_assignment_add_arg_to_url_data($postdata, "OldFocusLabel", "");
! $focus = ($math_assignment) ? "true" : "false";
$postdata = math_assignment_add_arg_to_url_data($postdata, "Focused", $focus);
}
--- 98,105 ----
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
$postdata = math_assignment_add_arg_to_url_data($postdata, "StudentID", $USER->username);
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
$postdata = math_assignment_add_arg_to_url_data($postdata, "FocusLabel", "1");
$postdata = math_assignment_add_arg_to_url_data($postdata, "OldFocusLabel", "");
! $focus = ($math_assignment->focus) ? "true" : "false";
$postdata = math_assignment_add_arg_to_url_data($postdata, "Focused", $focus);
}
Index: lib.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** lib.php 20 Sep 2003 14:49:06 -0000 1.15
--- lib.php 22 Sep 2003 21:03:55 -0000 1.16
***************
*** 199,225 ****
echo "<option>";
}
! echo htmlspecialchars("$aim_server->name ($aim_server->address, $aim_server->student_passwd)") . "</option>\n";
! }
!
! return true;
! }
!
! function math_assignment_list_subjects($id) {
! /// Function which outputs <option> tags for each subject in the database
!
! global $db, $CFG;
!
! $rs = $db->Execute("SELECT name,password FROM {$CFG->prefix}math_assignment_subject WHERE server='$id'");
! if (empty($rs)) {
! return false;
! }
! if (!$rs = $rs->GetAssoc(false)) {
! return false;
}
- // write out an <option> tag for each subject
- foreach ($rs as $subject => $password) {
- echo "<option>" . htmlspecialchars("$subject ($password)") . "</option>\n";
- }
return true;
}
--- 199,205 ----
echo "<option>";
}
! echo htmlspecialchars("$aim_server->name ($aim_server->address)") . "</option>\n";
}
return true;
}
***************
*** 537,541 ****
$postdata = math_assignment_add_arg_to_url_data($postdata, "NewStudentSurname", $USER->lastname);
$postdata = math_assignment_add_arg_to_url_data($postdata, "NewStudentEmailAddress", $USER->email);
! $postdata = math_assignment_add_arg_to_url_data($postdata, "NewStudentPassword", $server->student_passwd);
$postdata = math_assignment_add_arg_to_url_data($postdata, "SubjectName", $subject->name);
$postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
--- 517,521 ----
$postdata = math_assignment_add_arg_to_url_data($postdata, "NewStudentSurname", $USER->lastname);
$postdata = math_assignment_add_arg_to_url_data($postdata, "NewStudentEmailAddress", $USER->email);
! $postdata = math_assignment_add_arg_to_url_data($postdata, "NewStudentPassword", generate_password(10));
$postdata = math_assignment_add_arg_to_url_data($postdata, "SubjectName", $subject->name);
$postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->password);
Index: pdfgen.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/pdfgen.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pdfgen.php 18 Sep 2003 23:57:57 -0000 1.5
--- pdfgen.php 22 Sep 2003 21:03:55 -0000 1.6
***************
*** 75,81 ****
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
$postdata = math_assignment_add_arg_to_url_data($postdata, "StudentID", $USER->username);
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $server->student_passwd);
}
! else
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","try/Quiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "TryQuiz");
--- 75,81 ----
$postdata = math_assignment_add_arg_to_url_data($postdata, "QuizName", $math_assignment->aimquiz);
$postdata = math_assignment_add_arg_to_url_data($postdata, "StudentID", $USER->username);
! $postdata = math_assignment_add_arg_to_url_data($postdata, "Password", $subject->passwd);
}
! else {
$postdata = math_assignment_add_arg_to_url_data($postdata, "Command","try/Quiz");
$postdata = math_assignment_add_arg_to_url_data($postdata, "Action", "TryQuiz");
***************
*** 83,86 ****
--- 83,87 ----
$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);
+ }
// load the AiM page and grab the result
Index: servers.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/servers.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** servers.php 18 Sep 2003 23:57:57 -0000 1.2
--- servers.php 22 Sep 2003 21:03:55 -0000 1.3
***************
*** 9,13 ****
optional_variable($name); // server name
optional_variable($address); // server address
- optional_variable($student_passwd); // student AiM password
optional_variable($delete); // delete button
--- 9,12 ----
***************
*** 53,57 ****
error(get_string("invalid", "math_assignment"), "servers.php");
}
! if (!math_assignment_check_name($name) || !math_assignment_check_name($address) || !math_assignment_check_name($student_passwd)) {
error(get_string("invalid", "math_assignment"), "servers.php");
}
--- 52,56 ----
error(get_string("invalid", "math_assignment"), "servers.php");
}
! if (!math_assignment_check_name($name) || !math_assignment_check_name($address)) {
error(get_string("invalid", "math_assignment"), "servers.php");
}
***************
*** 62,66 ****
$newserver->name = $name;
$newserver->address = $address;
- $newserver->student_passwd = $student_passwd;
if (!insert_record("math_assignment_server", $newserver)) {
error(get_string("failed", "math_assignment"), "servers.php");
--- 61,64 ----
***************
*** 74,78 ****
$server->name = $name;
$server->address = $address;
- $server->student_passwd = $student_passwd;
if (!update_record("math_assignment_server", $server)) {
error(get_string("failed","math_assignment"), "servers.php");
--- 72,75 ----
***************
*** 96,100 ****
$strname = get_string("name", "math_assignment");
$straddress = get_string("address", "math_assignment");
- $strstudentpasswd = get_string("student_password","math_assignment");
?>
--- 93,96 ----
***************
*** 109,119 ****
frm.name.value = "";
frm.address.value = "";
- frm.student_passwd.value = "";
}
else {
frm.name.value = server.slice(0, server.indexOf("(") - 1);
! options = server.slice(server.indexOf("(") + 1, -1);
! frm.address.value = options.slice(0, options.indexOf(","));
! frm.student_passwd.value = options.slice(options.indexOf(",") + 2);
}
}
--- 105,112 ----
frm.name.value = "";
frm.address.value = "";
}
else {
frm.name.value = server.slice(0, server.indexOf("(") - 1);
! frm.address.value = server.slice(server.indexOf("(") + 1, server.indexOf(")"));
}
}
***************
*** 152,162 ****
<td>
<input type="text" name="address" size="40" maxlength="255" /> <?php helpbutton ("server_address", $straddress, "math_assignment"); ?>
- </td>
- </tr>
-
- <tr valign="top">
- <td align="right"><p><b><?php echo $strstudentpasswd; ?>:</b></p></td>
- <td>
- <input type="text" name="student_passwd" size="40" maxlength="255" /> <?php helpbutton ("server_passwd", $strstudentpasswd, "math_assignment"); ?>
</td>
</tr>
--- 145,148 ----
Index: version.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/version.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** version.php 20 Sep 2003 19:13:43 -0000 1.5
--- version.php 22 Sep 2003 21:03:55 -0000 1.6
***************
*** 6,10 ****
/////////////////////////////////////////////////////////////////////////////////
! $module->version = 2003092001; // The (date) version of this module
$module->cron = 0; // How often should cron check this module (seconds)?
--- 6,10 ----
/////////////////////////////////////////////////////////////////////////////////
! $module->version = 2003092222; // The (date) version of this module
$module->cron = 0; // How often should cron check this module (seconds)?
|
