Merge branch 'MDL-28483-m21' of git://github.com/ankitagarwal/moodle …

…into MOODLE_21_STABLE
moodle · Oct 16, 2011 · 52bc12c · 52bc12c
2 parents 00a3005 + 6bcfb5f
commit 52bc12c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mod/url/lang/en/url.php b/mod/url/lang/en/url.php
@@ -45,6 +45,7 @@
 $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
@@ -50,6 +50,7 @@ function definition() {
         //-------------------------------------------------------
         $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'));
 
@@ -165,4 +166,14 @@ function data_preprocessing(&$default_values) {
         }
     }
 
+    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;
+    }
+
 }