From 503581b5d07a799185f19d633428eb2778cfa9ba Mon Sep 17 00:00:00 2001 From: Ankit Kumar Agarwal Date: Wed, 28 Sep 2011 12:11:50 +0530 Subject: [PATCH] MDL-28483 URL adding validation checks and changing field externalurl to not-null --- mod/url/lang/en/url.php | 1 + mod/url/mod_form.php | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/mod/url/lang/en/url.php b/mod/url/lang/en/url.php index 5dc4f4cc6e3..a39674eef9a 100644 --- a/mod/url/lang/en/url.php +++ b/mod/url/lang/en/url.php @@ -45,6 +45,7 @@ $string['displayselectexplain'] = 'Choose display type, unfortunately not all ty $string['externalurl'] = 'External URL'; $string['framesize'] = 'Frame height'; $string['chooseavariable'] = 'Choose a variable...'; +$string['invalidurl'] = 'Entered URL is invalid'; $string['modulename'] = 'URL'; $string['modulenameplural'] = 'URLs'; $string['neverseen'] = 'Never seen'; diff --git a/mod/url/mod_form.php b/mod/url/mod_form.php index ec153125a9d..792c3e7885e 100644 --- a/mod/url/mod_form.php +++ b/mod/url/mod_form.php @@ -50,6 +50,7 @@ class mod_url_mod_form extends moodleform_mod { //------------------------------------------------------- $mform->addElement('header', 'content', get_string('contentheader', 'url')); $mform->addElement('url', 'externalurl', get_string('externalurl', 'url'), array('size'=>'60'), array('usefilepicker'=>true)); + $mform->addRule('externalurl', null, 'required', null, 'client'); //------------------------------------------------------- $mform->addElement('header', 'optionssection', get_string('optionsheader', 'url')); @@ -164,4 +165,14 @@ class mod_url_mod_form extends moodleform_mod { } } + function validation($data, $files) { + $errors = parent::validation($data, $files); + //Validating Entered url + $data['externalurl'] = clean_param($data['externalurl'], PARAM_URL); + if (empty($data['externalurl'])) { + $errors['externalurl'] = get_string('invalidurl', 'url'); + } + return $errors; + } + }