MDL-22504 Course drag and drop upload - experimental setting is now a checkbox

This commit is contained in:
Davo Smith
2012-05-21 10:03:55 +01:00
parent f684250bda
commit 1ddc3d1f4c
3 changed files with 3 additions and 7 deletions
+1 -3
View File
@@ -13,9 +13,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
$temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', new lang_string('enablesafebrowserintegration', 'admin'), new lang_string('configenablesafebrowserintegration', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('enablegroupmembersonly', new lang_string('enablegroupmembersonly', 'admin'), new lang_string('configenablegroupmembersonly', 'admin'), 0));
$dndopts = array(0 => new lang_string('dnduploadfiles', 'admin'),
1 => new lang_string('dnduploadfilestextlink', 'admin'));
$temp->add(new admin_setting_configselect('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0, $dndopts));
$temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));
$ADMIN->add('experimental', $temp);
+1 -1
View File
@@ -312,7 +312,7 @@ class dndupload_handler {
uasort($this->types, array($this, 'type_compare'));
$ret->types = array();
if ($CFG->dndallowtextandlinks) {
if (!empty($CFG->dndallowtextandlinks)) {
foreach ($this->types as $type) {
if (empty($type->handlers)) {
continue; // Skip any types without registered handlers.
+1 -3
View File
@@ -432,9 +432,7 @@ $string['devicetype'] = 'Device type';
$string['disableuserimages'] = 'Disable user profile images';
$string['displayerrorswarning'] = 'Enabling the PHP setting <em>display_errors</em> is not recommended on production sites because some error messages may reveal sensitive information about your server.';
$string['displayloginfailures'] = 'Display login failures to';
$string['dndallowtextandlinks'] = 'Drag and drop upload allows';
$string['dnduploadfiles'] = 'files only';
$string['dnduploadfilestextlink'] = 'files, text and links';
$string['dndallowtextandlinks'] = 'Drag and drop upload of text/links';
$string['docroot'] = 'Moodle Docs document root';
$string['doctonewwindow'] = 'Open in new window';
$string['download'] = 'Download';