Follow-up fixes for MDL-8531 "Groups icons..." -PARAM_ALPHANUM bug.

diff --git a/group/group.php b/group/group.php
index 6e028b7eddeda51af57c4023314c43beae1abc89..060f70a031886d54afb29ffc4e1a067e341b09dc 100644 (file)
--- a/group/group.php
+++ b/group/group.php
@@ -21,9 +21,9 @@ $groupingid = optional_param('grouping', false, PARAM_INT);
 $newgrouping= optional_param('newgrouping', false, PARAM_INT);
 $groupid    = optional_param('group', false, PARAM_INT);
 
-$groupsettings->name       = optional_param('name', false, PARAM_ALPHANUM);
-$groupsettings->description= optional_param('description', '', PARAM_ALPHANUM);
-$groupsettings->enrolmentkey= optional_param('enrolmentkey', '', PARAM_ALPHANUM);
+$groupsettings->name       = optional_param('name', false, PARAM_TEXT);
+$groupsettings->description= optional_param('description', '', PARAM_TEXT);
+$groupsettings->enrolmentkey= optional_param('enrolmentkey', '', PARAM_TEXT);
 $groupsettings->hidepicture= optional_param('hidepicture', true, PARAM_BOOL);
 
 $delete = optional_param('delete', false, PARAM_BOOL);

diff --git a/group/grouping.php b/group/grouping.php
index 0ea021bb8147d73e60818251a078393121f68e63..d6af0eadd07ac101f93f58cbb78cc81a00587c21 100644 (file)
--- a/group/grouping.php
+++ b/group/grouping.php
@@ -17,8 +17,8 @@ $success = true;
 $courseid   = required_param('courseid', PARAM_INT);         
 $groupingid = optional_param('grouping', false, PARAM_INT);
 
-$groupingsettings->name       = optional_param('name', PARAM_ALPHANUM);
-$groupingsettings->description= optional_param('description', PARAM_ALPHANUM);
+$groupingsettings->name       = optional_param('name', false, PARAM_TEXT);
+$groupingsettings->description= optional_param('description', '', PARAM_TEXT);
 
 $delete = optional_param('delete', false, PARAM_BOOL);
 
@@ -64,7 +64,7 @@ if ($success) {
             if ($groupingid) {
                 $success = (bool)groups_set_grouping_settings($groupingid, $groupingsettings);
             }
-            else {
+            else { //OK, new group.
                 $success = (bool)$groupingid = groups_create_grouping($courseid, $groupingsettings);
             }
             if ($success) {
@@ -135,7 +135,12 @@ if ($success) {
 ?>
 
 <div class="f-item">
-<p><label for="groupingname"><?php print_string('groupingname', 'group'); ?>&nbsp;</label></p>
+<p><label for="groupingname"><?php
+   print_string('groupingname', 'group'); 
+   if (isset($err['name'])) {
+       echo' ';
+       formerr($err['name']);
+   } ?>&nbsp; </label></p>
 <p><input id="groupingname" name="name" type="text" size="40" value="<?php echo $strname; ?>" /></p>
 </div>