mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 19:50:14 +01:00
Code Issues Projects Releases Wiki Activity

Replaced require_variable(), optional_variable() with approproate

Browse Source 
required_param(), optional_param() etc.
This commit is contained in:
thepurpleblob 2005-06-14 09:21:09 +00:00
parent b737ab2b02
commit 7168423c82
4 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
course/category.php
View File

@ -6,9 +6,17 @@
require_once("../config.php");
require_once("lib.php");
require_variable($id); // Category id
optional_variable($page, "0"); // which page to show
optional_variable($perpage, "20"); // how many per page
$id = required_param('id',PARAM_INT); // Category id
$page = optional_param('page', 0, PARAM_INT); // which page to show
$perpage = optional_param('perpage', 20, PARAM_INT); // how many per page
$edit = optional_param('edit','',PARAM_ALPHA);
$hide = optional_param('hide',0,PARAM_INT);
$show = optional_param('show',0,PARAM_INT);
$moveup = optional_param('moveup',0,PARAM_INT);
$movedown = optional_param('movedown',0,PARAM_INT);
$moveto = optional_param('moveto',0,PARAM_INT);
$rename = optional_param('rename','');
$resort = optional_param('resort','');
if (!$site = get_site()) {
error("Site isn't defined!");
@ -23,7 +31,7 @@
}
if (iscreator()) {
if (isset($_GET['edit']) and confirm_sesskey()) {
if (!empty($edit) and confirm_sesskey()) {
if ($edit == "on") {
$USER->categoryediting = true;
} else if ($edit == "off") {
@ -47,8 +55,8 @@
if (isadmin()) {
/// Rename the category if requested
if (!empty($_POST['rename']) and confirm_sesskey()) {
$category->name = $_POST['rename'];
if (!empty($rename) and confirm_sesskey()) {
$category->name = $rename;
if (! set_field("course_categories", "name", $category->name, "id", $category->id)) {
notify("An error occurred while renaming the category");
}
@ -56,7 +64,7 @@
/// Resort the category if requested
if (!empty($_GET['resort']) and confirm_sesskey()) {
if (!empty($resort) and confirm_sesskey()) {
if ($courses = get_courses($category->id, "fullname ASC", 'c.id,c.fullname,c.sortorder')) {
// move it off the range
$count = get_record_sql('SELECT MAX(sortorder) AS max, 1
@ -118,7 +126,7 @@
/// Move a specified course to a new category
if (isset($moveto) and $data = data_submitted() and confirm_sesskey()) { // Some courses are being moved
if (!empty($moveto) and $data = data_submitted() and confirm_sesskey()) { // Some courses are being moved
if (! $destcategory = get_record("course_categories", "id", $data->moveto)) {
error("Error finding the category");
@ -157,8 +165,8 @@
/// Hide or show a course
if ((isset($hide) or isset($show)) and confirm_sesskey()) {
if (isset($hide)) {
if ((!empty($hide) or !empty($show)) and confirm_sesskey()) {
if (!empty($hide)) {
$course = get_record("course", "id", $hide);
$visible = 0;
} else {
@ -175,7 +183,7 @@
/// Move a course up or down
if ((isset($moveup) or isset($movedown)) and confirm_sesskey()) {
if ((!empty($moveup) or !empty($movedown)) and confirm_sesskey()) {
$movecourse = NULL;
$swapcourse = NULL;
@ -189,7 +197,7 @@
FROM ' . $CFG->prefix . 'course WHERE category=' . $category->id);
$max = $max->max + 100;
if (isset($moveup)) {
if (!empty($moveup)) {
$movecourse = get_record('course', 'id', $moveup);
$swapcourse = get_record('course',
'category', $category->id,

4
course/delete.php
View File

@ -3,8 +3,8 @@
require_once("../config.php");
require_variable($id); // course id
optional_variable($delete); // delete confirmation
$id = required_param('id',PARAM_INT); // course id
$delete = optional_param('delete'); // delete confirmation
require_login();

4
course/edit.php
View File

@ -5,8 +5,8 @@
require_once("lib.php");
require_once("$CFG->libdir/blocklib.php");
$id = (int)optional_param('id', 0); // course id
$category = (int)optional_param('category', 0); // possible default category
$id = optional_param('id', 0, PARAM_INT); // course id
$category = optional_param('category', 0, PARAM_INT); // possible default category
require_login();

26
course/index.php
View File

@ -5,6 +5,16 @@
require_once("../config.php");
require_once("lib.php");
$edit = optional_param( 'edit','',PARAM_ALPHA );
$delete = optional_param( 'delete',0,PARAM_INT );
$hide = optional_param( 'hide',0,PARAM_INT );
$show = optional_param( 'show',0,PARAM_INT );
$sure = optional_param( 'sure','',PARAM_CLEAN );
$move = optional_param( 'move',0,PARAM_INT );
$moveto = optional_param( 'moveto',-1,PARAM_INT );
$moveup = optional_param( 'moveup',0,PARAM_INT );
$movedown = optional_param( 'movedown',0,PARAM_INT );
if (!$site = get_site()) {
error("Site isn't defined!");
}
@ -14,7 +24,7 @@
}
if (isadmin()) {
if (isset($_GET['edit']) and confirm_sesskey()) {
if (!empty($edit) and confirm_sesskey()) {
if ($edit == "on") {
$USER->categoriesediting = true;
} else if ($edit == "off") {
@ -101,7 +111,7 @@
/// Delete a category if necessary
if (isset($delete) and confirm_sesskey()) {
if (!empty($delete) and confirm_sesskey()) {
if ($deletecat = get_record("course_categories", "id", $delete)) {
if (!empty($sure) && $sure == md5($deletecat->timemodified)) {
/// Send the children categories to live with their grandparent
@ -154,7 +164,7 @@
/// Move a category to a new parent if required
if (isset($move) and isset($moveto) and confirm_sesskey()) {
if (!empty($move) and ($moveto>=0) and confirm_sesskey()) {
if ($tempcat = get_record("course_categories", "id", $move)) {
if ($tempcat->parent != $moveto) {
if (! set_field("course_categories", "parent", $moveto, "id", $tempcat->id)) {
@ -166,8 +176,8 @@
/// Hide or show a category
if ((isset($hide) or isset($show)) and confirm_sesskey()) {
if (isset($hide)) {
if ((!empty($hide) or !empty($show)) and confirm_sesskey()) {
if (!empty($hide)) {
$tempcat = get_record("course_categories", "id", $hide);
$visible = 0;
} else {
@ -187,12 +197,12 @@
/// Move a category up or down
if ((isset($moveup) or isset($movedown)) and confirm_sesskey()) {
if ((!empty($moveup) or !empty($movedown)) and confirm_sesskey()) {
$swapcategory = NULL;
$movecategory = NULL;
if (isset($moveup)) {
if (!empty($moveup)) {
if ($movecategory = get_record("course_categories", "id", $moveup)) {
$categories = get_categories("$movecategory->parent");
@ -204,7 +214,7 @@
}
}
}
if (isset($movedown)) {
if (!empty($movedown)) {
if ($movecategory = get_record("course_categories", "id", $movedown)) {
$categories = get_categories("$movecategory->parent");