From 46e15fa354074d7c2dd1de42b36c710d6fb94081 Mon Sep 17 00:00:00 2001 From: poltawski Date: Tue, 8 May 2007 23:44:31 +0000 Subject: [PATCH] MDL-9742 - Converting tabs to spaces in groups code --- group/db/dbcleanup.php | 26 ++++++++--------- group/db/dbmodulelib.php | 10 +++---- group/groupui/addgroupstogrouping-xml.php | 22 +++++++-------- group/groupui/addmembers-form.html | 4 +-- group/groupui/addmembers-xml.php | 24 ++++++++-------- group/groupui/createautomaticgrouping-xml.php | 26 ++++++++--------- group/groupui/creategroup-form.html | 6 ++-- group/groupui/creategrouping-xml.php | 16 +++++------ group/groupui/deletegroup-xml.php | 12 ++++---- group/groupui/deletegrouping-xml.php | 10 +++---- group/groupui/editgroupingpermissions-xml.php | 6 ++-- group/groupui/editgroupingsettings-xml.php | 6 ++-- group/groupui/editgroupsettings-form.html | 8 +++--- group/groupui/form.css | 18 ++++++------ group/groupui/form.html | 4 +-- group/groupui/getgroupingsettings-xml.php | 12 ++++---- group/groupui/getgroupsettings-xml.php | 28 +++++++++---------- group/groupui/main-form.html | 12 ++++---- group/groupui/removegroupfromgrouping-xml.php | 10 +++---- group/groupui/removegroupfromgrouping.js | 26 ++++++++--------- group/groupui/removemembers-xml.php | 24 ++++++++-------- group/groupui/removemembers.js | 20 ++++++------- 22 files changed, 165 insertions(+), 165 deletions(-) diff --git a/group/db/dbcleanup.php b/group/db/dbcleanup.php index 35c61b5e82..e9bc084164 100644 --- a/group/db/dbcleanup.php +++ b/group/db/dbcleanup.php @@ -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; } ?> diff --git a/group/db/dbmodulelib.php b/group/db/dbmodulelib.php index 2a97a7eeb8..04bf18b24d 100644 --- a/group/db/dbmodulelib.php +++ b/group/db/dbmodulelib.php @@ -19,16 +19,16 @@ * @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 +?> diff --git a/group/groupui/addgroupstogrouping-xml.php b/group/groupui/addgroupstogrouping-xml.php index df01f5bc32..9e3850f737 100644 --- a/group/groupui/addgroupstogrouping-xml.php +++ b/group/groupui/addgroupstogrouping-xml.php @@ -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 'Failed to add group $groupid to grouping'; - } - } - } + $groupids = explode(',', $groups); + + if ($groupids != false) { + foreach($groupids as $groupid) { + $groupadded = groups_add_group_to_grouping($groupid, $groupingid); + if (!$groupadded) { + echo 'Failed to add group $groupid to grouping'; + } + } + } } echo ''; diff --git a/group/groupui/addmembers-form.html b/group/groupui/addmembers-form.html index 08a3215525..54847fcf67 100644 --- a/group/groupui/addmembers-form.html +++ b/group/groupui/addmembers-form.html @@ -3,7 +3,7 @@

-

-

+

+

diff --git a/group/groupui/addmembers-xml.php b/group/groupui/addmembers-xml.php index 289503d89c..b31478d019 100644 --- a/group/groupui/addmembers-xml.php +++ b/group/groupui/addmembers-xml.php @@ -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 'Failed to add user $userid to group'; - } - } - } + $userids = explode(',', $users); + + if ($userids != false) { + foreach($userids as $userid) { + $useradded = groups_add_member($groupid, $userid); + if (!$useradded) { + echo 'Failed to add user $userid to group'; + } + } + } } echo ''; -?> \ No newline at end of file +?> diff --git a/group/groupui/createautomaticgrouping-xml.php b/group/groupui/createautomaticgrouping-xml.php index 7154c80f1b..14e00ec235 100644 --- a/group/groupui/createautomaticgrouping-xml.php +++ b/group/groupui/createautomaticgrouping-xml.php @@ -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 'Failed to create grouping'; - } else { - echo ''.$groupingid.''; - } + if ($generationtype == 'nogroups') { + $noofstudents = false; + } + + $groupingid = groups_create_automatic_grouping($courseid, $noofstudents, $noofgroups, + $distribevenly, $groupingsettings, false, $alphabetical); + if (!$groupingid) { + echo 'Failed to create grouping'; + } else { + echo ''.$groupingid.''; + } } echo ''; -?> \ No newline at end of file +?> diff --git a/group/groupui/creategroup-form.html b/group/groupui/creategroup-form.html index 34e3dd8965..a1066fd93d 100644 --- a/group/groupui/creategroup-form.html +++ b/group/groupui/creategroup-form.html @@ -17,11 +17,11 @@

+ helpbutton("picture", get_string("helppicture")); + print_string("maxsize", "", display_size($maxbytes), 'group'); ?>

diff --git a/group/groupui/creategrouping-xml.php b/group/groupui/creategrouping-xml.php index a3f9559c1d..f22eba4be8 100644 --- a/group/groupui/creategrouping-xml.php +++ b/group/groupui/creategrouping-xml.php @@ -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 'Failed to create grouping'; - } else { - echo ''.$groupingid.''; - } + $groupingid = groups_create_grouping($courseid, $groupingsettings); + + if (!$groupingid) { + echo 'Failed to create grouping'; + } else { + echo ''.$groupingid.''; + } } echo ''; -?> \ No newline at end of file +?> diff --git a/group/groupui/deletegroup-xml.php b/group/groupui/deletegroup-xml.php index ab58ab02ad..2e22f9fc30 100644 --- a/group/groupui/deletegroup-xml.php +++ b/group/groupui/deletegroup-xml.php @@ -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 "Could not delete group $groupid"; - } + $groupremoved = groups_delete_group($groupid); + + if ($groupremoved == false) { + echo "Could not delete group $groupid"; + } } echo ''; diff --git a/group/groupui/deletegrouping-xml.php b/group/groupui/deletegrouping-xml.php index d2ec1b54a1..8a901d69d0 100644 --- a/group/groupui/deletegrouping-xml.php +++ b/group/groupui/deletegrouping-xml.php @@ -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 'Failed to delete grouping'; - } + $groupingremoved = groups_delete_grouping($groupingid); + if (!$groupingremoved) { + echo 'Failed to delete grouping'; + } } echo ''; diff --git a/group/groupui/editgroupingpermissions-xml.php b/group/groupui/editgroupingpermissions-xml.php index 5bcf254956..d4d4f2a05a 100644 --- a/group/groupui/editgroupingpermissions-xml.php +++ b/group/groupui/editgroupingpermissions-xml.php @@ -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 ''; -?> \ No newline at end of file +?> diff --git a/group/groupui/editgroupingsettings-xml.php b/group/groupui/editgroupingsettings-xml.php index 97a4673659..5aa6255b65 100644 --- a/group/groupui/editgroupingsettings-xml.php +++ b/group/groupui/editgroupingsettings-xml.php @@ -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 ''; -?> \ No newline at end of file +?> diff --git a/group/groupui/editgroupsettings-form.html b/group/groupui/editgroupsettings-form.html index 9b8ab26b80..015def1fc8 100644 --- a/group/groupui/editgroupsettings-form.html +++ b/group/groupui/editgroupsettings-form.html @@ -9,13 +9,13 @@

-

+

hidepicture, ""); ?>

+ choose_from_menu ($options, "hidepicture", $group->hidepicture, ""); ?>

+ helpbutton("picture", get_string("helppicture")); + print_string("maxsize", "", display_size($maxbytes), 'group'); ?>

 

diff --git a/group/groupui/form.css b/group/groupui/form.css index e8e92f01e6..c778b2b051 100644 --- a/group/groupui/form.css +++ b/group/groupui/form.css @@ -26,26 +26,26 @@ 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; } diff --git a/group/groupui/form.html b/group/groupui/form.html index e193f668a5..db18de96af 100644 --- a/group/groupui/form.html +++ b/group/groupui/form.html @@ -1,7 +1,7 @@ - +