From 9f4ad8a5dde3f8a6d415d62ded0fe577a7580fae Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 27 Feb 2012 04:09:39 +0100 Subject: [PATCH] MDL-29248 backup: take rid of the setting and code handling the 'private' user filearea --- backup/converter/moodle1/handlerlib.php | 1 - backup/moodle2/backup_final_task.class.php | 2 +- backup/moodle2/backup_root_task.class.php | 7 ------- backup/moodle2/backup_settingslib.php | 7 ------- backup/moodle2/backup_stepslib.php | 4 ---- backup/moodle2/restore_root_task.class.php | 13 ------------- backup/moodle2/restore_settingslib.php | 7 ------- backup/moodle2/restore_stepslib.php | 2 +- backup/util/dbops/restore_dbops.class.php | 6 +----- backup/util/ui/renderer.php | 4 +++- lang/en/backup.php | 1 - 11 files changed, 6 insertions(+), 48 deletions(-) diff --git a/backup/converter/moodle1/handlerlib.php b/backup/converter/moodle1/handlerlib.php index f0c97541ca9..dd09fd4c637 100644 --- a/backup/converter/moodle1/handlerlib.php +++ b/backup/converter/moodle1/handlerlib.php @@ -441,7 +441,6 @@ class moodle1_root_handler extends moodle1_xml_handler { 'users' => 0, // @todo how to detect this from moodle.xml? 'anonymize' => 0, 'role_assignments' => 0, - 'user_files' => 0, 'activities' => 1, 'blocks' => 1, 'filters' => 0, diff --git a/backup/moodle2/backup_final_task.class.php b/backup/moodle2/backup_final_task.class.php index 78bab3ce630..66a1aff04dc 100644 --- a/backup/moodle2/backup_final_task.class.php +++ b/backup/moodle2/backup_final_task.class.php @@ -59,7 +59,7 @@ class backup_final_task extends backup_task { // 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) diff --git a/backup/moodle2/backup_root_task.class.php b/backup/moodle2/backup_root_task.class.php index af710e1dd22..6765fbbb360 100644 --- a/backup/moodle2/backup_root_task.class.php +++ b/backup/moodle2/backup_root_task.class.php @@ -91,13 +91,6 @@ class backup_root_task extends backup_task { $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'))); diff --git a/backup/moodle2/backup_settingslib.php b/backup/moodle2/backup_settingslib.php index 6614aee4e14..29641ecbdfd 100644 --- a/backup/moodle2/backup_settingslib.php +++ b/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 diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php index 8454934ba08..3cd1418bfb5 100644 --- a/backup/moodle2/backup_stepslib.php +++ b/backup/moodle2/backup_stepslib.php @@ -1761,10 +1761,6 @@ class backup_annotate_all_user_files extends backup_execution_step { // 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')); diff --git a/backup/moodle2/restore_root_task.class.php b/backup/moodle2/restore_root_task.class.php index a5163e969a7..e547f267ef9 100644 --- a/backup/moodle2/restore_root_task.class.php +++ b/backup/moodle2/restore_root_task.class.php @@ -121,19 +121,6 @@ class restore_root_task extends restore_task { $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; diff --git a/backup/moodle2/restore_settingslib.php b/backup/moodle2/restore_settingslib.php index 6d8b162609a..899af5e896b 100644 --- a/backup/moodle2/restore_settingslib.php +++ b/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) diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php index acf17be39b0..f2babe6e323 100644 --- a/backup/moodle2/restore_stepslib.php +++ b/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()); } } diff --git a/backup/util/dbops/restore_dbops.class.php b/backup/util/dbops/restore_dbops.class.php index 58342b2a59a..25f2e533d1c 100644 --- a/backup/util/dbops/restore_dbops.class.php +++ b/backup/util/dbops/restore_dbops.class.php @@ -730,7 +730,7 @@ abstract class restore_dbops { * 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 @@ abstract class restore_dbops { // 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(); diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php index 08454409e31..b1e302c8681 100644 --- a/backup/util/ui/renderer.php +++ b/backup/util/ui/renderer.php @@ -97,7 +97,9 @@ class core_backup_renderer extends plugin_renderer_base { $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'); diff --git a/lang/en/backup.php b/lang/en/backup.php index 769394751b2..a2cea189cbf 100644 --- a/lang/en/backup.php +++ b/lang/en/backup.php @@ -198,7 +198,6 @@ $string['rootsettings'] = 'Backup settings'; $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';