### Eclipse Workspace Patch 1.0
#P moodle17
Index: mod/glossary/db/access.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/db/access.php,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 access.php
--- mod/glossary/db/access.php	11 Oct 2006 06:16:20 -0000	1.7.2.1
+++ mod/glossary/db/access.php	23 Oct 2006 20:46:07 -0000
@@ -50,6 +50,8 @@
 
     'mod/glossary:manageentries' => array(
 
+        'riskbitmask' => RISK_SPAM,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
@@ -62,6 +64,8 @@
 
     'mod/glossary:managecategories' => array(
 
+        'riskbitmask' => RISK_SPAM,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
@@ -89,6 +93,8 @@
 
     'mod/glossary:managecomments' => array(
 
+        'riskbitmask' => RISK_SPAM,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
@@ -127,6 +133,8 @@
 
     'mod/glossary:approve' => array(
 
+        'riskbitmask' => RISK_SPAM,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
Index: mod/data/db/access.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/data/db/access.php,v
retrieving revision 1.8.2.2
diff -u -r1.8.2.2 access.php
--- mod/data/db/access.php	20 Oct 2006 06:58:28 -0000	1.8.2.2
+++ mod/data/db/access.php	23 Oct 2006 20:46:07 -0000
@@ -115,6 +115,8 @@
 
     'mod/data:manageentries' => array(
 
+        'riskbitmask' => RISK_SPAM,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
@@ -127,6 +129,8 @@
 
     'mod/data:managecomments' => array(
 
+        'riskbitmask' => RISK_SPAM,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'legacy' => array(
@@ -139,7 +143,7 @@
 
     'mod/data:managetemplates' => array(
 
-        'riskbitmask' => RISK_SPAM,
+        'riskbitmask' => RISK_SPAM | RISK_XSS,
 
         'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
Index: version.php
===================================================================
RCS file: /cvsroot/moodle/moodle/version.php,v
retrieving revision 1.406.2.2
diff -u -r1.406.2.2 version.php
--- version.php	21 Oct 2006 16:10:07 -0000	1.406.2.2
+++ version.php	23 Oct 2006 20:46:07 -0000
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006101001;  // YYYYMMDD   = date of the 1.7 branch (don't change)
+   $version = 2006101002;  // YYYYMMDD   = date of the 1.7 branch (don't change)
                            //         X  = release number 1.7.[0,1,2,3...]
                            //          Y = micro-increments between releases
 
Index: mod/glossary/version.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/version.php,v
retrieving revision 1.53
diff -u -r1.53 version.php
--- mod/glossary/version.php	18 Sep 2006 21:32:52 -0000	1.53
+++ mod/glossary/version.php	23 Oct 2006 20:46:07 -0000
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2006091800;
+$module->version  = 2006091801;
 $module->requires = 2006082600;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
Index: mod/data/version.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/data/version.php,v
retrieving revision 1.19
diff -u -r1.19 version.php
--- mod/data/version.php	2 Oct 2006 17:24:55 -0000	1.19
+++ mod/data/version.php	23 Oct 2006 20:46:07 -0000
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2006100200;
+$module->version  = 2006100201;
 $module->requires = 2006080900;  // Requires this Moodle version
 $module->cron     = 60;
 
Index: lib/db/access.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/access.php,v
retrieving revision 1.38.2.2
diff -u -r1.38.2.2 access.php
--- lib/db/access.php	11 Oct 2006 06:24:10 -0000	1.38.2.2
+++ lib/db/access.php	23 Oct 2006 20:46:07 -0000
@@ -34,47 +34,60 @@
 $moodle_capabilities = array(
 
     'moodle/site:doanything' => array(
+
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
+
         'captype' => 'admin',
         'contextlevel' => CONTEXT_SYSTEM
     ),
 
     'moodle/legacy:guest' => array(
+
         'captype' => 'legacy',
         'contextlevel' => CONTEXT_SYSTEM
     ),
 
 
     'moodle/legacy:student' => array(
+
         'riskbitmask' => RISK_SPAM,
+
         'captype' => 'legacy',
         'contextlevel' => CONTEXT_SYSTEM
     ),
 
 
     'moodle/legacy:teacher' => array(
+
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
+
         'captype' => 'legacy',
         'contextlevel' => CONTEXT_SYSTEM
     ),
 
 
     'moodle/legacy:editingteacher' => array(
+
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
+
         'captype' => 'legacy',
         'contextlevel' => CONTEXT_SYSTEM
     ),
 
 
     'moodle/legacy:coursecreator' => array(
+
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
+
         'captype' => 'legacy',
         'contextlevel' => CONTEXT_SYSTEM
     ),
 
 
     'moodle/legacy:admin' => array(
+
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
+
         'captype' => 'legacy',
         'contextlevel' => CONTEXT_SYSTEM
     ),
@@ -93,6 +106,8 @@
 
     'moodle/site:readallmessages' => array(
 
+        'riskbitmask' => RISK_PERSONAL,
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -102,6 +117,8 @@
 
     'moodle/site:approvecourse' => array(
 
+        'riskbitmask' => RISK_XSS,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -249,6 +266,8 @@
 
     'moodle/user:delete' => array(
 
+        'riskbitmask' => RISK_PERSONAL,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -291,6 +310,7 @@
     ),
 
     'moodle/user:viewusergrades' => array(
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -301,7 +321,7 @@
             'admin' => CAP_ALLOW
         )
     ),
-    
+
     'moodle/user:loginas' => array(
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
@@ -326,6 +346,8 @@
 
     'moodle/role:override' => array(
 
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -335,6 +357,8 @@
 
     'moodle/role:manage' => array(
 
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -343,6 +367,7 @@
     ),
 
     'moodle/role:unassignself' => array(
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -355,6 +380,7 @@
     ),
 
     'moodle/role:viewhiddenassigns' => array(
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -366,7 +392,9 @@
     ),
 
     'moodle/role:switchroles' => array(
+
         'riskbitmask' => RISK_XSS,
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -727,6 +755,7 @@
     // The next 3 might make no sense for some roles, e.g teacher, etc.
     // since the next level up is site. These are more for the parent role
     'moodle/user:readuserposts' => array(
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_USER,
         'legacy' => array(
@@ -739,6 +768,7 @@
     ),
 
     'moodle/user:readuserblogs' => array(
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_USER,
         'legacy' => array(
@@ -751,6 +781,7 @@
     ),
 
     'moodle/user:viewuseractivitiesreport' => array(
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_USER,
         'legacy' => array(
@@ -786,6 +817,7 @@
     ),
 
     'moodle/question:export' => array(
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -796,6 +828,7 @@
     ),
 
     'moodle/question:managecategory' => array(
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -819,6 +852,7 @@
     ),
 
     'moodle/site:doclinks' => array(
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
@@ -830,6 +864,7 @@
     ),
 
     'moodle/course:sectionvisibility' => array(
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -840,6 +875,7 @@
     ),
 
     'moodle/course:useremail' => array(
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -849,6 +885,7 @@
     ),
 
     'moodle/course:viewhiddensections' => array(
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -859,6 +896,7 @@
     ),
 
     'moodle/course:setcurrentsection' => array(
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -869,6 +907,9 @@
     ),
 
     'moodle/course:viewcoursegrades' => array(
+
+        'riskbitmask' => RISK_PERSONAL,
+
         'captype' => 'read',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(
@@ -880,6 +921,9 @@
     ),
 
     'moodle/course:managegrades' => array(
+
+        'riskbitmask' => RISK_PERSONAL,
+
         'captype' => 'write',
         'contextlevel' => CONTEXT_COURSE,
         'legacy' => array(