commiting delete group function

MDL-12886

diff --git a/group/external.php b/group/external.php
index 992e91b874eb7e31bed8f7806d5ae425ba7012aa..5fb043949af729dc81c5fd662a0baa5d57cd119a 100644 (file)
--- a/group/external.php
+++ b/group/external.php
@@ -35,6 +35,9 @@ final class group_external extends moodle_external {
                                                             'optionalparams' => array( ),
                                                             'return' => array('group' => array('id' => PARAM_RAW, 'courseid' => PARAM_RAW,
                                                                                                                                                'name' => PARAM_RAW, 'enrolmentkey' => PARAM_RAW)));
+                 $this->descriptions['tmp_delete_group']     = array( 'params' => array('groupid'=> PARAM_INT),
+                                                            'optionalparams' => array( ),
+                                                            'return' => array('result' => PARAM_BOOL));
 
           $this->descriptions['tmp_add_groupmember']   = array( 'params' => array('groupid'=> PARAM_INT, 'userid'=> PARAM_INT),
                                                             'optionalparams' => array( ),
@@ -90,6 +93,20 @@ final class group_external extends moodle_external {
 
                        return $ret;
 
+       }
+
+               static function tmp_delete_group($params){
+
+               if (has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_SYSTEM))) {
+
+                       // @TODO groups_add_member() does not check userid
+                       return groups_delete_group($params['groupid']);
+               }
+               else {
+            throw new moodle_exception('wscouldnotdeletegroup');
+        }
+
+
        }
 }
 

diff --git a/webservice/rest/testclient/deletegroup.php b/webservice/rest/testclient/deletegroup.php
new file mode 100644 (file)
index 0000000..c139e8e
--- /dev/null
+++ b/webservice/rest/testclient/deletegroup.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Created on 10/17/2008
+ *
+ * Rest Test Client
+ *
+ * @author David Castro Garcia
+ * @author Ferran Recio Calderó
+ * @author Jordi Piguillem
+ */
+
+require_once ('config_rest.php');
+
+$params = array('groupid');
+
+foreach ($params as $param) {
+       $$param = (isset($_POST[$param]))?$_POST[$param]:'';
+}
+
+start_interface("Delete group");
+?>
+
+<form action="deletegroup.php" method="post">
+<table border="0">
+    <tr><td>Group id: </td><td><input type="text" name="groupid" value="<?php echo $groupid; ?>"/></td></tr>
+    <tr><td></td><td><input type="submit" value="Delete Group"></td></tr>
+</table>
+</form>
+
+<?php
+
+if ($groupid) {
+
+     //we are asking for a token
+    $connectiondata['username'] = 'wsuser';
+    $connectiondata['password'] = 'wspassword';
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $CFG->serverurl.'/user/tmp_get_token');
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_POST, 1);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, format_postdata($connectiondata));
+    $token = curl_exec($ch);
+    $data['token'] = $token;
+
+    $data['groupid'] = $groupid;
+
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $CFG->serverurl.'/group/tmp_delete_group');
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_POST, 1);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, format_postdata($data));
+    $out = curl_exec($ch);
+
+    $res = basicxml_xml_to_object($out);
+
+       show_object($res);
+
+    show_xml ($out);
+} else {
+    echo "<p>Fill the form first</p>";
+}
+
+end_interface();
+
+?>

diff --git a/webservice/rest/testclient/getgroup.php b/webservice/rest/testclient/getgroup.php
index 77819a8c5ded4800f758ad63a4e718f3667ee989..1578202c2fa02b0c92c23ff2203a33c25bfcb8cf 100644 (file)
--- a/webservice/rest/testclient/getgroup.php
+++ b/webservice/rest/testclient/getgroup.php
@@ -17,7 +17,7 @@ foreach ($params as $param) {
        $$param = (isset($_POST[$param]))?$_POST[$param]:'';
 }
 
-start_interface("Delete a user");
+start_interface("Get Group");
 ?>
 
 <form action="getgroup.php" method="post">