Merge branch 'MDL-29248_21' of git://github.com/stronk7/moodle into M…

…OODLE_21_STABLE

admin/settings/courses.php

@@ -97,7 +97,6 @@
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_users', get_string('generalusers','backup'), get_string('configgeneralusers','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_anonymize', get_string('generalanonymize','backup'), get_string('configgeneralanonymize','backup'), array('value'=>0, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_role_assignments', get_string('generalroleassignments','backup'), get_string('configgeneralroleassignments','backup'), array('value'=>1, 'locked'=>0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_user_files', get_string('generaluserfiles','backup'), get_string('configgeneraluserfiles','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_activities', get_string('generalactivities','backup'), get_string('configgeneralactivities','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_blocks', get_string('generalblocks','backup'), get_string('configgeneralblocks','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_filters', get_string('generalfilters','backup'), get_string('configgeneralfilters','backup'), array('value'=>1, 'locked'=>0)));
@@ -144,7 +143,6 @@
     $temp->add(new admin_setting_heading('automatedsettings', get_string('automatedsettings','backup'), ''));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', get_string('generalusers', 'backup'), get_string('configgeneralusers', 'backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', get_string('generalroleassignments','backup'), get_string('configgeneralroleassignments','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_user_files', get_string('generaluserfiles', 'backup'), get_string('configgeneraluserfiles','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', get_string('generalactivities','backup'), get_string('configgeneralactivities','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', get_string('generalblocks','backup'), get_string('configgeneralblocks','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_filters', get_string('generalfilters','backup'), get_string('configgeneralfilters','backup'), 1));

backup/converter/moodle1/handlerlib.php

@@ -441,7 +441,6 @@ public function on_root_element_end() {
             'users'            => 0, // @todo how to detect this from moodle.xml?
             'anonymize'        => 0,
             'role_assignments' => 0,
-            'user_files'       => 0,
             'activities'       => 1,
             'blocks'           => 1,
             'filters'          => 0,

backup/moodle2/backup_final_task.class.php

@@ -58,7 +58,7 @@ public function build() {
         // done in a single pass
         $this->add_step(new backup_annotate_all_question_files('question_files'));
 
-        // Annotate all the user files (conditionally) (private, profile and icon files)
+        // Annotate all the user files (conditionally) (profile and icon files)
         // Because each user has its own context, we need a separate/specialised step here
         // This step also ensures that the contexts for all the users exist, so next
         // step can be safely executed (join between users and contexts)

backup/moodle2/backup_root_task.class.php

@@ -69,13 +69,6 @@ protected function define_settings() {
         $this->add_setting($roleassignments);
         $users->add_dependency($roleassignments);
 
-        // Define user_files (dependent of users and anonymize)
-        $userfiles = new backup_user_files_setting('user_files', base_setting::IS_BOOLEAN, true);
-        $userfiles->set_ui(new backup_setting_ui_checkbox($userfiles, get_string('rootsettinguserfiles', 'backup')));
-        $this->add_setting($userfiles);
-        $users->add_dependency($userfiles);
-        $anonymize->add_dependency($userfiles, setting_dependency::DISABLED_TRUE);
-
         // Define activities
         $activities = new backup_activities_setting('activities', base_setting::IS_BOOLEAN, true);
         $activities->set_ui(new backup_setting_ui_checkbox($activities, get_string('rootsettingactivities', 'backup')));

backup/moodle2/backup_settingslib.php

@@ -68,13 +68,6 @@ class backup_activities_setting extends backup_generic_setting {}
  */
 class backup_anonymize_setting extends root_backup_setting {}
 
-/**
- * root setting to control if backup will include
- * user files or no (images, local storage), depends of @backup_users_setting
- * exactly in the same way than @backup_anonymize_setting so we extend from it
- */
-class backup_user_files_setting extends backup_anonymize_setting {}
-
 /**
  * root setting to control if backup will include
  * role assignments or no (any level), depends of @backup_users_setting

backup/moodle2/backup_stepslib.php

@@ -1759,10 +1759,6 @@ protected function define_execution() {
         // List of fileareas we are going to annotate
         $fileareas = array('profile', 'icon');
 
-        if ($this->get_setting_value('user_files')) { // private files only if enabled in settings
-            $fileareas[] = 'private';
-        }
-
         // Fetch all annotated (final) users
         $rs = $DB->get_recordset('backup_ids_temp', array(
             'backupid' => $this->get_backupid(), 'itemname' => 'userfinal'));

backup/moodle2/restore_root_task.class.php

@@ -117,19 +117,6 @@ protected function define_settings() {
         $this->add_setting($roleassignments);
         $users->add_dependency($roleassignments);
 
-        // Define user_files (dependent of users)
-        $defaultvalue = false;                      // Safer default
-        $changeable = false;
-        if (isset($rootsettings['user_files']) && $rootsettings['user_files']) { // Only enabled when available
-            $defaultvalue = true;
-            $changeable = true;
-        }
-        $userfiles = new restore_user_files_setting('user_files', base_setting::IS_BOOLEAN, $defaultvalue);
-        $userfiles->set_ui(new backup_setting_ui_checkbox($userfiles, get_string('rootsettinguserfiles', 'backup')));
-        $userfiles->get_ui()->set_changeable($changeable);
-        $this->add_setting($userfiles);
-        $users->add_dependency($userfiles);
-
         // Define activitites
         $defaultvalue = false;                      // Safer default
         $changeable = false;

backup/moodle2/restore_settingslib.php

@@ -44,13 +44,6 @@ class restore_users_setting extends restore_generic_setting {}
  */
 class restore_role_assignments_setting extends root_backup_setting {}
 
-/**
- * root setting to control if restore will create
- * user files or no (images, local storage), depends of @restore_users_setting
- * exactly in the same way than @restore_role_assignments_setting so we extend from it
- */
-class restore_user_files_setting extends restore_role_assignments_setting {}
-
 /**
  * root setting to control if restore will create activities
  * A lot of other settings (_included at activity levels)

backup/moodle2/restore_stepslib.php

@@ -683,7 +683,7 @@ class restore_create_included_users extends restore_execution_step {
 
     protected function define_execution() {
 
-        restore_dbops::create_included_users($this->get_basepath(), $this->get_restoreid(), $this->get_setting_value('user_files'), $this->task->get_userid());
+        restore_dbops::create_included_users($this->get_basepath(), $this->get_restoreid(), $this->task->get_userid());
     }
 }
 

backup/util/dbops/backup_controller_dbops.class.php

@@ -440,7 +440,6 @@ private static function apply_general_config_defaults(backup_controller $control
             'backup_general_users'              => 'users',
             'backup_general_anonymize'          => 'anonymize',
             'backup_general_role_assignments'   => 'role_assignments',
-            'backup_general_user_files'         => 'user_files',
             'backup_general_activities'         => 'activities',
             'backup_general_blocks'             => 'blocks',
             'backup_general_filters'            => 'filters',

backup/util/dbops/restore_dbops.class.php

@@ -730,7 +730,7 @@ public static function send_files_to_pool($basepath, $restoreid, $component, $fi
      * ready to be created. Also, annotate their newids
      * once created for later reference
      */
-    public static function create_included_users($basepath, $restoreid, $userfiles, $userid) {
+    public static function create_included_users($basepath, $restoreid, $userid) {
         global $CFG, $DB;
 
         $authcache = array(); // Cache to get some bits from authentication plugins
@@ -871,10 +871,6 @@ public static function create_included_users($basepath, $restoreid, $userfiles,
                 // Create user files in pool (profile, icon, private) by context
                 restore_dbops::send_files_to_pool($basepath, $restoreid, 'user', 'icon', $recuser->parentitemid, $userid);
                 restore_dbops::send_files_to_pool($basepath, $restoreid, 'user', 'profile', $recuser->parentitemid, $userid);
-                if ($userfiles) { // private files only if enabled in settings
-                    restore_dbops::send_files_to_pool($basepath, $restoreid, 'user', 'private', $recuser->parentitemid, $userid);
-                }
-
             }
         }
         $rs->close();

backup/util/helper/backup_cron_helper.class.php

@@ -323,7 +323,6 @@ public static function launch_automated_backup($course, $starttime, $userid) {
             $settings = array(
                 'users' => 'backup_auto_users',
                 'role_assignments' => 'backup_auto_role_assignments',
-                'user_files' => 'backup_auto_user_files',
                 'activities' => 'backup_auto_activities',
                 'blocks' => 'backup_auto_blocks',
                 'filters' => 'backup_auto_filters',

backup/util/ui/renderer.php

@@ -97,7 +97,9 @@ public function backup_details($details, $nextstageurl) {
         $html .= html_writer::start_tag('div', array('class'=>'backup-section settings-section'));
         $html .= $this->output->heading(get_string('backupsettings', 'backup'), 2, array('class'=>'header'));
         foreach ($details->root_settings as $label=>$value) {
-            if ($label == 'filename') continue;
+            if ($label == 'filename' or $label == 'user_files') {
+                continue;
+            }
             $html .= $this->backup_detail_pair(get_string('rootsetting'.str_replace('_','',$label), 'backup'), $value?$yestick:$notick);
         }
         $html .= html_writer::end_tag('div');

lang/en/backup.php

@@ -85,7 +85,6 @@
 $string['configgenerallogs'] = 'If enabled logs will be included in backups by default.';
 $string['configgeneralroleassignments'] = 'If enabled by default roles assignments will also be backed up.';
 $string['configgeneraluserscompletion'] = 'If enabled user completion information will be included in backups by default.';
-$string['configgeneraluserfiles'] = 'Sets the default for whether user files will be included in backups.';
 $string['configgeneralusers'] = 'Sets the default for whether to include users in backups.';
 $string['confirmcancel'] = 'Cancel backup';
 $string['confirmcancelquestion'] = 'Are you sure you wish to cancel?
@@ -126,7 +125,6 @@
 $string['generallogs'] = 'Include logs';
 $string['generalroleassignments'] = 'Include role assignments';
 $string['generaluserscompletion'] = 'Include user completion information';
-$string['generaluserfiles'] = 'Include user files';
 $string['generalusers'] = 'Include users';
 $string['importfile'] = 'Import a backup file';
 $string['importbackupstage1action'] = 'Next';
@@ -199,7 +197,6 @@
 $string['rootsettingusers'] = 'Include enrolled users';
 $string['rootsettinganonymize'] = 'Anonymize user information';
 $string['rootsettingroleassignments'] = 'Include user role assignments';
-$string['rootsettinguserfiles'] = 'Include user files';
 $string['rootsettingactivities'] = 'Include activities';
 $string['rootsettingblocks'] = 'Include blocks';
 $string['rootsettingfilters'] = 'Include filters';

lib/db/upgrade.php

@@ -6753,6 +6753,15 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2011070104.09);
     }
 
+    // The ability to backup user (private) files is out completely - MDL-29248
+    if ($oldversion < 2011070104.12) {
+        unset_config('backup_general_user_files', 'backup');
+        unset_config('backup_general_user_files_locked', 'backup');
+        unset_config('backup_auto_user_files', 'backup');
+
+        upgrade_main_savepoint(true, 2011070104.12);
+    }
+
     return true;
 }
 

version.php

@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2011070104.11;              // 20110701      = branching date YYYYMMDD - do not modify!
+$version  = 2011070104.12;              // 20110701      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes