L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

general cleanup of xxx_parameter() functions; fixed broken requesting of courses

Browse Source
This commit is contained in:
skodak
2006-04-12 16:41:10 +00:00
parent f27d105cc6
commit a8ff614fb8
6 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/index.php
+1 -1
View File
@@ -60,7 +60,7 @@
print_single_button("edit.php", NULL, get_string("addnewcourse"), "get");
}
if (!empty($CFG->enablecourserequests)) {
print_single_button('request.php',NULL, get_string('requestcourse'),"get");
print_single_button('pending.php',NULL, get_string('coursespending'),"get");
}
echo "</center>";
print_footer();
course/pending-reject.html
+1
View File
@@ -3,4 +3,5 @@
<textarea name="rejectnotice" rows="10" cols="50"></textarea><br />
<input type="submit" value="<?php print_string("savechanges");?>" />
<input type="button" value="<?php print_string("cancel"); ?>" onClick="window.location='pending.php';" />
<input type="hidden" name="sesskey" value="<?php echo sesskey();?>" />
</form>
course/pending.php
+5 -4
View File
@@ -120,12 +120,13 @@
$course->shortname .= ' [*]';
$collision = 1;
}
//do not output raw html from request, quote html entities using s()!!
$table->data[] = array(((!empty($course->password)) ?
'<img hspace="1" alt="'.$strrequireskey.'" height="16" width="16" border="0" src="'.$CFG->pixpath.'/i/key.gif" />' : ''),
$course->shortname,$course->fullname,fullname($requester),
$course->summary,$course->reason,
'<a href="pending.php?approve='.$course->id.'">'.get_string('approve').'</a> | '
.'<a href="pending.php?reject='.$course->id.'">'.get_string('reject').'</a>');
s($course->shortname),s($course->fullname),fullname($requester),
s($course->summary),s($course->reason),
'<a href="pending.php?approve='.$course->id.'&amp;sesskey='.sesskey().'">'.get_string('approve').'</a> | '
.'<a href="pending.php?reject='.$course->id.'&amp;sesskey='.sesskey().'">'.get_string('reject').'</a>');
}
print_table($table);
if (!empty($collision)) {
course/recent.php
+12 -22
View File
@@ -5,17 +5,16 @@
require_once("../config.php");
require_once("lib.php");
$id = required_param('id',PARAM_INT);
$user = optional_param('user', '0', PARAM_INT);
$sortby = optional_param('sortby', 'default');
$selectedgroup = optional_param('selectedgroup', '');
$date = optional_param('date','',PARAM_CLEAN);
$advancedfilter = optional_param('advancedfilter',0,PARAM_INT);
$modname = optional_param('modname','' );
$modid = optional_param('modid','' );
$modaction = optional_param('modaction','' );
$chooserecent = optional_param('chooserecent',0,PARAM_INT);
$id = required_param('id', PARAM_INT);
$user = optional_param('user', '0', PARAM_INT);
$sortby = optional_param('sortby', 'default', PARAM_ALPHA);
$selectedgroup = optional_param('selectedgroup', 0, PARAM_INT);
$date = optional_param('date', '', PARAM_INT);
$advancedfilter = optional_param('advancedfilter', 0, PARAM_INT);
$modname = optional_param('modname', '', PARAM_ALPHA); // not used??
$modid = optional_param('modid', 'activity/All', PARAM_FILE); // not a file, but looks like it anyway
$modaction = optional_param('modaction', '', PARAM_ALPHA); // not used??
$chooserecent = optional_param('chooserecent', 0, PARAM_INT);
if (! $course = get_record("course", "id", $id) ) {
error("That's an invalid course id");
@@ -82,9 +81,6 @@
}
if (!isset($modid)) {
$modid="activity/All";
}
$tmpmodid = $modid;
switch ($tmpmodid) {
@@ -180,15 +176,9 @@
$groupmode = groupmode($course, $coursemod);
switch ($groupmode) {
case SEPARATEGROUPS : $groupid = mygroupid($course->id); break;
case VISIBLEGROUPS :
if ($selectedgroup == "allgroups") {
$groupid = "";
} else {
$groupid = $selectedgroup;
}
break;
case VISIBLEGROUPS : $groupid = $selectedgroup; break;
case NOGROUPS :
default : $groupid = "";
default : $groupid = 0;
}
$libfile = "$CFG->dirroot/mod/$coursemod->name/lib.php";
course/request.html
+1 -1
View File
@@ -65,5 +65,5 @@ if (empty($form->password)) {
<td><input type="submit" value="<?php print_string("savechanges") ?>" /></td>
</tr>
</table>
<input type="hidden" name="sesskey" value="<?php echo $form->sesskey ?>" />
<input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
</form>
course/request.php
+19 -9
View File
@@ -1,11 +1,15 @@
<?php
<?php // $Id$
/// this allows a student to request a course be created for them.
require_once(dirname(dirname(__FILE__)).'/config.php');
require_once('../config.php');
require_login();
if (isguest()) {
error("No guests here!");
}
if (empty($CFG->enablecourserequests)) {
error(get_string('courserequestdisabled'));
}
@@ -14,8 +18,7 @@
print_header($strtitle,$strtitle,$strtitle);
$form = data_submitted();
if (!empty($form) && confirm_sesskey()) {
if (($form = data_submitted()) and confirm_sesskey()) {
validate_form($form,$err) ;
if (empty($err)) {
@@ -32,8 +35,6 @@
}
}
$form->sesskey = !empty($USER->id) ? $USER->sesskey : '';
// print_simple_box(get_string('courserequestintro'),'center');
print_simple_box_start("center");
print_string('courserequestintro');
@@ -68,10 +69,19 @@ function validate_form(&$form,&$err) {
$err["reason"] = get_string("missingreqreason");
}
$foundcourses = get_records("course", "shortname", $form->shortname);
$foundreqcourses = get_records("course_request", "shortname", $form->shortname);
$foundcourses = null;
$foundreqcourses = null;
if (!empty($form->shortname)) {
$foundcourses = get_records("course", "shortname", $form->shortname);
$foundreqcourses = get_records("course_request", "shortname", $form->shortname);
}
if (!empty($foundreqcourses)) {
$foundcourses = array_merge($foundcourses,$foundreqcourses);
if (!empty($foundcourses)) {
$foundcourses = array_merge($foundcourses,$foundreqcourses);
} else {
$foundcourses = $foundreqcourses;
}
}
if (!empty($foundcourses)) {