From b262a6fa9c23dbd3c0a3f869ba5c9b148cb2f9ba Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 3 Mar 2011 19:41:15 +0200 Subject: [PATCH] Task #3015 - Cleaning a file. --- main/inc/lib/formvalidator/Rule/HTML.php | 116 ++++++++++------------- 1 file changed, 49 insertions(+), 67 deletions(-) mode change 100644 => 100755 main/inc/lib/formvalidator/Rule/HTML.php diff --git a/main/inc/lib/formvalidator/Rule/HTML.php b/main/inc/lib/formvalidator/Rule/HTML.php old mode 100644 new mode 100755 index 2722a5ae1c..ada9364ab5 --- a/main/inc/lib/formvalidator/Rule/HTML.php +++ b/main/inc/lib/formvalidator/Rule/HTML.php @@ -1,76 +1,58 @@ get_allowed_tags ($mode,$fullpage); - $cleaned_html = kses($html, $allowed_tags); - return $html == $cleaned_html; - } - /** - * Get allowed tags - * @param int $mode NO_HTML, STUDENT_HTML, TEACHER_HTML, - * STUDENT_HTML_FULLPAGE or TEACHER_HTML_FULLPAGE - * @param boolean $fullpage If true, the allowed tags for full-page editing - * are returned. - */ - function get_allowed_tags($mode) - { - //Include the allowed tags - include(dirname(__FILE__).'/allowed_tags.inc.php'); - switch($mode) - { - case NO_HTML: - return array(); - break; - case STUDENT_HTML: - return $allowed_tags_student; - break; - case STUDENT_HTML_FULLPAGE: - return array_merge($allowed_tags_student,$allowed_tags_student_full_page); - break; - case TEACHER_HTML: - return $allowed_tags_teacher; - break; - case TEACHER_HTML_FULLPAGE: - return array_merge($allowed_tags_teacher,$allowed_tags_teacher_full_page); - break; - default: - return array(); - break; - } - } + /** + * Function to validate HTML + * @see HTML_QuickForm_Rule + * @param string $html + * @return boolean True if html is valid + */ + function validate($html, $mode = NO_HTML) + { + $allowed_tags = $this->get_allowed_tags ($mode, $fullpage); + $cleaned_html = kses($html, $allowed_tags); + return $html == $cleaned_html; + } + + /** + * Get allowed tags + * @param int $mode NO_HTML, STUDENT_HTML, TEACHER_HTML, + * STUDENT_HTML_FULLPAGE or TEACHER_HTML_FULLPAGE + * @param boolean $fullpage If true, the allowed tags for full-page editing + * are returned. + */ + function get_allowed_tags($mode) + { + // Include the allowed tags. + include(dirname(__FILE__).'/allowed_tags.inc.php'); + switch($mode) + { + case NO_HTML: + return array(); + break; + case STUDENT_HTML: + return $allowed_tags_student; + break; + case STUDENT_HTML_FULLPAGE: + return array_merge($allowed_tags_student,$allowed_tags_student_full_page); + break; + case TEACHER_HTML: + return $allowed_tags_teacher; + break; + case TEACHER_HTML_FULLPAGE: + return array_merge($allowed_tags_teacher,$allowed_tags_teacher_full_page); + break; + default: + return array(); + break; + } + } } -?> \ No newline at end of file