L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-36710 calendar: Implementing proper required rules for filepicker

Browse Source
This commit is contained in:
Ankit Agarwal
2012-11-22 16:55:54 +08:00
parent 17475a2094
commit cfb59253f6
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/managesubscriptions_form.php
+18 -7
View File
@@ -105,19 +105,30 @@ class calendar_addsubscription_form extends moodleform {
* @return array
*/
public function validation($data, $files) {
global $USER;
$errors = parent::validation($data, $files);
if (empty($data['url']) && empty($data['importfile'])) {
if (!empty($data['importfrom']) && $data['importfrom'] == CALENDAR_IMPORT_FROM_FILE) {
if ($data['importfrom'] == CALENDAR_IMPORT_FROM_FILE) {
if (empty($data['importfile'])) {
$errors['importfile'] = get_string('errorrequiredurlorfile', 'calendar');
} else {
$errors['url'] = get_string('errorrequiredurlorfile', 'calendar');
}
} else if (!empty($data['url'])) {
if (clean_param($data['url'], PARAM_URL) !== $data['url']) {
$errors['url'] = get_string('invalidurl', 'error');
// Make sure the file area is not empty and contains only one file.
$draftitemid = $data['importfile'];
$fs = get_file_storage();
$usercontext = context_user::instance($USER->id);
$files = $fs->get_area_files($usercontext->id, 'user', 'draft', $draftitemid, 'id DESC', false);
if (count($files) !== 1) {
$errors['importfile'] = get_string('errorrequiredurlorfile', 'calendar');
}
}
} else if (($data['importfrom'] == CALENDAR_IMPORT_FROM_URL) && (clean_param($data['url'], PARAM_URL) !== $data['url'])) {
$errors['url'] = get_string('invalidurl', 'error');
} else {
// Shouldn't happen.
$errors['url'] = get_string('errorrequiredurlorfile', 'calendar');
}
return $errors;
}