';
if ($id) {
diff --git a/group/grouping.php b/group/grouping.php
index eb55a24455a..dc5ad1b4823 100644
--- a/group/grouping.php
+++ b/group/grouping.php
@@ -99,7 +99,6 @@ if ($editform->is_cancelled()) {
}
-$strgroups = get_string('groups');
$strgroupings = get_string('groupings', 'group');
$strparticipants = get_string('participants');
@@ -109,12 +108,15 @@ if ($id) {
$strheading = get_string('creategrouping', 'group');
}
-print_header("$course->shortname: ". $strheading,
- $course->fullname,
- "
wwwroot/course/view.php?id=$courseid\">$course->shortname ".
- "->
wwwroot/user/index.php?id=$courseid\">$strparticipants ".
- "->
$strgroupings".
- "-> $strheading", '', '', true, '', user_login_string($course, $USER));
+$navlinks = array(array('name'=>$strparticipants, 'link'=>$CFG->wwwroot.'/user/index.php?id='.$courseid, 'type'=>'misc'),
+ array('name'=>$strgroupings, 'link'=>$CFG->wwwroot.'/group/groupings.php?id='.$courseid, 'type'=>'misc'),
+ array('name'=>$strheading, 'link'=>'', 'type'=>'misc'));
+$navigation = build_navigation($navlinks);
+
+/// Print header
+print_header_simple($strgroupings, ': '.$strgroupings, $navigation, '', '', true, '', navmenu($course));
+
+
print_heading($strheading);
$editform->display();
print_footer($course);
diff --git a/group/groupings.php b/group/groupings.php
index 7844e7c923b..0abbc8ef52e 100644
--- a/group/groupings.php
+++ b/group/groupings.php
@@ -24,16 +24,19 @@ $strgroups = get_string('groups');
$strgroupings = get_string('groupings', 'group');
$struses = get_string('activities');
$strparticipants = get_string('participants');
-$strmanagegrping = get_String('addgroupstogrouping', 'group');
+$strmanagegrping = get_String('showgroupsingrouping', 'group');
$navlinks = array(array('name'=>$strparticipants, 'link'=>$CFG->wwwroot.'/user/index.php?id='.$courseid, 'type'=>'misc'),
- array('name'=>$strgroups, 'link'=>$CFG->wwwroot.'/group/index.php?id='.$courseid, 'type'=>'misc'),
array('name'=>$strgroupings, 'link'=>'', 'type'=>'misc'));
$navigation = build_navigation($navlinks);
/// Print header
print_header_simple($strgroupings, ': '.$strgroupings, $navigation, '', '', true, '', navmenu($course));
+// Add tabs
+$currenttab = 'groupings';
+require('tabs.php');
+
print_heading($strgroupings);
$data = array();
@@ -58,7 +61,7 @@ if ($groupings = get_records('groupings', 'courseid', $course->id)) {
$buttons .= "
id&delete=1\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> ";
$buttons .= "
id\">pixpath/i/group.gif\" class=\"iconsmall\" alt=\"$strmanagegrping\" /> ";
+ " src=\"$CFG->pixpath/i/group.gif\" class=\"icon\" alt=\"$strmanagegrping\" /> ";
$line[3] = $buttons;
$data[] = $line;
diff --git a/group/index.php b/group/index.php
index a12281f1e5c..bee224799fd 100644
--- a/group/index.php
+++ b/group/index.php
@@ -33,188 +33,195 @@ if (!$course = get_record('course', 'id',$courseid)) {
print_error('invalidcourse'); //'The course ID is invalid'
}
- // Make sure that the user has permissions to manage groups.
- require_login($course);
+// Make sure that the user has permissions to manage groups.
+require_login($course);
- $context = get_context_instance(CONTEXT_COURSE, $courseid);
- if (! has_capability('moodle/course:managegroups', $context)) {
- redirect(); //"group.php?id=$course->id"); // Not allowed to see all groups
- }
+$context = get_context_instance(CONTEXT_COURSE, $courseid);
+if (! has_capability('moodle/course:managegroups', $context)) {
+ redirect(); //"group.php?id=$course->id"); // Not allowed to see all groups
+}
- switch ($action) {
- case false: //OK, display form.
- break;
+switch ($action) {
+ case false: //OK, display form.
+ break;
- case 'ajax_getmembersingroup':
- $members = array();
- if ($members = groups_get_members($groupid)) {
- $member_names = array();
- foreach($members as $member) {
- $user = new object();
- $user->id = $member->id;
- $user->name = fullname($member, true);
- $member_names[] = $user;
- }
- $json = new Services_JSON();
- echo $json->encode($member_names);
- }
- die; // Client side JavaScript takes it from here.
-
- case 'deletegroup':
- redirect('group.php?delete=1&courseid='.$courseid.'&id='.$groupid);
- break;
-
- case 'showcreateorphangroupform':
- redirect('group.php?courseid='.$courseid);
- break;
-
- case 'showgroupsettingsform':
- redirect('group.php?courseid='.$courseid.'&id='.$groupid);
- break;
-
- case 'updategroups': //Currently reloading.
- break;
-
- case 'removemembers':
- break;
-
- case 'showaddmembersform':
- redirect('members.php?group='.$groupid);
- break;
-
- case 'updatemembers': //Currently reloading.
- break;
-
- default: //ERROR.
- if (debugging()) {
- error('Error, unknown button/action. Probably a user-interface bug!', $returnurl);
- break;
- }
- }
-
- // Print the page and form
- $strgroups = get_string('groups');
- $strparticipants = get_string('participants');
-
- print_header("$course->shortname: $strgroups",
- $course->fullname,
- "
wwwroot/course/view.php?id=$courseid\">$course->shortname ".
- "->
wwwroot/user/index.php?id=$courseid\">$strparticipants ".
- "-> $strgroups", '', '', true, '', user_login_string($course, $USER));
-
- $disabled = 'disabled="disabled"';
-
- $showeditgroupsettingsform_disabled = $disabled;
- $deletegroup_disabled = $disabled;
- $showcreategroupform_disabled = $disabled;
-
- if (!empty($groupid)) {
- $showaddmembersform_disabled = '';
- $showeditgroupsettingsform_disabled = '';
- $deletegroup_disabled = '';
- } else {
- $deletegroup_disabled = $disabled;
- $showeditgroupsettingsform_disabled = $disabled;
- $showaddmembersform_disabled = $disabled;
- }
-
- print_heading(format_string($course->shortname) .' '.$strgroups, 'center', 3);
- echo '
'."\n";
- print_footer($course);
+echo ''."\n";
+
+print_footer($course);
/**
* Returns the first button action with the given prefix, taken from
diff --git a/group/lib.php b/group/lib.php
index eb0234472d6..c0d571aa8ec 100644
--- a/group/lib.php
+++ b/group/lib.php
@@ -13,6 +13,67 @@
* require_once $CFG->dirroot.'/group/lib.php' must be used
*/
+/**
+ * Adds a specified user to a group
+ * @param int $userid The user id
+ * @param int $groupid The group id
+ * @return boolean True if user added successfully or the user is already a
+ * member of the group, false otherwise.
+ */
+function groups_add_member($groupid, $userid) {
+ if (!groups_group_exists($groupid)) {
+ return false;
+ }
+
+ if (groups_is_member($groupid, $userid)) {
+ return true;
+ }
+
+ $member = new object();
+ $member->groupid = $groupid;
+ $member->userid = $userid;
+ $member->timeadded = time();
+
+ if (!insert_record('groups_members', $member)) {
+ return false;
+ }
+
+ //update group info
+ set_field('groups', 'timemodified', $member->timeadded, 'id', $groupid);
+
+ // MDL-9983
+ $eventdata = new object();
+ $eventdata->groupid = $groupid;
+ $eventdata->userid = $userid;
+ events_trigger('group_user_added', $eventdata);
+
+ return true;
+}
+
+/**
+ * Deletes the link between the specified user and group.
+ * @param int $groupid The group to delete the user from
+ * @param int $userid The user to delete
+ * @return boolean True if deletion was successful, false otherwise
+ */
+function groups_remove_member($groupid, $userid) {
+ if (!groups_group_exists($groupid)) {
+ return false;
+ }
+
+ if (!groups_is_member($groupid, $userid)) {
+ return true;
+ }
+
+ if (!delete_records('groups_members', 'groupid', $groupid, 'userid', $userid)) {
+ return false;
+ }
+ //update group info
+ set_field('groups', 'timemodified', time(), 'id', $groupid);
+
+ return true;
+}
+
/**
* Add a new group
* @param object $data group properties (with magic quotes);
diff --git a/group/tabs.php b/group/tabs.php
new file mode 100644
index 00000000000..59531849c0c
--- /dev/null
+++ b/group/tabs.php
@@ -0,0 +1,15 @@
+wwwroot.'/group/index.php?id='.$courseid,
+ get_string('groups'));
+
+ $row[] = new tabobject('groupings',
+ $CFG->wwwroot.'/group/groupings.php?id='.$courseid,
+ get_string('groupings', 'group'));
+
+ $tabs[] = $row;
+ echo '
';
+ print_tabs($tabs, $currenttab);
+ echo '
';
+?>
diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index db85bb2338d..47b71cc41be 100644
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -87,6 +87,7 @@ $string['configeditordictionary'] = 'This value will be used if aspell doesn\'t
$string['configenableajax'] = 'This setting allows you to control the use of AJAX (advanced client/server interfaces using Javascript) across the whole site. With this setting enabled users can still make a choice in their profile, otherwise AJAX is disabled for everybody.';
$string['configenablecourserequests'] = 'This will allow any user to request a course be created.';
$string['configenableglobalsearch'] = 'This setting enables global text searching in resources and activities, it is not compatible with PHP 4.';
+$string['configenablegroupings'] = 'This setting enables groupings of groups. (Not yet fully implemented)';
$string['configenablehtmlpurifier'] = 'Use HTML Purifier instead of KSES for cleaning of untrusted text. HTML Purifier is actively developed and is believed to be more secure, but it is more resource intensive. Expect minor visual differences in the resulting html code. Please note that embed and object tags can not be enabled, MathML tags and old lang tags are not supported. ';
$string['configenablerssfeeds'] = 'This switch will enable RSS feeds from across the site. To actually see any change you will need to enable RSS feeds in the individual modules too - go to the Modules settings under Admin Configuration.';
$string['configenablerssfeedsdisabled'] = 'It is not available because RSS feeds are disabled in all the Site. To enable them, go to the Variables settings under Admin Configuration.';
@@ -277,6 +278,7 @@ $string['editstrings'] = 'Edit words or phrases';
$string['enableajax'] = 'Enable AJAX';
$string['enablecourserequests'] = 'Enable course requests';
$string['enableglobalsearch'] = 'Enable global search';
+$string['enablegroupings'] = 'Enable groupings';
$string['enablehtmlpurifier'] = 'Enable HTML Purifier';
$string['enablerecordcache'] = 'Enable Record Cache';
$string['enablerssfeeds'] = 'Enable RSS feeds';
diff --git a/lang/en_utf8/group.php b/lang/en_utf8/group.php
index 6396f4eae52..1d41b387b8a 100644
--- a/lang/en_utf8/group.php
+++ b/lang/en_utf8/group.php
@@ -1,6 +1,6 @@
dirroot.'/group/lib.php');
+
return groups_add_member($groupid, $userid);
}
diff --git a/lib/grouplib.php b/lib/grouplib.php
index dc6fdc6f9e3..8c7de05963c 100644
--- a/lib/grouplib.php
+++ b/lib/grouplib.php
@@ -1,68 +1,6 @@
groupid = $groupid;
- $member->userid = $userid;
- $member->timeadded = time();
-
- if (!insert_record('groups_members', $member)) {
- return false;
- }
-
- //update group info
- set_field('groups', 'timemodified', $member->timeadded, 'id', $groupid);
-
- // MDL-9983
- $eventdata = new object();
- $eventdata -> groupid = $groupid;
- $eventdata -> userid = $userid;
- events_trigger('group_user_added', $eventdata);
-
- return true;
-}
-
-/**
- * Deletes the link between the specified user and group.
- * @param int $groupid The group to delete the user from
- * @param int $userid The user to delete
- * @return boolean True if deletion was successful, false otherwise
- */
-function groups_remove_member($groupid, $userid) {
- if (!groups_group_exists($groupid)) {
- return false;
- }
-
- if (!groups_is_member($groupid, $userid)) {
- return true;
- }
-
- if (!delete_records('groups_members', 'groupid', $groupid, 'userid', $userid)) {
- return false;
- }
- //update group info
- set_field('groups', 'timemodified', time(), 'id', $groupid);
-
- return true;
-}
-
-
/**
* Determines if a group with a given groupid exists.
* @param int $groupid The groupid to check for