From 9ddd910d78781f29612abe32e0886284ca44f7b7 Mon Sep 17 00:00:00 2001 From: Laurent Opprecht Date: Wed, 16 May 2012 10:11:58 +0200 Subject: [PATCH] add url validation rule for forms --- main/inc/lib/autoload.class.php | 8 +++++- .../lib/formvalidator/FormValidator.class.php | 1 + main/inc/lib/formvalidator/Rule/Url.php | 27 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 main/inc/lib/formvalidator/Rule/Url.php diff --git a/main/inc/lib/autoload.class.php b/main/inc/lib/autoload.class.php index ca33f8902b..78092c7e8a 100644 --- a/main/inc/lib/autoload.class.php +++ b/main/inc/lib/autoload.class.php @@ -123,6 +123,9 @@ class Autoload $result['FillBlanks'] = '/main/exercice/fill_blanks.class.php'; $result['FlatViewDataGenerator'] = '/main/gradebook/lib/flatview_data_generator.class.php'; $result['FlatViewTable'] = '/main/gradebook/lib/fe/flatviewtable.class.php'; + $result['FormElement'] = '/main/media/lib/form_element.class.php'; + $result['FormElementTextarea'] = '/main/media/lib/form_element_textarea.class.php'; + $result['FormRule'] = '/main/media/lib/form_rule.class.php'; $result['FormValidator'] = '/main/inc/lib/formvalidator/FormValidator.class.php'; $result['Forum'] = '/main/coursecopy/classes/Forum.class.php'; $result['ForumCategory'] = '/main/coursecopy/classes/ForumCategory.class.php'; @@ -228,6 +231,8 @@ class Autoload $result['Login'] = '/main/inc/lib/login.lib.php'; $result['LoginRedirection'] = '/main/inc/lib/login_redirection.class.php'; $result['Matching'] = '/main/exercice/matching.class.php'; + $result['Media'] = '/main/media/model/media.class.php'; + $result['MediaForm'] = '/main/media/lib/media_form.class.php'; $result['MessageManager'] = '/main/inc/lib/message.lib.php'; $result['MultipleAnswer'] = '/main/exercice/multiple_answer.class.php'; $result['MultipleAnswerCombination'] = '/main/exercice/multiple_answer_combination.class.php'; @@ -425,6 +430,7 @@ class Autoload $result['xhtdoc'] = '/main/inc/lib/xht.lib.php'; $result['xmddoc'] = '/main/inc/lib/xmd.lib.php'; + return $result; } @@ -487,7 +493,7 @@ class AutoloadClassFinder $this->synch(Chamilo::path('/main')); ksort($this->map); } - + public function __invoke() { $this->run(); diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index 645303c41c..b59afa5329 100644 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/main/inc/lib/formvalidator/FormValidator.class.php @@ -143,6 +143,7 @@ class FormValidator extends HTML_QuickForm $this->registerRule('username', null, 'HTML_QuickForm_Rule_Username', $dir . 'Rule/Username.php'); $this->registerRule('filetype', null, 'HTML_QuickForm_Rule_Filetype', $dir . 'Rule/Filetype.php'); $this->registerRule('multiple_required', 'required', 'HTML_QuickForm_Rule_MultipleRequired', $dir . 'Rule/MultipleRequired.php'); + $this->registerRule('url', null, 'HTML_QuickForm_Rule_Url', $dir . 'Rule/Url.php'); // Modify the default templates $renderer = & $this->defaultRenderer(); diff --git a/main/inc/lib/formvalidator/Rule/Url.php b/main/inc/lib/formvalidator/Rule/Url.php new file mode 100644 index 0000000000..5267aa7f07 --- /dev/null +++ b/main/inc/lib/formvalidator/Rule/Url.php @@ -0,0 +1,27 @@ +