]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-9742 - Converting tabs to spaces in groups code
authorpoltawski <poltawski>
Tue, 8 May 2007 23:44:31 +0000 (23:44 +0000)
committerpoltawski <poltawski>
Tue, 8 May 2007 23:44:31 +0000 (23:44 +0000)
22 files changed:
group/db/dbcleanup.php
group/db/dbmodulelib.php
group/groupui/addgroupstogrouping-xml.php
group/groupui/addmembers-form.html
group/groupui/addmembers-xml.php
group/groupui/createautomaticgrouping-xml.php
group/groupui/creategroup-form.html
group/groupui/creategrouping-xml.php
group/groupui/deletegroup-xml.php
group/groupui/deletegrouping-xml.php
group/groupui/editgroupingpermissions-xml.php
group/groupui/editgroupingsettings-xml.php
group/groupui/editgroupsettings-form.html
group/groupui/form.css
group/groupui/form.html
group/groupui/getgroupingsettings-xml.php
group/groupui/getgroupsettings-xml.php
group/groupui/main-form.html
group/groupui/removegroupfromgrouping-xml.php
group/groupui/removegroupfromgrouping.js
group/groupui/removemembers-xml.php
group/groupui/removemembers.js

index 35c61b5e826312380bdbfc56cf6312fefad0b35e..e9bc08416460c4b6e00da2bcc635a938d20b6b68 100644 (file)
@@ -8,15 +8,15 @@
  * course
  */
 function groups_remove_user_from_all_groups($userid, $courseid) {
-       // @@@ TO DO 
+    // @@@ TO DO 
 }
 
 function groups_remove_all_group_members($courseid, $showfeedback) {
-       // @@@ TO DO 
+    // @@@ TO DO 
 }
 
 function groups_remove_all_groups($courseid, $removemembers, $showfeedback) {
-       // @@@ TO DO 
+    // @@@ TO DO 
 }
 
 /**
@@ -28,10 +28,10 @@ function groups_remove_all_groups($courseid, $removemembers, $showfeedback) {
  * @return boolean True if the clean up was successful, false otherwise. 
  */
 function groups_cleanup_groups($courseid) {
-       $success = true;
+    $success = true;
 
-       // Delete all the groupings 
-       $groupings = groups_get_groupings($courseid);
+    // Delete all the groupings 
+    $groupings = groups_get_groupings($courseid);
     if ($groupings != false) {
         foreach($groupings as $groupingid) {
             $groupingdeleted = groups_delete_grouping($groupingid);
@@ -44,16 +44,16 @@ function groups_cleanup_groups($courseid) {
     // Delete all the groups
     $groupids = groups_get_groups($courseid);
     if ($groupids != false) {
-           foreach($groupids as $groupid) {
-               $groupdeleted = groups_delete_group($groupid);
+        foreach($groupids as $groupid) {
+            $groupdeleted = groups_delete_group($groupid);
 
-               if (!$groupdeleted) {
-                   $success = false;
-               }
-           }
+            if (!$groupdeleted) {
+                $success = false;
+            }
+        }
     }
 
-       return $success;
+    return $success;
 }
 
 ?>
index 2a97a7eeb84a03dd0ba88b646bdd3de377389346..04bf18b24d9d416cef800f7974da3d0ec54b4c25 100644 (file)
  * @return int The grouping id (or false if it is null or an error occurred)
  */
 function groups___db_m_get_groupingid($cmid) {
-       // @@@ Check nulls are turned into false
-       $query = get_record('course_modules', 'groupingid', $userid);
-       return $query;
+    // @@@ Check nulls are turned into false
+    $query = get_record('course_modules', 'groupingid', $userid);
+    return $query;
 }
 
 /**
  * Gets the groupingid for a particular course module instance 
  */
 function groups_db_m_set_groupingid($cmid) {
-       // @@@ TO DO    
+    // @@@ TO DO
 }
 
 
@@ -43,4 +43,4 @@ function groups_db_m_set_groupingid($cmid) {
 function groups_db_m_get_group($groupid) {
 }
 
-?>
\ No newline at end of file
+?>
index df01f5bc32f0c9e4ba20eab367a7fe886d30da54..9e3850f737befcd0a78ddfe0c3e48eb5ed07a5c5 100644 (file)
@@ -19,18 +19,18 @@ $groupingid = required_param('groupingid', PARAM_INT);
 $groups     = required_param('groups', PARAM_SEQUENCE); //TODO: check.
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupids = explode(',', $groups); 
-       
-       if ($groupids != false) {
-               foreach($groupids as $groupid) {
-                       $groupadded = groups_add_group_to_grouping($groupid, $groupingid);
-                       if (!$groupadded) {
-                               echo '<error>Failed to add group $groupid to grouping</error>';
-                       }
-               
-       }
+    $groupids = explode(',', $groups); 
+
+    if ($groupids != false) {
+        foreach($groupids as $groupid) {
+            $groupadded = groups_add_group_to_grouping($groupid, $groupingid);
+            if (!$groupadded) {
+                echo '<error>Failed to add group $groupid to grouping</error>';
+            }
+        } 
+    }
 }
 
 echo '</groupsresponse>';
index 08a3215525d750df2b82656a60768ed75fcce174..54847fcf670d604772f7f69b441427111b93a7ea 100644 (file)
@@ -3,7 +3,7 @@
     <form action="">
         <p><input type="checkbox" id="showall" /><?php print_string('showusersalreadyingroup', 'group'); ?> </p>
         <p><select id="nonmembers" size="15" multiple="multiple" class="select"></select></p>
-               <p><input type="button" id="addmembers" value="<?php print_string('adduserstogroup', 'group'); ?>" /></p>
-           <p><input type="button" id="canceladdmembers" value="<?php print_string('cancel', 'group'); ?>" /></p>
+        <p><input type="button" id="addmembers" value="<?php print_string('adduserstogroup', 'group'); ?>" /></p>
+        <p><input type="button" id="canceladdmembers" value="<?php print_string('cancel', 'group'); ?>" /></p>
     </form>
 </div>
index 289503d89c42d2fd24e4e508d1562ae1eaff6150..b31478d019a52412d6b7a6db24cf2be213d8c23d 100644 (file)
@@ -15,19 +15,19 @@ $groupid  = required_param('groupid', PARAM_INT);
 $users    = required_param('users', PARAM_SEQUENCE);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $userids = explode(',', $users); 
-       
-       if ($userids != false) {
-               foreach($userids as $userid) {
-                       $useradded = groups_add_member($groupid, $userid);
-                       if (!$useradded) {
-                               echo '<error>Failed to add user $userid to group</error>';
-                       }
-               }
-       }
+    $userids = explode(',', $users); 
+
+    if ($userids != false) {
+        foreach($userids as $userid) {
+            $useradded = groups_add_member($groupid, $userid);
+            if (!$useradded) {
+                echo '<error>Failed to add user $userid to group</error>';
+            }
+        }
+    }
 }
 
 echo '</groupsresponse>';
-?>
\ No newline at end of file
+?>
index 7154c80f1bfe23ad51292ada192cc444eae4127d..14e00ec235b8abb46b948985c223dd87c47aedb5 100644 (file)
@@ -27,20 +27,20 @@ $groupingsettings->description = required_param('description', PARAM_ALPHANUM);
 $groupingsettings->prefix = required_param('prefix');
 $groupingsettings->defaultgroupdescription = required_param('defaultgroupdescription');
 
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       if ($generationtype == 'nogroups') {
-               $noofstudents = false;
-       }
-       
-       $groupingid = groups_create_automatic_grouping($courseid, $noofstudents, $noofgroups, 
-                                                      $distribevenly, $groupingsettings, false, $alphabetical); 
-       if (!$groupingid) {
-               echo '<error>Failed to create grouping</error>';
-       } else {
-               echo '<groupingid>'.$groupingid.'</groupingid>';
-       }
+    if ($generationtype == 'nogroups') {
+        $noofstudents = false;
+    }
+
+    $groupingid = groups_create_automatic_grouping($courseid, $noofstudents, $noofgroups, 
+        $distribevenly, $groupingsettings, false, $alphabetical); 
+    if (!$groupingid) {
+        echo '<error>Failed to create grouping</error>';
+    } else {
+        echo '<groupingid>'.$groupingid.'</groupingid>';
+    }
 }
 
 echo '</groupsresponse>';
-?>
\ No newline at end of file
+?>
index 34e3dd896526ac06cad2c56f3db8fc0f269b032d..a1066fd93db81948cf28a5d2e39b8b9fcea3e51a 100644 (file)
 
             <p><?php print_string('newpicture', 'group'); ?></p>
             <p><?php upload_print_form_fragment(1,array('newgroupicon'),null,false,null,0,0,false);
-                                    helpbutton("picture", get_string("helppicture"));
-                                    print_string("maxsize", "", display_size($maxbytes), 'group'); ?>
+                    helpbutton("picture", get_string("helppicture"));
+                    print_string("maxsize", "", display_size($maxbytes), 'group'); ?>
                </p>
             <?php 
-               }  
+            }  
             ?>
             </table>
             
index a3f9559c1d6f86ee2d4874ddb4b74dbce77c5483..f22eba4be8cc024c0093fbc30bf1f1764d0ee3e6 100644 (file)
@@ -18,14 +18,14 @@ $groupingsettings->description= required_param('description', PARAM_ALPHANUM);
 require_login($courseid);
 
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupingid = groups_create_grouping($courseid, $groupingsettings);
-       
-       if (!$groupingid) {
-               echo '<error>Failed to create grouping</error>';
-       } else {
-               echo '<groupingid>'.$groupingid.'</groupingid>';
-       }
+    $groupingid = groups_create_grouping($courseid, $groupingsettings);
+
+    if (!$groupingid) {
+        echo '<error>Failed to create grouping</error>';
+    } else {
+        echo '<groupingid>'.$groupingid.'</groupingid>';
+    }
 }
 
 echo '</groupsresponse>';
-?>
\ No newline at end of file
+?>
index ab58ab02ad45cb9ec175277b0e28f20968487628..2e22f9fc30641dcc4462df747972d752b325efd0 100644 (file)
@@ -14,13 +14,13 @@ $groupid  = required_param('groupid', PARAM_INT);
 $courseid = required_param('courseid', PARAM_INT);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupremoved = groups_delete_group($groupid);
-       
-       if ($groupremoved == false) {
-               echo "<error>Could not delete group $groupid</error>";
-       
+    $groupremoved = groups_delete_group($groupid);
+
+    if ($groupremoved == false) {
+        echo "<error>Could not delete group $groupid</error>";
+    } 
 }
 
 echo '</groupsresponse>';
index d2ec1b54a18a4191c48528bef954d36c7f07f191..8a901d69d03f7093b5a86c19aac697cfb9466352 100644 (file)
@@ -14,12 +14,12 @@ $groupingid = required_param('groupingid', PARAM_INT);
 $courseid   = required_param('courseid', PARAM_INT);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupingremoved = groups_delete_grouping($groupingid);
-       if (!$groupingremoved) {
-               echo '<error>Failed to delete grouping</error>';
-       }
+    $groupingremoved = groups_delete_grouping($groupingid);
+    if (!$groupingremoved) {
+        echo '<error>Failed to delete grouping</error>';
+    }
 }
 
 echo '</groupsresponse>';
index 5bcf2549567a2feb2a3edb173a2bcbcb39dcccf7..d4d4f2a05a96631b3355692af5890eb414f7ac80 100644 (file)
@@ -21,10 +21,10 @@ $groupingsettings->teachersgroupview = required_param('teachersgroupview', PARAM
 $groupingsettings->teachersoverride = required_param('teachersoverride', PARAM_INT);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupingid = groups_set_grouping_settings($groupingid, $groupingsettings);
+    $groupingid = groups_set_grouping_settings($groupingid, $groupingsettings);
 }
 
 echo '</groupsresponse>';
-?>
\ No newline at end of file
+?>
index 97a467365979d6a240a25abc2fe65bc924b15eca..5aa6255b65f59c722f3969c342dbcea43463f3ae 100644 (file)
@@ -17,10 +17,10 @@ $groupingsettings->name       = required_param('groupingname', PARAM_ALPHANUM);
 $groupingsettings->description= required_param('description', PARAM_ALPHANUM);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupingid = groups_set_grouping_settings($groupingid, $groupingsettings);
+    $groupingid = groups_set_grouping_settings($groupingid, $groupingsettings);
 }
 
 echo '</groupsresponse>';
-?>
\ No newline at end of file
+?>
index 9b8ab26b80fcbb489ed10d441cf400c0dd72e656..015def1fc87fc676fead2cc2b8f9def9a4dea753 100644 (file)
@@ -9,13 +9,13 @@
         <p><?php print_string('enrolmentkey') ?></p>
         <p><input type="text" id="enrolmentkey" size="25" /></p>
         <?php if ($printuploadpicture) {  ?>
-               <p><?php print_string("hidepicture") ?></p>
+        <p><?php print_string("hidepicture") ?></p>
         <p><?php $options = NULL; $options[0] = get_string("no"); $options[1] = get_string("yes");
-                                choose_from_menu ($options, "hidepicture", $group->hidepicture, ""); ?></p>
+                choose_from_menu ($options, "hidepicture", $group->hidepicture, ""); ?></p>
             <p><?php print_string("newpicture") ?></p>
             <p><?php upload_print_form_fragment(1,array('groupicon'),null,false,null,0,0,false);
-                                    helpbutton("picture", get_string("helppicture"));
-                                    print_string("maxsize", "", display_size($maxbytes), 'group'); ?></p>
+                    helpbutton("picture", get_string("helppicture"));
+                    print_string("maxsize", "", display_size($maxbytes), 'group'); ?></p>
             <?php } ?>
             <p><input type="button" id="editgroupsettings" value="<?php print_string('save', 'group'); ?>" />&nbsp;<input type="button" id="canceleditgroupsettings" value="<?php print_string('cancel', 'group'); ?>" /></p>
     </form>
index e8e92f01e6ea8f14fa694c4dbf4d636bf1d1c5a2..c778b2b05168652fc31254685ce32a809f8b695a 100644 (file)
    padding:10px;
    z-index:1;
    visibility: hidden;
-}      
+}
 
 .select
 {
-       overflow: visible;
-       clip: auto;
-       width:200px;
+    overflow: visible;
+    clip: auto;
+    width:200px;
 }
 
 .groupmanagementtable
 {
-       padding: 10px;
-       margin-left: auto;
-       margin-right: auto; 
-       text-align: center; 
+    padding: 10px;
+    margin-left: auto;
+    margin-right: auto; 
+    text-align: center; 
 }
 
 .groupmanagementtableheader
 {
-       width: 300px;
+    width: 300px;
 }
 
 
index e193f668a5e219b450525d12dfbc31992129c477..db18de96afdf44e0b1c75a6100cf8294a36b94cd 100644 (file)
@@ -1,7 +1,7 @@
 <link rel="stylesheet" type="text/css" href="form.css" />
 
 
-<script type="text/javascript" src="yahoo.js"></script>         
+<script type="text/javascript" src="yahoo.js"></script>
 <script type="text/javascript" src="connection.js"></script> 
 
 <script type="text/javascript">
@@ -28,7 +28,7 @@
 
 
 <noscript>
-       <?php notify(get_string('javascriptrequired')); ?>
+    <?php notify(get_string('javascriptrequired')); ?>
 </noscript>
 
 <?php include('main-form.html'); ?>
index 46af5ef8bafe1420328a2e22a8a09682bdc222c0..5327d80ada3bdfa0183bee916837eee0827afdd4 100644 (file)
@@ -15,13 +15,13 @@ $courseid   = required_param('courseid', PARAM_INT);
 $groupingid = required_param('groupingid', PARAM_INT);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupingsettings = groups_get_grouping_settings($groupingid);
-       echo '<name>'.$groupingsettings->name.'</name>';
-       echo '<description>'.$groupingsettings->description.'</description>';
-       
+    $groupingsettings = groups_get_grouping_settings($groupingid);
+    echo '<name>'.$groupingsettings->name.'</name>';
+    echo '<description>'.$groupingsettings->description.'</description>';
+
 }
 
 echo '</groupsresponse>';
-?>
\ No newline at end of file
+?>
index 86d36b781a3b8baad6a6a3307e18f4f6b089e751..79f63f5f2529998451faee905cd9ebbc3666226f 100644 (file)
@@ -15,22 +15,22 @@ $courseid = required_param('courseid', PARAM_INT);
 $groupid  = required_param('groupid', PARAM_INT);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
 
-       $groupsettings = groups_get_group_settings($groupid);
-       if (!$groupsettings) {
-               echo '<error>Failed to get group details</error>';
-       } else {
-               echo '<name>'.$groupsettings->name.'</name>';
-               echo '<description>'.$groupsettings->description.'</description>';
-               echo '<enrolmentkey>'.$groupsettings->enrolmentkey.'</enrolmentkey>';
-               echo '<hidepicture>'.$groupsettings->hidepicture.'</hidepicture>';
-               echo '<picture>'.$groupsettings->picture.'</picture>';
-               echo '<lang>'.$groupinkfo->lang.'</lang>';
-               echo '<theme>'.$groupsettings->theme.'</theme>';
-       }       
+    $groupsettings = groups_get_group_settings($groupid);
+    if (!$groupsettings) {
+        echo '<error>Failed to get group details</error>';
+    } else {
+        echo '<name>'.$groupsettings->name.'</name>';
+        echo '<description>'.$groupsettings->description.'</description>';
+        echo '<enrolmentkey>'.$groupsettings->enrolmentkey.'</enrolmentkey>';
+        echo '<hidepicture>'.$groupsettings->hidepicture.'</hidepicture>';
+        echo '<picture>'.$groupsettings->picture.'</picture>';
+        echo '<lang>'.$groupinkfo->lang.'</lang>';
+        echo '<theme>'.$groupsettings->theme.'</theme>';
+    }
 }
 
 echo '</groupsresponse>';
-?>
\ No newline at end of file
+?>
index 5818ebfd9241ffef37d4ad12ff0c69e2526ad300..54c4789737d8d0ea0774b33c97e4a8034b1f0177 100644 (file)
@@ -7,18 +7,18 @@
         </tr>
         <tr>
             <td class="generalboxcontent">
-               <select id="groupings" size="15" class="select"></select>
+                <select id="groupings" size="15" class="select"></select>
             </td>
             <td>
-               <select id="groups" size="15" class="select"></select>
+                <select id="groups" size="15" class="select"></select>
             </td>
             <td>
-               <select id="members" size="15" multiple="multiple" class="select"></select>
+                <select id="members" size="15" multiple="multiple" class="select"></select>
             </td>
         </tr>
         <tr>
             <td>
-               <p><input type="button" id="showeditgroupingsettingsform" value="<?php print_string('editgroupingsettings', 'group'); ?>" /></p>
+                <p><input type="button" id="showeditgroupingsettingsform" value="<?php print_string('editgroupingsettings', 'group'); ?>" /></p>
                 <p><input type="button" id="showeditgroupingpermissionsform" value="<?php print_string('editgroupingpermissions', 'group'); ?>" /></p>
                 <p><input type="button" id="deletegrouping" value="<?php print_string('deletegrouping', 'group'); ?>" /></p>
                 <p><input type="button" id="showcreategroupingform" value="<?php print_string('creategrouping', 'group'); ?>" /></p>
                 <p><input type="button" id="printerfriendly" value="<?php print_string('printerfriendly', 'group'); ?>" /></p>
             </td>
             <td>
-               <p><input type="button" id="showeditgroupsettingsform" value="<?php print_string('editgroupsettings', 'group'); ?>" /></p>
+                <p><input type="button" id="showeditgroupsettingsform" value="<?php print_string('editgroupsettings', 'group'); ?>" /></p>
                 <p><input type="button" id="deletegroup" value="<?php print_string('deleteselectedgroup', 'group'); ?>" /></p>
                 <p><input type="button" id="removegroup" value="<?php print_string('removegroupfromselectedgrouping', 'group'); ?>" /></p>
                 <p><input type="button" id="showcreategroupform" value="<?php print_string('creategroupinselectedgrouping', 'group'); ?>" /></p>
                 <p><input type="button" id="showaddgroupstogroupingform" value="<?php print_string('addexistinggroupstogrouping', 'group'); ?>" /></p>
             </td>
             <td>
-               <p><input type="button" id="removemembers" value="<?php print_string('removeselectedusers', 'group'); ?>"/></p>
+                <p><input type="button" id="removemembers" value="<?php print_string('removeselectedusers', 'group'); ?>"/></p>
                 <p><input type="button" id="showaddmembersform" value="<?php print_string('adduserstogroup', 'group'); ?>" /></p>
             </td>
         </tr>
index af8d1fae32835c58e9acf3287124662a5eeb4dd0..5e94f122c12e4db43d4879c5f9d2097cb22a637d 100644 (file)
@@ -16,12 +16,12 @@ $groupingid = required_param('groupingid', PARAM_INT);
 $courseid   = required_param('courseid', PARAM_INT);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       $groupingremoved = groups_remove_group_from_grouping($groupid, $groupingid);
-       if (!$groupingremoved) {
-               echo '<error>Failed to remove group from grouping</error>';
-       }
+    $groupingremoved = groups_remove_group_from_grouping($groupid, $groupingid);
+    if (!$groupingremoved) {
+        echo '<error>Failed to remove group from grouping</error>';
+    }
 }
 
 echo '</groupsresponse>';
index df4b38335a5e3212ebf6a35dabb2286c327f8193..dca1caae95fd1c5c36a4262136b1fce18619a786 100644 (file)
@@ -1,9 +1,9 @@
 
 function onRemoveGroup() {
-       hideAllForms();
-       showElement("groupeditform");
-       removeGroupFromGrouping();
-       return false;
+    hideAllForms();
+    showElement("groupeditform");
+    removeGroupFromGrouping();
+    return false;
 }
 
 /**
@@ -11,23 +11,23 @@ function onRemoveGroup() {
  * another grouping
  */
 function removeGroupFromGrouping() {
-       //alert("Called removeGroupFromGrouping");
-       var url = "removegroupfromgrouping-xml.php";
+    //alert("Called removeGroupFromGrouping");
+    var url = "removegroupfromgrouping-xml.php";
     var requeststring = "groupid="+selectedgroupid+"&groupingid="+selectedgroupingid;
     sendPostRequest(request, url, requeststring, removeGroupFromGroupingResponse);
 }
+
 /**
  * The callback for the response to the request sent in removeGroupFromGrouping() 
  */ 
 function removeGroupFromGroupingResponse() {
     if (checkAjaxResponse(request)) {
-       //alert("removeGroupFromGroupingResponse called");
-       var xmlDoc= request.responseXML;
-       // Need XML sent back with groupingid
-       // Really want to set this to be the grouping before
-       selectedgroupid = null;
-       updateGroupings();
+        //alert("removeGroupFromGroupingResponse called");
+        var xmlDoc= request.responseXML;
+        // Need XML sent back with groupingid
+        // Really want to set this to be the grouping before
+        selectedgroupid = null;
+        updateGroupings();
     }
 }
 
index 6dae2532d885fc2eef48200e4dd90c57302b8f4e..a585f28eea3a923848eb8d51a8f317ae7e716669 100644 (file)
@@ -17,19 +17,19 @@ $users    = required_param('users', PARAM_SEQUENCE);
 $courseid = required_param('courseid', PARAM_INT);
 
 require_login($courseid);
-       
+
 if (confirm_sesskey() and isteacheredit($courseid)) {
-       // Change the comma-separated string of the userids into an array of the userids
-       $userids = explode(',', $users); 
-       if ($userids != false) {
-               // Remove each user in turn from the group. 
-               foreach($userids as $userid) {
-                       $useradded = groups_remove_member($groupid, $userid);
-                       if (!$useradded) {
-                               echo "<error>Failed to adduser $userid</error>";
-                       }
-               }
-       }
+    // Change the comma-separated string of the userids into an array of the userids
+    $userids = explode(',', $users); 
+    if ($userids != false) {
+        // Remove each user in turn from the group. 
+        foreach($userids as $userid) {
+            $useradded = groups_remove_member($groupid, $userid);
+            if (!$useradded) {
+                echo "<error>Failed to adduser $userid</error>";
+            }
+        }
+    }
 }
 
 
index ef16b9b88e04706771bb22353c5de1028a395d43..8fe86de6731c9f0ed9d8d2b6b9eec7428e5eb651 100644 (file)
@@ -2,10 +2,10 @@
 
 
 function onRemoveMembers() {
-       hideAllForms();
-       showElement("groupeditform");
-       removeMembers();
-       return false;
+    hideAllForms();
+    showElement("groupeditform");
+    removeMembers();
+    return false;
 }
 
 
@@ -14,9 +14,9 @@ function onRemoveMembers() {
  * Removes the selected members from the selected group
  */
 function removeMembers() {
-       //alert("Called removeMembers");
-       users = getSelectedUsers();
-       var url = "removemembers-xml.php";
+    //alert("Called removeMembers");
+    users = getSelectedUsers();
+    var url = "removemembers-xml.php";
     var requeststring = "groupid="+selectedgroupid+"&users="+users;
     sendPostRequest(request, url, requeststring, removeMembersResponse);
 }
@@ -26,8 +26,8 @@ function removeMembers() {
  */
 function removeMembersResponse() {
     if (checkAjaxResponse(request)) {
-       //alert("removeMembersResponse called");
-       //alert(request.responseText);
-       updateSelectedGroup();
+        //alert("removeMembersResponse called");
+        //alert(request.responseText);
+        updateSelectedGroup();
     }
 }