From d7891c83dd3eb22ed9058ba6bfd947f3c97c1fa8 Mon Sep 17 00:00:00 2001 From: Tim Price Date: Wed, 17 Dec 2014 12:55:12 +1100 Subject: [PATCH] MDL-18177 backup: addressing coding standards --- admin/settings/courses.php | 7 +++++-- backup/moodle2/backup_settingslib.php | 3 ++- backup/moodle2/backup_stepslib.php | 3 +-- backup/moodle2/restore_settingslib.php | 3 ++- mod/assign/backup/moodle2/restore_assign_stepslib.php | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/admin/settings/courses.php b/admin/settings/courses.php index 05e64edbb076f..58b92b0bbf606 100644 --- a/admin/settings/courses.php +++ b/admin/settings/courses.php @@ -196,7 +196,9 @@ $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_logs', new lang_string('generallogs','backup'), new lang_string('configgenerallogs','backup'), array('value'=>0, 'locked'=>0))); $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_histories', new lang_string('generalhistories','backup'), new lang_string('configgeneralhistories','backup'), array('value'=>0, 'locked'=>0))); $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_questionbank', new lang_string('generalquestionbank','backup'), new lang_string('configgeneralquestionbank','backup'), array('value'=>1, 'locked'=>0))); - $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_groups', new lang_string('generalgroups','backup'), new lang_string('configgeneralgroups','backup'), array('value'=>1, 'locked'=>0))); + $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_groups', + new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'), + array('value' => 1, 'locked' => 0))); $ADMIN->add('backups', $temp); @@ -273,7 +275,8 @@ $temp->add(new admin_setting_configcheckbox('backup/backup_auto_logs', new lang_string('generallogs', 'backup'), new lang_string('configgenerallogs', 'backup'), 0)); $temp->add(new admin_setting_configcheckbox('backup/backup_auto_histories', new lang_string('generalhistories','backup'), new lang_string('configgeneralhistories','backup'), 0)); $temp->add(new admin_setting_configcheckbox('backup/backup_auto_questionbank', new lang_string('generalquestionbank','backup'), new lang_string('configgeneralquestionbank','backup'), 1)); - $temp->add(new admin_setting_configcheckbox('backup/backup_auto_groups', new lang_string('generalgroups','backup'), new lang_string('configgeneralgroups','backup'), 1)); + $temp->add(new admin_setting_configcheckbox('backup/backup_auto_groups', new lang_string('generalgroups', 'backup'), + new lang_string('configgeneralgroups', 'backup'), 1)); //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_messages', new lang_string('messages', 'message'), new lang_string('backupmessageshelp','message'), 0)); //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', new lang_string('blogs', 'blog'), new lang_string('backupblogshelp','blog'), 0)); diff --git a/backup/moodle2/backup_settingslib.php b/backup/moodle2/backup_settingslib.php index af2b70c5242c0..9bdc3927e7137 100644 --- a/backup/moodle2/backup_settingslib.php +++ b/backup/moodle2/backup_settingslib.php @@ -69,7 +69,8 @@ class backup_users_setting extends backup_generic_setting {} * root setting to control if backup will include group information * depends on @backup_users_setting */ -class backup_groups_setting extends backup_generic_setting {} +class backup_groups_setting extends backup_generic_setting { +} /** * root setting to control if backup will include activities or no. diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php index 0b171c0a4474c..c761ebad83bee 100644 --- a/backup/moodle2/backup_stepslib.php +++ b/backup/moodle2/backup_stepslib.php @@ -1154,7 +1154,6 @@ protected function define_structure() { // To know if we are including groups and groupings. $groupinfo = $this->get_setting_value('groups'); - // Define each element separated $groups = new backup_nested_element('groups'); @@ -1210,7 +1209,7 @@ protected function define_structure() { AND bi.itemname = 'groupingfinal'", array(backup::VAR_BACKUPID)); $groupinggroup->set_source_table('groupings_groups', array('groupingid' => backup::VAR_PARENTID)); - // This only happens if we are including users + // This only happens if we are including users. if ($userinfo) { $member->set_source_table('groups_members', array('groupid' => backup::VAR_PARENTID)); } diff --git a/backup/moodle2/restore_settingslib.php b/backup/moodle2/restore_settingslib.php index 9c5a51c12de0d..9ef784db87745 100644 --- a/backup/moodle2/restore_settingslib.php +++ b/backup/moodle2/restore_settingslib.php @@ -47,7 +47,8 @@ class restore_users_setting extends restore_generic_setting {} * root setting to control if restore will create groups/grouping information. * depends on @restore_users_setting */ -class restore_groups_setting extends restore_generic_setting {} +class restore_groups_setting extends restore_generic_setting { +} /** * root setting to control if restore will create role assignments diff --git a/mod/assign/backup/moodle2/restore_assign_stepslib.php b/mod/assign/backup/moodle2/restore_assign_stepslib.php index 9f0e5e6782757..1a6bba36672ee 100644 --- a/mod/assign/backup/moodle2/restore_assign_stepslib.php +++ b/mod/assign/backup/moodle2/restore_assign_stepslib.php @@ -134,7 +134,7 @@ protected function process_assign_submission($data) { if (!$this->includesubmission) { return; - } + } $data = (object)$data; $oldid = $data->id;