diff --git a/lang/en/role.php b/lang/en/role.php index 4e950c6eb47..036ac1ccc01 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -55,8 +55,14 @@ $string['assignroles'] = 'Assign roles'; $string['assignrolesin'] = 'Assign roles in {$a}'; $string['assignrolesrelativetothisuser'] = 'Assign roles relative to this user'; $string['backtoallroles'] = 'Back to the list of all roles'; +$string['backup:anonymise'] = 'Anonymise user data on backup'; +$string['backup:backupactivity'] = 'Backup activities'; $string['backup:backupcourse'] = 'Backup courses'; +$string['backup:backupsection'] = 'Backup sections'; +$string['backup:configure'] = 'Configure backup options'; $string['backup:downloadfile'] = 'Download files from backup areas'; +$string['backup:backuptargethub'] = 'Backup for hub'; +$string['backup:backuptargetimport'] = 'Backup for import'; $string['backup:userinfo'] = 'Backup user data'; $string['block:edit'] = 'Edit a block\'s settings'; $string['block:view'] = 'View block'; @@ -253,8 +259,12 @@ $string['resetrole'] = 'Reset to defaults'; $string['resetrolenolegacy'] = 'Clear permissions'; $string['resetrolesure'] = 'Are you sure that you want to reset role "{$a->name} ({$a->shortname})" to defaults?
The defaults are taken from the selected archetype ({$a->legacytype}).'; $string['resetrolesurenolegacy'] = 'Are you sure that you want to clear all permissions defined in this role "{$a->name} ({$a->shortname})"?'; +$string['restore:configure'] = 'Configure restore options'; $string['restore:createuser'] = 'Create users on restore'; +$string['restore:restoreactivity'] = 'Restore activities'; +$string['restore:restoresection'] = 'Restore sections'; $string['restore:restorecourse'] = 'Restore courses'; +$string['restore:restoretargethub'] = 'Restore from files targeted as hub'; $string['restore:restoretargetimport'] = 'Restore from files targeted as import'; $string['restore:rolldates'] = 'Allowed to roll activity configuration dates on restore'; $string['restore:uploadfile'] = 'Upload files to backup areas'; diff --git a/lib/db/access.php b/lib/db/access.php index defcc33f7d8..df29ea0da9f 100644 --- a/lib/db/access.php +++ b/lib/db/access.php @@ -88,6 +88,62 @@ $capabilities = array( 'clonepermissionsfrom' => 'moodle/site:backup' ), + 'moodle/backup:backupsection' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ), + + 'clonepermissionsfrom' => 'moodle/backup:backupcourse' + ), + + 'moodle/backup:backupactivity' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_MODULE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ), + + 'clonepermissionsfrom' => 'moodle/backup:backupcourse' + ), + + 'moodle/backup:backuptargethub' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ), + + 'clonepermissionsfrom' => 'moodle/backup:backupcourse' + ), + + 'moodle/backup:backuptargetimport' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ), + + 'clonepermissionsfrom' => 'moodle/backup:backupcourse' + ), + 'moodle/backup:downloadfile' => array( 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, @@ -102,6 +158,18 @@ $capabilities = array( 'clonepermissionsfrom' => 'moodle/site:backupdownload' ), + 'moodle/backup:configure' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ) + ), + 'moodle/backup:userinfo' => array( 'riskbitmask' => RISK_PERSONAL, @@ -113,6 +181,17 @@ $capabilities = array( ) ), + 'moodle/backup:anonymise' => array( + + 'riskbitmask' => RISK_PERSONAL, + + 'captype' => 'read', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'manager' => CAP_ALLOW + ) + ), + 'moodle/restore:restorecourse' => array( 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, @@ -127,6 +206,48 @@ $capabilities = array( 'clonepermissionsfrom' => 'moodle/site:restore' ), + 'moodle/restore:restoresection' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ), + + 'clonepermissionsfrom' => 'moodle/restore:restorecourse' + ), + + 'moodle/restore:restoreactivity' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_MODULE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ), + + 'clonepermissionsfrom' => 'moodle/restore:restorecourse' + ), + + 'moodle/restore:restoretargethub' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ), + + 'clonepermissionsfrom' => 'moodle/restore:restorecourse' + ), + 'moodle/restore:restoretargetimport' => array( 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, @@ -155,6 +276,28 @@ $capabilities = array( 'clonepermissionsfrom' => 'moodle/site:backupupload' ), + 'moodle/restore:configure' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'editingteacher' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ) + ), + + 'moodle/restore:rolldates' => array( + + 'captype' => 'write', + 'contextlevel' => CONTEXT_COURSE, + 'legacy' => array( + 'coursecreator' => CAP_ALLOW, + 'manager' => CAP_ALLOW + ) + ), + 'moodle/restore:userinfo' => array( 'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG, @@ -177,16 +320,6 @@ $capabilities = array( ) ), - 'moodle/restore:rolldates' => array( - - 'captype' => 'write', - 'contextlevel' => CONTEXT_COURSE, - 'legacy' => array( - 'coursecreator' => CAP_ALLOW, - 'manager' => CAP_ALLOW - ) - ), - 'moodle/site:manageblocks' => array( 'riskbitmask' => RISK_SPAM | RISK_XSS, diff --git a/version.php b/version.php index 27ce4f73d21..669f2a83852 100644 --- a/version.php +++ b/version.php @@ -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 = 2010043001; // YYYYMMDD = date of the last version bump + $version = 2010050100; // YYYYMMDD = date of the last version bump // XX = daily increments $release = '2.0 dev (Build: 20100501)'; // Human-friendly version name