Update to 1.9.9, from maintainer Wen Heping in PR 43483.

* Some general minor bugs fixed in different areas.
* Four security fixes (see below).

Some of these vulnerabilities are potentially serious so we strongly
recommend you upgrade.

Full details to be released soon.

3 files changed, 248 insertions, 97 deletions

diff --git a/www/moodle/Makefile b/www/moodle/Makefile
index 89ea189d1a5..c9f6154ed51 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/06/15 08:16:12 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/16 06:40:52 wiz Exp $
 
-DISTNAME=	moodle-1.9.8
-PKGREVISION=	1
+DISTNAME=	moodle-1.9.9
 CATEGORIES=	www
 MASTER_SITES=	http://download.moodle.org/stable19/ \
 		http://download2.moodle.org/stable19/ \
@@ -19,12 +18,13 @@ DEPENDS+=	${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=5.2.0:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-xmlrpc>=5.2.0:../../net/php-xmlrpc
+DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib
 
 EGDIR=			share/examples/moodle
 MOODLEDIR=		${PREFIX}/share/moodle
 MOODLEDATADIR=		${PREFIX}/share/moodledata
 
-#PKG_DESTDIR_SUPPORT=	user-destdir
+PKG_DESTDIR_SUPPORT=	destdir
 INSTALLATION_DIRS=	${EGDIR} share/moodle
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/moodle/PLIST b/www/moodle/PLIST
index 1524222b568..9a14f0114bd 100644
--- a/www/moodle/PLIST
+++ b/www/moodle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/04 09:20:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/06/16 06:40:52 wiz Exp $
 share/examples/moodle/moodle.conf
 share/moodle/COPYING.txt
 share/moodle/README.txt
@@ -90,7 +90,6 @@ share/moodle/admin/roles/override.html
 share/moodle/admin/roles/override.php
 share/moodle/admin/roles/tabs.php
 share/moodle/admin/search.php
-share/moodle/admin/settings.php
 share/moodle/admin/settings/appearance.php
 share/moodle/admin/settings/courses.php
 share/moodle/admin/settings/frontpage.php
@@ -105,6 +104,7 @@ share/moodle/admin/settings/server.php
 share/moodle/admin/settings/top.php
 share/moodle/admin/settings/unsupported.php
 share/moodle/admin/settings/users.php
+share/moodle/admin/settings.php
 share/moodle/admin/stickyblocks.php
 share/moodle/admin/timezone.php
 share/moodle/admin/timezoneimport.php
@@ -115,7 +115,6 @@ share/moodle/admin/uploadpicture.php
 share/moodle/admin/uploadpicture_form.php
 share/moodle/admin/uploaduser.php
 share/moodle/admin/uploaduser_form.php
-share/moodle/admin/user.php
 share/moodle/admin/user/lib.php
 share/moodle/admin/user/user_bulk.php
 share/moodle/admin/user/user_bulk_confirm.php
@@ -126,6 +125,7 @@ share/moodle/admin/user/user_bulk_forcepasswordchange.php
 share/moodle/admin/user/user_bulk_forms.php
 share/moodle/admin/user/user_bulk_message.php
 share/moodle/admin/user/user_message_form.php
+share/moodle/admin/user.php
 share/moodle/admin/xmldb/README.txt
 share/moodle/admin/xmldb/actions/XMLDBAction.class.php
 share/moodle/admin/xmldb/actions/check_bigints/check_bigints.class.php
@@ -191,19 +191,20 @@ share/moodle/admin/xmldb/actions/view_xml/view_xml.class.php
 share/moodle/admin/xmldb/index.php
 share/moodle/admin/xmldb/javascript.php
 share/moodle/auth/README.txt
+share/moodle/auth/cas/CAS/CAS/PGTStorage/pgt-db.php
+share/moodle/auth/cas/CAS/CAS/PGTStorage/pgt-file.php
+share/moodle/auth/cas/CAS/CAS/PGTStorage/pgt-main.php
+share/moodle/auth/cas/CAS/CAS/client.php
+share/moodle/auth/cas/CAS/CAS/domxml-php4-to-php5.php
+share/moodle/auth/cas/CAS/CAS/languages/catalan.php
+share/moodle/auth/cas/CAS/CAS/languages/english.php
+share/moodle/auth/cas/CAS/CAS/languages/french.php
+share/moodle/auth/cas/CAS/CAS/languages/german.php
+share/moodle/auth/cas/CAS/CAS/languages/greek.php
+share/moodle/auth/cas/CAS/CAS/languages/japanese.php
+share/moodle/auth/cas/CAS/CAS/languages/languages.php
+share/moodle/auth/cas/CAS/CAS/languages/spanish.php
 share/moodle/auth/cas/CAS/CAS.php
-share/moodle/auth/cas/CAS/PGTStorage/pgt-db.php
-share/moodle/auth/cas/CAS/PGTStorage/pgt-file.php
-share/moodle/auth/cas/CAS/PGTStorage/pgt-main.php
-share/moodle/auth/cas/CAS/client.php
-share/moodle/auth/cas/CAS/domxml-php4-php5.php
-share/moodle/auth/cas/CAS/languages/english.php
-share/moodle/auth/cas/CAS/languages/french.php
-share/moodle/auth/cas/CAS/languages/german.php
-share/moodle/auth/cas/CAS/languages/greek.php
-share/moodle/auth/cas/CAS/languages/japanese.php
-share/moodle/auth/cas/CAS/languages/languages.php
-share/moodle/auth/cas/CAS/readme_moodle.txt
 share/moodle/auth/cas/README-CAS
 share/moodle/auth/cas/auth.php
 share/moodle/auth/cas/cas_form.html
@@ -477,10 +478,10 @@ share/moodle/blocks/search_forums/db/upgrade.php
 share/moodle/blocks/search_forums/styles.php
 share/moodle/blocks/section_links/block_section_links.php
 share/moodle/blocks/section_links/config_instance.html
-share/moodle/blocks/section_links/settings.php
 share/moodle/blocks/section_links/db/mysql.php
 share/moodle/blocks/section_links/db/postgres7.php
 share/moodle/blocks/section_links/db/upgrade.php
+share/moodle/blocks/section_links/settings.php
 share/moodle/blocks/site_main_menu/block_site_main_menu.php
 share/moodle/blocks/social_activities/block_social_activities.php
 share/moodle/blocks/social_activities/db/mysql.php
@@ -546,13 +547,13 @@ share/moodle/course/format/weeks/config.php
 share/moodle/course/format/weeks/format.php
 share/moodle/course/format/weekscss/config.php
 share/moodle/course/format/weekscss/format.php
-share/moodle/course/import.php
 share/moodle/course/import/activities/import_form.php
 share/moodle/course/import/activities/index.php
 share/moodle/course/import/activities/mod.php
 share/moodle/course/import/groups/import_form.php
 share/moodle/course/import/groups/index.php
 share/moodle/course/import/groups/mod.php
+share/moodle/course/import.php
 share/moodle/course/importstudents.html
 share/moodle/course/importstudents.php
 share/moodle/course/index.php
@@ -567,7 +568,6 @@ share/moodle/course/moodleform_mod.php
 share/moodle/course/pending.php
 share/moodle/course/recent.php
 share/moodle/course/recent_form.php
-share/moodle/course/report.php
 share/moodle/course/report/log/db/access.php
 share/moodle/course/report/log/graph.php
 share/moodle/course/report/log/index.php
@@ -591,6 +591,7 @@ share/moodle/course/report/stats/lib.php
 share/moodle/course/report/stats/mod.php
 share/moodle/course/report/stats/report.php
 share/moodle/course/report/stats/version.php
+share/moodle/course/report.php
 share/moodle/course/request.php
 share/moodle/course/request_form.php
 share/moodle/course/reset.php
@@ -822,7 +823,6 @@ share/moodle/group/overview.php
 share/moodle/group/tabs.php
 share/moodle/help.php
 share/moodle/index.php
-share/moodle/install.php
 share/moodle/install/README.txt
 share/moodle/install/lang/af_utf8/installer.php
 share/moodle/install/lang/ar_utf8/installer.php
@@ -918,6 +918,7 @@ share/moodle/install/lang/zh_tw_utf8/installer.php
 share/moodle/install/lang/zu_utf8/installer.php
 share/moodle/install/stringnames.txt
 share/moodle/install/welcome.html
+share/moodle/install.php
 share/moodle/iplookup/README.txt
 share/moodle/iplookup/earth.jpeg
 share/moodle/iplookup/index.php
@@ -1113,7 +1114,6 @@ share/moodle/lang/en_utf8/help/expirynotify.html
 share/moodle/lang/en_utf8/help/expirynotifystudents.html
 share/moodle/lang/en_utf8/help/expirythreshold.html
 share/moodle/lang/en_utf8/help/extendenrol.html
-share/moodle/lang/en_utf8/help/filters.html
 share/moodle/lang/en_utf8/help/filters/courserole.html
 share/moodle/lang/en_utf8/help/filters/date.html
 share/moodle/lang/en_utf8/help/filters/globalrole.html
@@ -1121,6 +1121,7 @@ share/moodle/lang/en_utf8/help/filters/profilefield.html
 share/moodle/lang/en_utf8/help/filters/select.html
 share/moodle/lang/en_utf8/help/filters/simpleselect.html
 share/moodle/lang/en_utf8/help/filters/text.html
+share/moodle/lang/en_utf8/help/filters.html
 share/moodle/lang/en_utf8/help/forcepasswordchange.html
 share/moodle/lang/en_utf8/help/forum/allowdiscussions.html
 share/moodle/lang/en_utf8/help/forum/assessaggregate.html
@@ -1197,6 +1198,7 @@ share/moodle/lang/en_utf8/help/grade/gradepass.html
 share/moodle/lang/en_utf8/help/grade/gradetype.html
 share/moodle/lang/en_utf8/help/grade/hidden.html
 share/moodle/lang/en_utf8/help/grade/hiddenuntil.html
+share/moodle/lang/en_utf8/help/grade/hidetotalifhiddenitems.html
 share/moodle/lang/en_utf8/help/grade/idnumber.html
 share/moodle/lang/en_utf8/help/grade/importoutcomes.html
 share/moodle/lang/en_utf8/help/grade/index.html
@@ -2275,20 +2277,18 @@ share/moodle/lib/htaccess
 share/moodle/lib/html2text.php
 share/moodle/lib/html2text_readme.txt
 share/moodle/lib/htmlpurifier/CREDITS
-share/moodle/lib/htmlpurifier/HTMLPurifier.auto.php
-share/moodle/lib/htmlpurifier/HTMLPurifier.func.php
-share/moodle/lib/htmlpurifier/HTMLPurifier.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrCollections.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Background.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Border.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Color.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Composite.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Filter.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Font.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Length.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
@@ -2296,8 +2296,10 @@ share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Number.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS/URI.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/CSS.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/Enum.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/HTML/Bool.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/HTML/Class.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/HTML/Color.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/HTML/ID.php
@@ -2310,13 +2312,14 @@ share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/Integer.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/Lang.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/Switch.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/Text.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Email.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Email.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Host.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv4.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/IPv6.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/URI.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/Background.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/BdoDir.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/BgColor.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
@@ -2324,13 +2327,21 @@ share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/Border.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/ImgRequired.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/ImgSpace.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/Input.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/Lang.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/Length.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/Name.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/NameSync.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/SafeObject.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/SafeParam.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform/Textarea.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTransform.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrTypes.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/AttrValidator.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Bootstrap.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/CSSDefinition.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef/Chameleon.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef/Custom.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef/Empty.php
@@ -2338,113 +2349,253 @@ share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef/Optional.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef/Required.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef/Table.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ChildDef.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Config.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigDef.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigDef/Directive.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigDef/DirectiveAlias.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigDef/Namespace.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/Exception.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/Interchange.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/Validator.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema/info.ini
+share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
 share/moodle/lib/htmlpurifier/HTMLPurifier/ConfigSchema.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ContentSets.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Context.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Definition.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Decorator.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Null.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/README
 share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCache.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/DefinitionCacheFactory.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Doctype.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/DoctypeRegistry.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ElementDef.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Encoder.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/EntityLookup.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/EntityLookup/entities.ser
+share/moodle/lib/htmlpurifier/HTMLPurifier/EntityLookup.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/EntityParser.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/Error.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/ErrorCollector.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/Filter.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/ErrorStruct.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Exception.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Filter/YouTube.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Filter.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Generator.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLDefinition.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Bdo.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Edit.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Forms.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Hypertext.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Image.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Legacy.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/List.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Name.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Object.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Presentation.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Proprietary.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Ruby.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/SafeObject.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Scripting.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tables.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Target.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Text.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLStrict.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/Tidy.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModule.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/HTMLModuleManager.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/IDAccumulator.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/Injector.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Injector/AutoParagraph.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Injector/DisplayLinkURI.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Injector/Linkify.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Injector/PurifierLinkify.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/Language.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Injector/RemoveEmpty.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Injector/SafeObject.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Injector.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Language/classes/en-x-test.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Language/messages/en-x-test.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Language/messages/en-x-testmini.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Language/messages/en.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Language.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/LanguageFactory.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Length.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/Lexer.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Lexer/DirectLex.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Lexer/PEARSax3.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Lexer.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/PercentEncoder.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/Printer.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Printer/CSSDefinition.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Printer/ConfigForm.css
 share/moodle/lib/htmlpurifier/HTMLPurifier/Printer/ConfigForm.js
 share/moodle/lib/htmlpurifier/HTMLPurifier/Printer/ConfigForm.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Printer/HTMLDefinition.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Printer.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/PropertyList.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/PropertyListIterator.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy/Composite.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy/Core.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy/FixNesting.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy/MakeWellFormed.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy/ValidateAttributes.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/TagTransform.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Strategy.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/StringHash.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/StringHashParser.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/TagTransform/Font.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/TagTransform/Simple.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/TagTransform.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Token/Comment.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Token/Empty.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Token/End.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Token/Start.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Token/Tag.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/Token/Text.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/Token.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/TokenFactory.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URI.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIDefinition.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/URIFilter.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIFilter/DisableExternal.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIFilter/HostBlacklist.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/URIFilter/Munge.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/URIFilter.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIParser.php
-share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme/data.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme/ftp.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme/http.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme/https.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme/mailto.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme/news.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme/nntp.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/URIScheme.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/URISchemeRegistry.php
 share/moodle/lib/htmlpurifier/HTMLPurifier/UnitConverter.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/VarParser/Flexible.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/VarParser/Native.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/VarParser.php
+share/moodle/lib/htmlpurifier/HTMLPurifier/VarParserException.php
+share/moodle/lib/htmlpurifier/HTMLPurifier.php
+share/moodle/lib/htmlpurifier/HTMLPurifier.safe-includes.php
 share/moodle/lib/htmlpurifier/readme_moodle.txt
 share/moodle/lib/index.html
 share/moodle/lib/javascript-mod.php
@@ -2479,7 +2630,6 @@ share/moodle/lib/mp3player/readme.txt
 share/moodle/lib/odbc.php
 share/moodle/lib/odslib.class.php
 share/moodle/lib/olson.php
-share/moodle/lib/overlib.js
 share/moodle/lib/overlib/overlib.js
 share/moodle/lib/overlib/overlib_anchor.js
 share/moodle/lib/overlib/overlib_centerpopup.js
@@ -2491,6 +2641,7 @@ share/moodle/lib/overlib/overlib_followscroll.js
 share/moodle/lib/overlib/overlib_hideform.js
 share/moodle/lib/overlib/overlib_setonoff.js
 share/moodle/lib/overlib/overlib_shadow.js
+share/moodle/lib/overlib.js
 share/moodle/lib/pagelib.php
 share/moodle/lib/pclzip/gnu-lgpl.txt
 share/moodle/lib/pclzip/index.html
@@ -2501,7 +2652,6 @@ share/moodle/lib/pdflib.php
 share/moodle/lib/pear/Auth/RADIUS.php
 share/moodle/lib/pear/Console/Getopt.php
 share/moodle/lib/pear/Crypt/CHAP.php
-share/moodle/lib/pear/HTML/AJAX.php
 share/moodle/lib/pear/HTML/AJAX/Action.php
 share/moodle/lib/pear/HTML/AJAX/Debug.php
 share/moodle/lib/pear/HTML/AJAX/Helper.php
@@ -2514,21 +2664,21 @@ share/moodle/lib/pear/HTML/AJAX/Serializer/PHP.php
 share/moodle/lib/pear/HTML/AJAX/Serializer/Urlencoded.php
 share/moodle/lib/pear/HTML/AJAX/Serializer/XML.php
 share/moodle/lib/pear/HTML/AJAX/Server.php
+share/moodle/lib/pear/HTML/AJAX.php
 share/moodle/lib/pear/HTML/Common.php
-share/moodle/lib/pear/HTML/QuickForm.php
 share/moodle/lib/pear/HTML/QuickForm/DHTMLRulesTableless.php
-share/moodle/lib/pear/HTML/QuickForm/Renderer.php
 share/moodle/lib/pear/HTML/QuickForm/Renderer/Array.php
 share/moodle/lib/pear/HTML/QuickForm/Renderer/Default.php
 share/moodle/lib/pear/HTML/QuickForm/Renderer/Object.php
 share/moodle/lib/pear/HTML/QuickForm/Renderer/Tableless.php
-share/moodle/lib/pear/HTML/QuickForm/Rule.php
+share/moodle/lib/pear/HTML/QuickForm/Renderer.php
 share/moodle/lib/pear/HTML/QuickForm/Rule/Callback.php
 share/moodle/lib/pear/HTML/QuickForm/Rule/Compare.php
 share/moodle/lib/pear/HTML/QuickForm/Rule/Email.php
 share/moodle/lib/pear/HTML/QuickForm/Rule/Range.php
 share/moodle/lib/pear/HTML/QuickForm/Rule/Regex.php
 share/moodle/lib/pear/HTML/QuickForm/Rule/Required.php
+share/moodle/lib/pear/HTML/QuickForm/Rule.php
 share/moodle/lib/pear/HTML/QuickForm/RuleRegistry.php
 share/moodle/lib/pear/HTML/QuickForm/advcheckbox.php
 share/moodle/lib/pear/HTML/QuickForm/autocomplete.php
@@ -2555,6 +2705,7 @@ share/moodle/lib/pear/HTML/QuickForm/submit.php
 share/moodle/lib/pear/HTML/QuickForm/text.php
 share/moodle/lib/pear/HTML/QuickForm/textarea.php
 share/moodle/lib/pear/HTML/QuickForm/xbutton.php
+share/moodle/lib/pear/HTML/QuickForm.php
 share/moodle/lib/pear/HTTP/WebDAV/AUTHORS
 share/moodle/lib/pear/HTTP/WebDAV/COPYING
 share/moodle/lib/pear/HTTP/WebDAV/LICENSE
@@ -2563,20 +2714,20 @@ share/moodle/lib/pear/HTTP/WebDAV/Server.php
 share/moodle/lib/pear/HTTP/WebDAV/Tools/_parse_lockinfo.php
 share/moodle/lib/pear/HTTP/WebDAV/Tools/_parse_propfind.php
 share/moodle/lib/pear/HTTP/WebDAV/Tools/_parse_proppatch.php
-share/moodle/lib/pear/OLE.php
-share/moodle/lib/pear/OLE/PPS.php
 share/moodle/lib/pear/OLE/PPS/File.php
 share/moodle/lib/pear/OLE/PPS/Root.php
+share/moodle/lib/pear/OLE/PPS.php
+share/moodle/lib/pear/OLE.php
 share/moodle/lib/pear/PEAR.php
 share/moodle/lib/pear/README.txt
 share/moodle/lib/pear/README_MOODLE.txt
-share/moodle/lib/pear/Spreadsheet/Excel/Writer.php
 share/moodle/lib/pear/Spreadsheet/Excel/Writer/BIFFwriter.php
 share/moodle/lib/pear/Spreadsheet/Excel/Writer/Format.php
 share/moodle/lib/pear/Spreadsheet/Excel/Writer/Parser.php
 share/moodle/lib/pear/Spreadsheet/Excel/Writer/Validator.php
 share/moodle/lib/pear/Spreadsheet/Excel/Writer/Workbook.php
 share/moodle/lib/pear/Spreadsheet/Excel/Writer/Worksheet.php
+share/moodle/lib/pear/Spreadsheet/Excel/Writer.php
 share/moodle/lib/phpmailer/ChangeLog.txt
 share/moodle/lib/phpmailer/LICENSE
 share/moodle/lib/phpmailer/README
@@ -2628,7 +2779,6 @@ share/moodle/lib/simpletest/testgradelib.php
 share/moodle/lib/simpletest/testmathslib.php
 share/moodle/lib/simpletest/testmoodlelib.php
 share/moodle/lib/simpletest/testweblib.php
-share/moodle/lib/simpletestlib.php
 share/moodle/lib/simpletestlib/BACKLOG
 share/moodle/lib/simpletestlib/HELP_MY_TESTS_DONT_WORK_ANYMORE
 share/moodle/lib/simpletestlib/LICENSE
@@ -2679,6 +2829,7 @@ share/moodle/lib/simpletestlib/url.php
 share/moodle/lib/simpletestlib/user_agent.php
 share/moodle/lib/simpletestlib/web_tester.php
 share/moodle/lib/simpletestlib/xml.php
+share/moodle/lib/simpletestlib.php
 share/moodle/lib/smarty/COPYING.lib
 share/moodle/lib/smarty/Config_File.class.php
 share/moodle/lib/smarty/Smarty.class.php
@@ -3150,13 +3301,13 @@ share/moodle/lib/yui/profilerviewer/assets/skins/sam/wait.gif
 share/moodle/lib/yui/profilerviewer/profilerviewer-beta-debug.js
 share/moodle/lib/yui/profilerviewer/profilerviewer-beta-min.js
 share/moodle/lib/yui/profilerviewer/profilerviewer-beta.js
-share/moodle/lib/yui/reset-fonts-grids/README
-share/moodle/lib/yui/reset-fonts-grids/reset-fonts-grids.css
-share/moodle/lib/yui/reset-fonts/README
-share/moodle/lib/yui/reset-fonts/reset-fonts.css
 share/moodle/lib/yui/reset/README
 share/moodle/lib/yui/reset/reset-min.css
 share/moodle/lib/yui/reset/reset.css
+share/moodle/lib/yui/reset-fonts/README
+share/moodle/lib/yui/reset-fonts/reset-fonts.css
+share/moodle/lib/yui/reset-fonts-grids/README
+share/moodle/lib/yui/reset-fonts-grids/reset-fonts-grids.css
 share/moodle/lib/yui/resize/README
 share/moodle/lib/yui/resize/assets/resize-core.css
 share/moodle/lib/yui/resize/assets/skins/sam/layout_sprite.png
@@ -3206,18 +3357,18 @@ share/moodle/lib/yui/uploader/uploader-experimental-min.js
 share/moodle/lib/yui/uploader/uploader-experimental.js
 share/moodle/lib/yui/utilities/README
 share/moodle/lib/yui/utilities/utilities.js
-share/moodle/lib/yui/yahoo-dom-event/README
-share/moodle/lib/yui/yahoo-dom-event/yahoo-dom-event.js
 share/moodle/lib/yui/yahoo/README
 share/moodle/lib/yui/yahoo/yahoo-debug.js
 share/moodle/lib/yui/yahoo/yahoo-min.js
 share/moodle/lib/yui/yahoo/yahoo.js
-share/moodle/lib/yui/yuiloader-dom-event/README
-share/moodle/lib/yui/yuiloader-dom-event/yuiloader-dom-event.js
+share/moodle/lib/yui/yahoo-dom-event/README
+share/moodle/lib/yui/yahoo-dom-event/yahoo-dom-event.js
 share/moodle/lib/yui/yuiloader/README
 share/moodle/lib/yui/yuiloader/yuiloader-debug.js
 share/moodle/lib/yui/yuiloader/yuiloader-min.js
 share/moodle/lib/yui/yuiloader/yuiloader.js
+share/moodle/lib/yui/yuiloader-dom-event/README
+share/moodle/lib/yui/yuiloader-dom-event/yuiloader-dom-event.js
 share/moodle/lib/yui/yuitest/README
 share/moodle/lib/yui/yuitest/assets/skins/sam/yuitest-skin.css
 share/moodle/lib/yui/yuitest/assets/skins/sam/yuitest.css
@@ -3351,7 +3502,6 @@ share/moodle/mod/data/db/upgrade.php
 share/moodle/mod/data/edit.php
 share/moodle/mod/data/export.php
 share/moodle/mod/data/export_form.php
-share/moodle/mod/data/field.php
 share/moodle/mod/data/field/checkbox/field.class.php
 share/moodle/mod/data/field/checkbox/icon.gif
 share/moodle/mod/data/field/checkbox/mod.html
@@ -3389,6 +3539,7 @@ share/moodle/mod/data/field/textarea/mod.html
 share/moodle/mod/data/field/url/field.class.php
 share/moodle/mod/data/field/url/icon.gif
 share/moodle/mod/data/field/url/mod.html
+share/moodle/mod/data/field.php
 share/moodle/mod/data/filter.php
 share/moodle/mod/data/icon.gif
 share/moodle/mod/data/import.php
@@ -3397,7 +3548,6 @@ share/moodle/mod/data/js.php
 share/moodle/mod/data/lib.php
 share/moodle/mod/data/mod_form.php
 share/moodle/mod/data/pagelib.php
-share/moodle/mod/data/preset.php
 share/moodle/mod/data/preset/imagegallery/addtemplate.html
 share/moodle/mod/data/preset/imagegallery/csstemplate.css
 share/moodle/mod/data/preset/imagegallery/jstemplate.js
@@ -3408,6 +3558,7 @@ share/moodle/mod/data/preset/imagegallery/preset.xml
 share/moodle/mod/data/preset/imagegallery/rsstemplate.html
 share/moodle/mod/data/preset/imagegallery/rsstitletemplate.html
 share/moodle/mod/data/preset/imagegallery/singletemplate.html
+share/moodle/mod/data/preset.php
 share/moodle/mod/data/preset_class.php
 share/moodle/mod/data/preset_new.php
 share/moodle/mod/data/rate.php
@@ -3478,7 +3629,6 @@ share/moodle/mod/glossary/export.php
 share/moodle/mod/glossary/exportentry.php
 share/moodle/mod/glossary/exportfile.php
 share/moodle/mod/glossary/filter.php
-share/moodle/mod/glossary/formats.php
 share/moodle/mod/glossary/formats/README.txt
 share/moodle/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
 share/moodle/mod/glossary/formats/continuous/continuous_format.php
@@ -3488,6 +3638,7 @@ share/moodle/mod/glossary/formats/entrylist/entrylist_format.php
 share/moodle/mod/glossary/formats/faq/faq_format.php
 share/moodle/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
 share/moodle/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
+share/moodle/mod/glossary/formats.php
 share/moodle/mod/glossary/icon.gif
 share/moodle/mod/glossary/icon1.gif
 share/moodle/mod/glossary/import.html
@@ -3527,18 +3678,17 @@ share/moodle/mod/hotpot/lib.php
 share/moodle/mod/hotpot/mediaplayers/moodle/filter.php
 share/moodle/mod/hotpot/mod_form.js
 share/moodle/mod/hotpot/mod_form.php
-share/moodle/mod/hotpot/report.php
 share/moodle/mod/hotpot/report/click/report.php
 share/moodle/mod/hotpot/report/default.php
 share/moodle/mod/hotpot/report/fullstat/report.php
 share/moodle/mod/hotpot/report/overview/report.php
 share/moodle/mod/hotpot/report/simplestat/report.php
+share/moodle/mod/hotpot/report.php
 share/moodle/mod/hotpot/restorelib.php
 share/moodle/mod/hotpot/review.php
 share/moodle/mod/hotpot/settings.php
 share/moodle/mod/hotpot/show.php
 share/moodle/mod/hotpot/template/default.php
-share/moodle/mod/hotpot/template/v6.php
 share/moodle/mod/hotpot/template/v6/djmatch6.ht_
 share/moodle/mod/hotpot/template/v6/djmatch6.js_
 share/moodle/mod/hotpot/template/v6/djmix6.ht_
@@ -3573,6 +3723,7 @@ share/moodle/mod/hotpot/template/v6/jquiz6.js_
 share/moodle/mod/hotpot/template/v6/masher.ht_
 share/moodle/mod/hotpot/template/v6/mashernav.ht_
 share/moodle/mod/hotpot/template/v6/testbrowsercheck.htm
+share/moodle/mod/hotpot/template/v6.php
 share/moodle/mod/hotpot/version.php
 share/moodle/mod/hotpot/view.php
 share/moodle/mod/index.html
@@ -3697,7 +3848,6 @@ share/moodle/mod/quiz/pix/sa.gif
 share/moodle/mod/quiz/pix/tf.gif
 share/moodle/mod/quiz/protect_js.php
 share/moodle/mod/quiz/quiz.js
-share/moodle/mod/quiz/report.php
 share/moodle/mod/quiz/report/analysis/report.php
 share/moodle/mod/quiz/report/default.php
 share/moodle/mod/quiz/report/grading/report.php
@@ -3706,6 +3856,7 @@ share/moodle/mod/quiz/report/overview/overviewsettings_form.php
 share/moodle/mod/quiz/report/overview/report.php
 share/moodle/mod/quiz/report/regrade/report.php
 share/moodle/mod/quiz/report/reportlib.php
+share/moodle/mod/quiz/report.php
 share/moodle/mod/quiz/restorelib.php
 share/moodle/mod/quiz/restorelibpre15.php
 share/moodle/mod/quiz/review.php
@@ -4169,7 +4320,6 @@ share/moodle/question/export.php
 share/moodle/question/export_form.php
 share/moodle/question/exportfile.php
 share/moodle/question/file.php
-share/moodle/question/format.php
 share/moodle/question/format/README.txt
 share/moodle/question/format/aiken/format.php
 share/moodle/question/format/blackboard/format.php
@@ -4203,6 +4353,7 @@ share/moodle/question/format/webct/format.php
 share/moodle/question/format/xhtml/format.php
 share/moodle/question/format/xhtml/xhtml.css
 share/moodle/question/format/xml/format.php
+share/moodle/question/format.php
 share/moodle/question/import.php
 share/moodle/question/import_form.php
 share/moodle/question/move_form.php
@@ -4318,25 +4469,24 @@ share/moodle/search/Zend/Exception.php
 share/moodle/search/Zend/IMPORTANT.txt
 share/moodle/search/Zend/LICENSE.txt
 share/moodle/search/Zend/Search/Exception.php
-share/moodle/search/Zend/Search/Lucene.php
-share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer.php
-share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common.php
-share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
 share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
-share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
+share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
 share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
-share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
+share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
 share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
-share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
+share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
 share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
+share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
+share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common.php
+share/moodle/search/Zend/Search/Lucene/Analysis/Analyzer.php
 share/moodle/search/Zend/Search/Lucene/Analysis/Token.php
-share/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter.php
 share/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
 share/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
 share/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
 share/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
-share/moodle/search/Zend/Search/Lucene/Document.php
+share/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter.php
 share/moodle/search/Zend/Search/Lucene/Document/Html.php
+share/moodle/search/Zend/Search/Lucene/Document.php
 share/moodle/search/Zend/Search/Lucene/Exception.php
 share/moodle/search/Zend/Search/Lucene/FSM.php
 share/moodle/search/Zend/Search/Lucene/FSMAction.php
@@ -4346,9 +4496,9 @@ share/moodle/search/Zend/Search/Lucene/Index/FieldInfo.php
 share/moodle/search/Zend/Search/Lucene/Index/SegmentInfo.php
 share/moodle/search/Zend/Search/Lucene/Index/SegmentInfoPriorityQueue.php
 share/moodle/search/Zend/Search/Lucene/Index/SegmentMerger.php
-share/moodle/search/Zend/Search/Lucene/Index/SegmentWriter.php
 share/moodle/search/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php
 share/moodle/search/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php
+share/moodle/search/Zend/Search/Lucene/Index/SegmentWriter.php
 share/moodle/search/Zend/Search/Lucene/Index/Term.php
 share/moodle/search/Zend/Search/Lucene/Index/TermInfo.php
 share/moodle/search/Zend/Search/Lucene/Index/Writer.php
@@ -4357,7 +4507,6 @@ share/moodle/search/Zend/Search/Lucene/LockManager.php
 share/moodle/search/Zend/Search/Lucene/PriorityQueue.php
 share/moodle/search/Zend/Search/Lucene/Proxy.php
 share/moodle/search/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
-share/moodle/search/Zend/Search/Lucene/Search/Query.php
 share/moodle/search/Zend/Search/Lucene/Search/Query/Boolean.php
 share/moodle/search/Zend/Search/Lucene/Search/Query/Empty.php
 share/moodle/search/Zend/Search/Lucene/Search/Query/Fuzzy.php
@@ -4367,10 +4516,11 @@ share/moodle/search/Zend/Search/Lucene/Search/Query/Phrase.php
 share/moodle/search/Zend/Search/Lucene/Search/Query/Range.php
 share/moodle/search/Zend/Search/Lucene/Search/Query/Term.php
 share/moodle/search/Zend/Search/Lucene/Search/Query/Wildcard.php
-share/moodle/search/Zend/Search/Lucene/Search/QueryEntry.php
+share/moodle/search/Zend/Search/Lucene/Search/Query.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Phrase.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Subquery.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Term.php
+share/moodle/search/Zend/Search/Lucene/Search/QueryEntry.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryHit.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryLexer.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryParser.php
@@ -4378,20 +4528,21 @@ share/moodle/search/Zend/Search/Lucene/Search/QueryParserContext.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryParserException.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryToken.php
 share/moodle/search/Zend/Search/Lucene/Search/QueryTokenizer.php
-share/moodle/search/Zend/Search/Lucene/Search/Similarity.php
 share/moodle/search/Zend/Search/Lucene/Search/Similarity/Default.php
-share/moodle/search/Zend/Search/Lucene/Search/Weight.php
+share/moodle/search/Zend/Search/Lucene/Search/Similarity.php
 share/moodle/search/Zend/Search/Lucene/Search/Weight/Boolean.php
 share/moodle/search/Zend/Search/Lucene/Search/Weight/Empty.php
 share/moodle/search/Zend/Search/Lucene/Search/Weight/MultiTerm.php
 share/moodle/search/Zend/Search/Lucene/Search/Weight/Phrase.php
 share/moodle/search/Zend/Search/Lucene/Search/Weight/Term.php
+share/moodle/search/Zend/Search/Lucene/Search/Weight.php
 share/moodle/search/Zend/Search/Lucene/SoftLockManager.php
-share/moodle/search/Zend/Search/Lucene/Storage/Directory.php
 share/moodle/search/Zend/Search/Lucene/Storage/Directory/Filesystem.php
-share/moodle/search/Zend/Search/Lucene/Storage/File.php
+share/moodle/search/Zend/Search/Lucene/Storage/Directory.php
 share/moodle/search/Zend/Search/Lucene/Storage/File/Filesystem.php
 share/moodle/search/Zend/Search/Lucene/Storage/File/Memory.php
+share/moodle/search/Zend/Search/Lucene/Storage/File.php
+share/moodle/search/Zend/Search/Lucene.php
 share/moodle/search/Zend/Search/TODO.txt
 share/moodle/search/add.php
 share/moodle/search/cron.php
diff --git a/www/moodle/distinfo b/www/moodle/distinfo
index 61a9734d8a1..8e567ab2cf3 100644
--- a/www/moodle/distinfo
+++ b/www/moodle/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/06/04 09:20:02 wiz Exp $
+$NetBSD: distinfo,v 1.2 2010/06/16 06:40:53 wiz Exp $
 
-SHA1 (moodle-1.9.8.tgz) = f8f66120bba681c61b2db89e0be41d4aa2492404
-RMD160 (moodle-1.9.8.tgz) = 1cb616f6734dacdedfd306b63e98d7edcff7767b
-Size (moodle-1.9.8.tgz) = 13962181 bytes
+SHA1 (moodle-1.9.9.tgz) = 936eaa405cef8722c31f6a0a385fee7fa9999919
+RMD160 (moodle-1.9.9.tgz) = a44406d71829c88d5ad21a3368b62c76c420c7e7
+Size (moodle-1.9.9.tgz) = 14017622 bytes