Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MDL-28657 backup: make automated backup filenames site admin-configur…
…able
  • Loading branch information
mackensen committed Apr 20, 2012
1 parent ead4f18 commit 6615028
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions admin/settings/courses.php
Expand Up @@ -138,6 +138,7 @@
400 => '400',
500 => '500');
$temp->add(new admin_setting_configselect('backup/backup_auto_keep', new lang_string('keep'), new lang_string('backupkeephelp'), 1, $keepoptoins));
$temp->add(new admin_setting_configcheckbox('backup/backup_shortname', new lang_string('backup_shortname', 'admin'), new lang_string('backup_shortnamehelp', 'admin'), 0));


$temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), ''));
Expand Down
2 changes: 1 addition & 1 deletion backup/util/helper/backup_cron_helper.class.php
Expand Up @@ -356,7 +356,7 @@ public static function launch_automated_backup($course, $starttime, $userid) {
$dir = null;
}
if (!empty($dir) && $storage !== 0) {
$filename = backup_plan_dbops::get_default_backup_filename($format, $type, $course->id, $users, $anonymised, true);
$filename = backup_plan_dbops::get_default_backup_filename($format, $type, $course->id, $users, $anonymised, !$config->backup_shortname);
$outcome = $file->copy_content_to($dir.'/'.$filename);
if ($outcome && $storage === 1) {
$file->delete();
Expand Down
2 changes: 2 additions & 0 deletions lang/en/admin.php
Expand Up @@ -67,6 +67,8 @@
$string['availablelicenses'] = 'Available licences';
$string['backgroundcolour'] = 'Transparent colour';
$string['backups'] = 'Backups';
$string['backup_shortname'] = 'Use course name in backup filename';
$string['backup_shortnamehelp'] = 'Use the course name as part of the backup filename instead of the course id number.';
$string['badwordsconfig'] = 'Enter your list of bad words separated by commas.';
$string['badwordsdefault'] = 'If the custom list is empty, a default list from the language pack will be used.';
$string['badwordslist'] = 'Custom bad words list';
Expand Down

0 comments on commit 6615028

Please sign in to comment.