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

Interface fix in groups_add_member, remove_member - basicgrouplib.php, dbXX.php, test_XX.php (Bug MDL-7380 "groups".)

Browse Source
This commit is contained in:
nfreear
2006-11-07 17:15:27 +00:00
parent 17801172e9
commit 9459e87ff1
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
group/db/dbbasicgrouplib.php
+3 -3
View File
@@ -276,7 +276,7 @@ function groups_db_create_group($courseid, $groupsettings = false) {
* @param int $userid The user id
* @return boolean True if user added successfully, false otherwise.
*/
function groups_db_add_member($userid, $groupid) {
function groups_db_add_member($groupid, $userid) {
// Check that the user and group are valid
if (!$userid or !$groupid or !groups_db_group_exists($groupid)) {
$useradded = false;
@@ -328,11 +328,11 @@ function groups_db_set_group_settings($groupid, $groupsettings) {
/**
* Deletes the specified user from the specified group
* @param int $userid The user to delete
* @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_db_remove_member($userid, $groupid) {
function groups_db_remove_member($groupid, $userid) {
if (!$userid or !$groupid) {
$success = false;
} else {
group/lib/basicgrouplib.php
+7 -7
View File
@@ -1,4 +1,4 @@
<?PHP
<?php
/**
* Library of basic group functions.
*
@@ -260,13 +260,13 @@ function groups_set_group_settings($groupid, $groupsettings) {
/**
* Adds a specified user to a group
* @param int $groupid The group id
* @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.
* See comment above on web service autoupdating.
*/
function groups_add_member($userid, $groupid) {
function groups_add_member($groupid, $userid) {
$useradded = false;
$alreadymember = groups_is_member($groupid, $userid);
@@ -275,7 +275,7 @@ function groups_add_member($userid, $groupid) {
} elseif ($alreadymember) {
$useradded = true;
} else {
$useradded = groups_db_add_member($userid, $groupid);
$useradded = groups_db_add_member($groupid, $userid);
}
return $useradded;
@@ -302,13 +302,13 @@ function groups_delete_group($groupid) {
/**
* Deletes the specified user from the specified group
* @param int $userid The user to delete
* @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
* See comment above on web service autoupdating.
*/
function groups_remove_member($userid, $groupid) {
return groups_db_remove_member($userid, $groupid);
function groups_remove_member($groupid, $userid) {
return groups_db_remove_member($groupid, $userid);
}
?>
group/simpletest/test_basicgrouplib.php
+3 -2
View File
@@ -56,7 +56,8 @@ class basicgrouplib_test extends UnitTestCase {
}
function test_add_member() {
$this->assertTrue(groups_add_member($this->userid, $this->groupid));
// NOTE, interface change on add_member, remove_member.
$this->assertTrue(groups_add_member($this->groupid, $this->userid));
$this->assertTrue(groups_is_member($this->groupid, $this->userid));
$this->assertTrue($userids = groups_get_members($this->groupid));
//...
@@ -66,7 +67,7 @@ class basicgrouplib_test extends UnitTestCase {
}
function test_remove_member() {
$this->assertTrue(groups_remove_member($this->userid, $this->groupid));
$this->assertTrue(groups_remove_member($this->groupid, $this->userid));
$this->assertFalse(groups_is_member($this->groupid, $this->userid));
}