mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'MDL-64010-master' of git://github.com/abgreeve/moodle
This commit is contained in:
commit
dd2d82e55c
@ -76,4 +76,19 @@ class competency_alignment_form extends moodleform {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate the data from the form.
|
||||
*
|
||||
* @param array $data form data
|
||||
* @param array $files form files
|
||||
* @return array An array of error messages.
|
||||
*/
|
||||
public function validation($data, $files) {
|
||||
$errors = parent::validation($data, $files);
|
||||
if (!empty($data['targeturl']) && !preg_match('@^https?://.+@', $data['targeturl'])) {
|
||||
$errors['targeturl'] = get_string('invalidurl', 'badges');
|
||||
}
|
||||
return $errors;
|
||||
}
|
||||
}
|
@ -211,6 +211,10 @@ class edit_details_form extends moodleform {
|
||||
$errors['name'] = get_string('error:duplicatename', 'badges');
|
||||
}
|
||||
|
||||
if ($data['imageauthorurl'] && !preg_match('@^https?://.+@', $data['imageauthorurl'])) {
|
||||
$errors['imageauthorurl'] = get_string('invalidurl', 'badges');
|
||||
}
|
||||
|
||||
return $errors;
|
||||
}
|
||||
}
|
||||
|
@ -86,6 +86,12 @@ class endorsement_form extends moodleform {
|
||||
if ($data['issueremail'] && !validate_email($data['issueremail'])) {
|
||||
$errors['issueremail'] = get_string('invalidemail');
|
||||
}
|
||||
if ($data['issuerurl'] && !preg_match('@^https?://.+@', $data['issuerurl'])) {
|
||||
$errors['issuerurl'] = get_string('invalidurl', 'badges');
|
||||
}
|
||||
if ($data['claimid'] && !preg_match('@^https?://.+@', $data['claimid'])) {
|
||||
$errors['claimid'] = get_string('invalidurl', 'badges');
|
||||
}
|
||||
return $errors;
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user