general cleanup of xxx_parameter() functions + fixed logic of edit button - now inter...

diff --git a/course/index.php b/course/index.php
index 424bddbab86e280a8b9cff68a0de0235215b12a8..40cb9f1dcbc89383e4884c013a289f826c7ce14d 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -5,15 +5,15 @@
     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 );
+    $edit     = optional_param('edit', -1,PARAM_BOOL);
+    $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_ALPHANUM);
+    $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!");
@@ -24,17 +24,14 @@
     }
 
     if (isadmin()) {
-        if (!empty($edit) and confirm_sesskey()) {
-            if ($edit == "on") {
-                $USER->categoriesediting = true;
-            } else if ($edit == "off") {
-                $USER->categoriesediting = false;
-            }
+        if ($edit !== -1) {
+            $USER->categoryediting = $edit;
         }
+        $adminediting = !empty($USER->categoryediting);
+    } else {
+        $adminediting = false;
     }
 
-    $adminediting = (isadmin() and !empty($USER->categoriesediting));
-
 
 /// Unless it's an editing admin, just print the regular listing of courses/categories