MDL-18177 backup: addressing coding standards

This commit is contained in:
Tim Price
2015-02-20 11:45:23 +11:00
parent 5ef6f97f47
commit d7891c83dd
5 changed files with 11 additions and 7 deletions
+5 -2
View File
@@ -196,7 +196,9 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$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 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$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));
+2 -1
View File
@@ -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.
+1 -2
View File
@@ -1154,7 +1154,6 @@ class backup_groups_structure_step extends backup_structure_step {
// 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 @@ class backup_groups_structure_step extends backup_structure_step {
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));
}
+2 -1
View File
@@ -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
@@ -134,7 +134,7 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
if (!$this->includesubmission) {
return;
}
}
$data = (object)$data;
$oldid = $data->id;